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

[lordhoto at users.sourceforge.net]

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

Log Message:
-----------
Stop SubLoopingAudioStream playback, in case reading from the parent stream fails.

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

Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp	2010-02-09 21:52:27 UTC (rev 48020)
+++ scummvm/trunk/sound/audiostream.cpp	2010-02-09 21:52:46 UTC (rev 48021)
@@ -187,7 +187,11 @@
 	int framesRead = _parent->readBuffer(buffer, framesLeft);
 	_pos = _pos.addFrames(framesRead);
 
-	if (_pos == _loopEnd) {
+	if (framesRead < framesLeft) {
+		// TODO: Proper error indication.
+		_done = true;
+		return framesRead;
+	} else if (_pos == _loopEnd) {
 		if (_loops != 0) {
 			--_loops;
 			if (!_loops) {
@@ -197,6 +201,7 @@
 		}
 
 		if (!_parent->seek(_loopStart)) {
+			// 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.