[Scummvm-cvs-logs] CVS: scummvm/sound rate.cpp,1.12,1.13

[Torbj?rn Andersson]

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

Modified Files:
	rate.cpp 
Log Message:
I think this fixes bug #780167 ("SIMON1/2: Sound problems"). When
st_rate_flow() had filled the output buffer, rate->icur and rate->ilast
held the same values, which led to some samples being duplicated on the
next call.


Index: rate.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rate.cpp	31 Jul 2003 19:08:57 -0000	1.12
+++ rate.cpp	2 Aug 2003 10:47:35 -0000	1.13
@@ -179,11 +179,13 @@
 
 the_end:
 	*osamp = (obuf - ostart) / 2;
-	rate->ilast[0] = ilast[0];
-	rate->icur[0] = icur[0];
-	if (stereo) {
-		rate->ilast[1] = ilast[1];
-		rate->icur[1] = icur[1];
+	if (!input.eof()) {
+		rate->ilast[0] = ilast[0];
+		rate->icur[0] = input.read();
+		if (stereo) {
+			rate->ilast[1] = ilast[1];
+			rate->icur[1] = input.read();
+		}
 	}
 	return (ST_SUCCESS);
 }