aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-07-30 18:20:45 +0000
committerTorbjörn Andersson2003-07-30 18:20:45 +0000
commit15378172cdb4f5e7456653e20485f396cff16d91 (patch)
tree1293f34a2bda325ddc6b1847fc13013f4b30e12e /sound
parent26ed12953da5dc2d1403d22ce127e2c9165af294 (diff)
downloadscummvm-rg350-15378172cdb4f5e7456653e20485f396cff16d91.tar.gz
scummvm-rg350-15378172cdb4f5e7456653e20485f396cff16d91.tar.bz2
scummvm-rg350-15378172cdb4f5e7456653e20485f396cff16d91.zip
Partial fix for bug #780167 ("SIMON1/2: Sound problems"). It seems to fix
the crash, but the sounds play at the wrong rate, I believe. svn-id: r9298
Diffstat (limited to 'sound')
-rw-r--r--sound/mixer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 3af9c1f4ed..48a4e86076 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -677,7 +677,7 @@ ChannelRaw::ChannelRaw(SoundMixer *mixer, PlayingSoundHandle *handle, void *soun
// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
// Get a rate converter instance
- _converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0);
+ _converter = makeRateConverter(rate, mixer->getOutputRate(), (flags & SoundMixer::FLAG_STEREO) != 0);
#else
_pos = 0;
_fpPos = 0;
@@ -768,7 +768,7 @@ ChannelStream::ChannelStream(SoundMixer *mixer, PlayingSoundHandle *handle, void
// TODO: add support for SoundMixer::FLAG_REVERSE_STEREO
// Get a rate converter instance
- _converter = makeRateConverter(rate, mixer->getOutputRate(), flags & SoundMixer::FLAG_STEREO != 0);
+ _converter = makeRateConverter(rate, mixer->getOutputRate(), (flags & SoundMixer::FLAG_STEREO) != 0);
#else
_flags = flags;
_bufferSize = buffer_size;