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

[lordhoto at users.sourceforge.net]

Revision: 48022
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48022&view=rev
Author:   lordhoto
Date:     2010-02-09 22:03:02 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
Be a bit more forgiveful in case the SeekableAudioStream passed to SubLoopingAudioStream does not allow reading the requested sample count at once (i.e. do not tread that as error, unless endOfData() is set).

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

Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp	2010-02-09 21:52:46 UTC (rev 48021)
+++ scummvm/trunk/sound/audiostream.cpp	2010-02-09 22:03:02 UTC (rev 48022)
@@ -187,7 +187,7 @@
 	int framesRead = _parent->readBuffer(buffer, framesLeft);
 	_pos = _pos.addFrames(framesRead);
 
-	if (framesRead < framesLeft) {
+	if (framesRead < framesLeft && _parent->endOfData()) {
 		// TODO: Proper error indication.
 		_done = true;
 		return framesRead;


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