[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.34,1.35

[Nicolas Bacca]

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

Modified Files:
	mixer.cpp 
Log Message:
Fixed Monkey Island 2 freeze when sound is paused

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- mixer.cpp	17 Jul 2002 23:50:38 -0000	1.34
+++ mixer.cpp	20 Jul 2002 07:57:22 -0000	1.35
@@ -110,11 +110,6 @@
 void SoundMixer::mix(int16 *buf, uint len)
 {
 
-	if (_paused) {
-		memset(buf, 0, 2 * len * sizeof(int16));
-		return;
-	}
-
 	if (_premix_proc) {
 		int i;
 		_premix_proc(_premix_param, buf, len);
@@ -124,6 +119,12 @@
 	} else {
 		/* no premixer available, zero the buf out */
 		memset(buf, 0, 2 * len * sizeof(int16));
+	}
+
+	/* Arisme : moved to let iMUSE generate the events */
+	if (_paused) {
+		memset(buf, 0, 2 * len * sizeof(int16));
+		return;
 	}
 
 	_syst->lock_mutex(_mutex);