[Scummvm-cvs-logs] SF.net SVN: scummvm: [27718] scummvm/trunk/sound/audiostream.cpp

[robinwatts at users.sourceforge.net]

Revision: 27718
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27718&view=rev
Author:   robinwatts
Date:     2007-06-25 14:09:08 -0700 (Mon, 25 Jun 2007)

Log Message:
-----------
Fix for a stupid typo in yesterdays sound fill tweak.

This fixes bug 1743016. Thanks to erictorbjorn and md5 for pointing me at it.

Modified Paths:
--------------
    scummvm/trunk/sound/audiostream.cpp

Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp	2007-06-25 20:20:59 UTC (rev 27717)
+++ scummvm/trunk/sound/audiostream.cpp	2007-06-25 21:09:08 UTC (rev 27718)
@@ -158,7 +158,7 @@
 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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.