[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.36,1.37

[Max Horn]

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

Modified Files:
	mixer.cpp 
Log Message:
make sure that the mutex protects everything that affects the buffer

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mixer.cpp	21 May 2003 17:33:32 -0000	1.36
+++ mixer.cpp	22 May 2003 21:34:20 -0000	1.37
@@ -152,6 +152,7 @@
 #endif
 
 void SoundMixer::mix(int16 *buf, uint len) {
+	_syst->lock_mutex(_mutex);
 	if (_paused) {
 		memset(buf, 0, 2 * len * sizeof(int16));
 		return;
@@ -168,7 +169,6 @@
 		memset(buf, 0, 2 * len * sizeof(int16));
 	}
 
-	_syst->lock_mutex(_mutex);
 	/* now mix all channels */
 	for (int i = 0; i != NUM_CHANNELS; i++)
 		if (_channels[i])