aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMax Horn2003-07-31 01:06:01 +0000
committerMax Horn2003-07-31 01:06:01 +0000
commit5225597d85089935eb25ed57c0e8d7d94681ad68 (patch)
tree0003a4c8af795c70fae5bdfa9b027c56710b8246 /sound
parentb9f227bb90880223e5c41856fac7ad74aae2533e (diff)
downloadscummvm-rg350-5225597d85089935eb25ed57c0e8d7d94681ad68.tar.gz
scummvm-rg350-5225597d85089935eb25ed57c0e8d7d94681ad68.tar.bz2
scummvm-rg350-5225597d85089935eb25ed57c0e8d7d94681ad68.zip
cleanup
svn-id: r9312
Diffstat (limited to 'sound')
-rw-r--r--sound/mixer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 48a4e86076..a93d434e66 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(), _input->isStereo());
#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(), _input->isStereo());
#else
_flags = flags;
_bufferSize = buffer_size;
@@ -1123,7 +1123,7 @@ ChannelVorbis::ChannelVorbis(SoundMixer *mixer, PlayingSoundHandle *handle, OggV
// Get a rate converter instance
vi = ov_info(ov_file, -1);
assert(vi->channels == 1 || vi->channels == 2);
- _converter = makeRateConverter(vi->rate, mixer->getOutputRate(), vi->channels >= 2);
+ _converter = makeRateConverter(vi->rate, mixer->getOutputRate(), _input->isStereo());
#else
_ov_file = ov_file;