[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.29,1.30

Lionel Ulmer bbrox at users.sourceforge.net
Thu Jun 6 14:43:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/sound
In directory usw-pr-cvs1:/tmp/cvs-serv29924/sound

Modified Files:
	mixer.cpp 
Log Message:
This should fix the regression introduced by my streaming changes (bug
#564756). Thanks Oliver Kiehl for the find :-)



Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mixer.cpp	3 Jun 2002 21:20:11 -0000	1.29
+++ mixer.cpp	6 Jun 2002 21:42:11 -0000	1.30
@@ -200,12 +200,12 @@
 	_fp_pos = 0;
 	_fp_speed = (1 << 16) * rate / mixer->_output_rate;
 	_to_be_destroyed = false;
+	_realsize = size;
 
 	/* adjust the magnitute to prevent division error */
 	while (size & 0xFFFF0000)
 		size >>= 1, rate = (rate>>1) + 1;
 
-	_realsize = size;
 	_rate = rate;
 	_size = size * mixer->_output_rate / rate;
 	if (_flags & FLAG_16BITS) _size = _size >> 1;





More information about the Scummvm-git-logs mailing list