[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.48,1.49 smush_mixer.cpp,1.18,1.19

Max Horn fingolfin at users.sourceforge.net
Sat Sep 6 03:48:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv21491/scumm/smush

Modified Files:
	smush_player.cpp smush_mixer.cpp 
Log Message:
removed pauseMixer method from mixer, and renamed stop to stopChannel

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- smush_player.cpp	2 Sep 2003 07:49:39 -0000	1.48
+++ smush_player.cpp	6 Sep 2003 10:47:29 -0000	1.49
@@ -290,7 +290,7 @@
 		_base = NULL;
 	}
 	
-	_scumm->_mixer->stop(_IACTchannel);
+	_scumm->_mixer->stopChannel(_IACTchannel);
 
 	_scumm->_insaneState = false;
 	_scumm->abortCutscene();

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- smush_mixer.cpp	2 Sep 2003 07:49:39 -0000	1.18
+++ smush_mixer.cpp	6 Sep 2003 10:47:29 -0000	1.19
@@ -41,7 +41,7 @@
 
 SmushMixer::~SmushMixer() {
 	for (int32 i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
-		_mixer->stop(_channels[i].mixer_index);
+		_mixer->stopChannel(_channels[i].mixer_index);
 	}
 }
 





More information about the Scummvm-git-logs mailing list