aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorRobin Watts2007-06-25 21:09:08 +0000
committerRobin Watts2007-06-25 21:09:08 +0000
commitb53cebe62dcfab9270e86d8c67ceff1032485da8 (patch)
tree9f6ab269fb62a05faa6284ab72daa482973ad4b2 /sound
parent2c3cbf444a421a4e64db43c228ee1b49dcc1d6ca (diff)
downloadscummvm-rg350-b53cebe62dcfab9270e86d8c67ceff1032485da8.tar.gz
scummvm-rg350-b53cebe62dcfab9270e86d8c67ceff1032485da8.tar.bz2
scummvm-rg350-b53cebe62dcfab9270e86d8c67ceff1032485da8.zip
Fix for a stupid typo in yesterdays sound fill tweak.
This fixes bug 1743016. Thanks to erictorbjorn and md5 for pointing me at it. svn-id: r27718
Diffstat (limited to 'sound')
-rw-r--r--sound/audiostream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 9fd2f046fe..6a04da5f43 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -158,7 +158,7 @@ template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
int LinearMemoryStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buffer, const int numSamples) {
int samples = numSamples;
while (samples > 0 && _ptr < _end) {
- int len = MIN(numSamples, (int)(_end - _ptr) / (is16Bit ? 2 : 1));
+ int len = MIN(samples, (int)(_end - _ptr) / (is16Bit ? 2 : 1));
samples -= len;
do {
*buffer++ = READ_ENDIAN_SAMPLE(is16Bit, isUnsigned, _ptr, isLE);