aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJohannes Schickel2009-11-26 00:43:43 +0000
committerJohannes Schickel2009-11-26 00:43:43 +0000
commitef5d0226c13bb9a5366a5ef94c069691dbd3aba6 (patch)
tree896c90f6f2e965eff9ce222ded830741f5b2007d /sound
parent117bcfde95058bbc85f7f720a8e1cad40ddc7ca7 (diff)
downloadscummvm-rg350-ef5d0226c13bb9a5366a5ef94c069691dbd3aba6.tar.gz
scummvm-rg350-ef5d0226c13bb9a5366a5ef94c069691dbd3aba6.tar.bz2
scummvm-rg350-ef5d0226c13bb9a5366a5ef94c069691dbd3aba6.zip
Fix warnings.
svn-id: r46145
Diffstat (limited to 'sound')
-rw-r--r--sound/softsynth/sid.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/softsynth/sid.cpp b/sound/softsynth/sid.cpp
index d0a46a805f..a1d026426d 100644
--- a/sound/softsynth/sid.cpp
+++ b/sound/softsynth/sid.cpp
@@ -58,19 +58,19 @@ void WaveformGenerator::set_sync_source(WaveformGenerator* source) {
}
void WaveformGenerator::writeFREQ_LO(reg8 freq_lo) {
- freq = freq & 0xff00 | freq_lo & 0x00ff;
+ freq = (freq & 0xff00) | (freq_lo & 0x00ff);
}
void WaveformGenerator::writeFREQ_HI(reg8 freq_hi) {
- freq = (freq_hi << 8) & 0xff00 | freq & 0x00ff;
+ freq = ((freq_hi << 8) & 0xff00) | (freq & 0x00ff);
}
void WaveformGenerator::writePW_LO(reg8 pw_lo) {
- pw = pw & 0xf00 | pw_lo & 0x0ff;
+ pw = (pw & 0xf00) | (pw_lo & 0x0ff);
}
void WaveformGenerator::writePW_HI(reg8 pw_hi) {
- pw = (pw_hi << 8) & 0xf00 | pw & 0x0ff;
+ pw = ((pw_hi << 8) & 0xf00) | (pw & 0x0ff);
}
void WaveformGenerator::writeCONTROL_REG(reg8 control) {
@@ -542,12 +542,12 @@ void Filter::reset(){
}
void Filter::writeFC_LO(reg8 fc_lo) {
- fc = fc & 0x7f8 | fc_lo & 0x007;
+ fc = (fc & 0x7f8) | (fc_lo & 0x007);
set_w0();
}
void Filter::writeFC_HI(reg8 fc_hi) {
- fc = (fc_hi << 3) & 0x7f8 | fc & 0x007;
+ fc = ((fc_hi << 3) & 0x7f8) | (fc & 0x007);
set_w0();
}