[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.354,1.355

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Jul 19 03:52:01 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4666/scummvm/scumm

Modified Files:
	sound.cpp 
Log Message:
removed not needed code and moved pause mixer after pause imuse

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- sound.cpp	17 Jul 2004 05:35:38 -0000	1.354
+++ sound.cpp	19 Jul 2004 10:50:52 -0000	1.355
@@ -914,12 +914,12 @@
 
 	_soundsPaused = pause;
 
-	_vm->_mixer->pauseAll(pause);
-
 	if (_vm->_imuseDigital) {
 		_vm->_imuseDigital->pause(pause);
 	}
 
+	_vm->_mixer->pauseAll(pause);
+
 	if ((_vm->_features & GF_AUDIOTRACKS) && _vm->VAR(_vm->VAR_MUSIC_TIMER) > 0) {
 		if (pause)
 			stopCDTimer();





More information about the Scummvm-git-logs mailing list