diff options
| author | Robin Watts | 2008-11-29 18:01:16 +0000 |
|---|---|---|
| committer | Robin Watts | 2008-11-29 18:01:16 +0000 |
| commit | 8f3b2e9b4d9f1f82682e1eed018153091cddee9f (patch) | |
| tree | f2af64fa467e70a3ba25e9c615baa053e0818d88 /sound | |
| parent | 362bdf87d78f611f3e308e7e9234831208b93d68 (diff) | |
| download | scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.tar.gz scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.tar.bz2 scummvm-rg350-8f3b2e9b4d9f1f82682e1eed018153091cddee9f.zip | |
Remove warnings from NDS build.
svn-id: r35172
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mpu401.cpp | 2 | ||||
| -rw-r--r-- | sound/softsynth/ym2612.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/mpu401.cpp b/sound/mpu401.cpp index c2158f1329..fe18a3ee85 100644 --- a/sound/mpu401.cpp +++ b/sound/mpu401.cpp @@ -44,7 +44,7 @@ MidiDriver *MidiChannel_MPU401::device() { } void MidiChannel_MPU401::send(uint32 b) { - _owner->send(b & 0xFFFFFFF0 | (_channel & 0xF)); + _owner->send((b & 0xFFFFFFF0) | (_channel & 0xF)); } void MidiChannel_MPU401::noteOff(byte note) { diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp index efdf292150..7dac630ef9 100644 --- a/sound/softsynth/ym2612.cpp +++ b/sound/softsynth/ym2612.cpp @@ -716,7 +716,7 @@ void MidiDriver_YM2612::createLookupTables() { int f10 = (fnum[i] >> 9) & 1; int f11 = (fnum[i] >> 10) & 1; int n4 = f11; - int n3 = f11&(f10|f9|f8) | (~f11&f10&f9&f8); + int n3 = (f11&(f10|f9|f8)) | (~f11&f10&f9&f8); int note = n4*2 + n3; // see p.207 keycodeTable[(block+1)*12+i] = block*4 + note; |