[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.45,1.46

Ruediger Hanke tomjoad at users.sourceforge.net
Fri Aug 9 04:24:02 CEST 2002


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

Modified Files:
	mixer.cpp 
Log Message:
Fixed Mixer full warnings, Dig music plays much better now on MorphOS

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- mixer.cpp	4 Aug 2002 16:54:59 -0000	1.45
+++ mixer.cpp	9 Aug 2002 11:23:14 -0000	1.46
@@ -630,6 +630,7 @@
 	byte *cur_pos = _pos;					/* This is just to prevent the variable to move during the tests :-) */
 	if (new_end > (_ptr + _buffer_size)) {
 		/* Wrap-around case */
+		new_end = _ptr + len - ((_ptr + _buffer_size) - _end_of_data);
 		if ((_end_of_data < cur_pos) || (new_end >= cur_pos)) {
 			warning("Mixer full... Trying to not break too much ");
 			return;





More information about the Scummvm-git-logs mailing list