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

[lordhoto at users.sourceforge.net]

Revision: 47052
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47052&view=rev
Author:   lordhoto
Date:     2010-01-05 22:00:06 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Cleanup.

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

Modified: scummvm/trunk/sound/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp	2010-01-05 21:56:13 UTC (rev 47051)
+++ scummvm/trunk/sound/mixer.cpp	2010-01-05 22:00:06 UTC (rev 47052)
@@ -668,7 +668,7 @@
 
 	if (frameDiff >= 0) {
 		len -= frameDiff;
-		needLoop = true;
+		needLoop = (_loopCount != 1);
 	}
 
 	_samplesConsumed = _samplesDecoded;
@@ -679,15 +679,13 @@
 	_pos = _pos.addFrames(samplesRead);
 
 	if (needLoop) {
-		if (!_loopCount || _loopCount > 1) {
-			if (_loopCount > 1)
-				--_loopCount;
+		if (_loopCount > 1)
+			--_loopCount;
 
-			_input->seek(_loopStart);
-			samplesRead = _converter->flow(*_input, data + len * 2, frameDiff, getLeftVolume(), getRightVolume());
-			_samplesDecoded += samplesRead;
-			_pos = _loopStart.addFrames(samplesRead);
-		}
+		_input->seek(_loopStart);
+		samplesRead = _converter->flow(*_input, data + len * 2, frameDiff, getLeftVolume(), getRightVolume());
+		_samplesDecoded += samplesRead;
+		_pos = _loopStart.addFrames(samplesRead);
 	}
 }
 


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