From 3bed588917bb50f15073599e886ba5d73286a2ab Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sat, 22 Nov 2008 22:10:12 +0000 Subject: [PATCH] fixed compilation on x86_64 git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1847 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 3 +++ src/core/mixer.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b36da689c..f88612135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-11-22 Tobias Doerffel + * src/core/mixer.cpp: + fixed compilation on x86_64 + * src/core/automatable_model.cpp: fixed wrong logic in automatableModel::setValue() which led to bugs when changing linked controls to 0 diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp index 2fb71ca33..e99d5a3da 100644 --- a/src/core/mixer.cpp +++ b/src/core/mixer.cpp @@ -712,7 +712,7 @@ void mixer::bufferToPort( const sampleFrame * _buf, void mixer::clearAudioBuffer( sampleFrame * _ab, const f_cnt_t _frames, const f_cnt_t _offset ) { - if( likely( (int)( _ab+_offset ) % 16 == 0 && _frames % 8 == 0 ) ) + if( likely( (size_t)( _ab+_offset ) % 16 == 0 && _frames % 8 == 0 ) ) { alignedMemClear( _ab+_offset, sizeof( *_ab ) * _frames ); }