[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.25,1.26

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv26070

Modified Files:
	audiostream.cpp 
Log Message:
simplified code a bit

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- audiostream.cpp	5 Aug 2003 00:50:15 -0000	1.25
+++ audiostream.cpp	5 Aug 2003 00:53:25 -0000	1.26
@@ -146,8 +146,8 @@
 int WrappedMemoryStream<stereo, is16Bit, isUnsigned>::readBuffer(int16 *buffer, int numSamples) {
 	int samples = 0;
 #if 1
-	for (int i = (_pos > _end) ? 0 : 1; i < 2 && samples < numSamples && !eosIntern(); i++) {
-		const byte *endMarker = (i == 0) ? _bufferEnd : _end;
+	while (samples < numSamples && !eosIntern()) {
+		const byte *endMarker = (_pos > _end) ? _bufferEnd : _end;
 		const int len = MIN(numSamples, (endMarker - _pos) / (is16Bit ? 2 : 1));
 
 		while (samples < len) {