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

[lordhoto at users.sourceforge.net]

Revision: 47015
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47015&view=rev
Author:   lordhoto
Date:     2010-01-05 02:42:55 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Use the return value of RateConverter::flow to calculate the decoded samples and not the upper bound "len". (This should only be a difference when the audio stream has no more samples left)

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

Modified: scummvm/trunk/sound/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp	2010-01-05 02:42:35 UTC (rev 47014)
+++ scummvm/trunk/sound/mixer.cpp	2010-01-05 02:42:55 UTC (rev 47015)
@@ -442,9 +442,7 @@
 		_mixerTimeStamp = g_system->getMillis();
 		_pauseTime = 0;
 
-		_converter->flow(*_input, data, len, vol_l, vol_r);
-
-		_samplesDecoded += len;
+		_samplesDecoded += _converter->flow(*_input, data, len, vol_l, vol_r);
 	}
 }
 


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