aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound/audio32.cpp
diff options
context:
space:
mode:
authorColin Snover2017-01-02 11:13:11 -0600
committerColin Snover2017-01-09 19:34:54 -0600
commit8987d9a889fb908b038e5615baab5403adf3073e (patch)
tree2bbd42d35b19645f090befb1546df2fc7a71f194 /engines/sci/sound/audio32.cpp
parent3e2f4a66f60ecebd2ee2cd42a303b881688bd626 (diff)
downloadscummvm-rg350-8987d9a889fb908b038e5615baab5403adf3073e.tar.gz
scummvm-rg350-8987d9a889fb908b038e5615baab5403adf3073e.tar.bz2
scummvm-rg350-8987d9a889fb908b038e5615baab5403adf3073e.zip
SCI32: Enable playback of stereo audio
Diffstat (limited to 'engines/sci/sound/audio32.cpp')
-rw-r--r--engines/sci/sound/audio32.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/sci/sound/audio32.cpp b/engines/sci/sound/audio32.cpp
index d5a7ae14b8..ca2402c859 100644
--- a/engines/sci/sound/audio32.cpp
+++ b/engines/sci/sound/audio32.cpp
@@ -159,9 +159,7 @@ int Audio32::writeAudioInternal(Audio::AudioStream *const sourceStream, Audio::R
// mono, in which case we need to request half
// as many samples from the mono stream and let
// the converter double them for stereo output
- if (!sourceStream->isStereo()) {
- samplesToRead >>= 1;
- }
+ samplesToRead >>= 1;
int samplesWritten = 0;
@@ -182,12 +180,10 @@ int Audio32::writeAudioInternal(Audio::AudioStream *const sourceStream, Audio::R
samplesToRead -= loopSamplesWritten;
samplesWritten += loopSamplesWritten;
- targetBuffer += loopSamplesWritten << 1;
+ targetBuffer += loopSamplesWritten << (sourceStream->isStereo() ? 0 : 1);
} while (loop && samplesToRead > 0);
- if (!sourceStream->isStereo()) {
- samplesWritten <<= 1;
- }
+ samplesWritten <<= 1;
return samplesWritten;
}