[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.74,1.75 smush_mixer.cpp,1.21,1.22

Max Horn fingolfin at users.sourceforge.net
Sat Dec 20 16:41:01 CET 2003


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

Modified Files:
	smush_player.cpp smush_mixer.cpp 
Log Message:
Incorrect use of stopChannel (must be stopHandle); replaced single remaining use of stopChannel by a hack (note: the code in question is a hack in itself already)

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- smush_player.cpp	18 Dec 2003 23:00:10 -0000	1.74
+++ smush_player.cpp	21 Dec 2003 00:40:42 -0000	1.75
@@ -303,7 +303,7 @@
 		_base = NULL;
 	}
 	
-	_scumm->_mixer->stopChannel(_IACTchannel);
+	_scumm->_mixer->stopHandle(_IACTchannel);
 
 	_scumm->_insaneState = false;
 	if (_scumm->_imuseDigital) {

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- smush_mixer.cpp	18 Dec 2003 01:22:28 -0000	1.21
+++ smush_mixer.cpp	21 Dec 2003 00:40:42 -0000	1.22
@@ -45,7 +45,7 @@
 
 SmushMixer::~SmushMixer() {
 	for (int32 i = 0; i < NUM_CHANNELS; i++) {
-		_mixer->stopChannel(_channels[i].handle);
+		_mixer->stopHandle(_channels[i].handle);
 	}
 }
 





More information about the Scummvm-git-logs mailing list