[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.62,1.63 sound.cpp,1.281,1.282

[Max Horn]

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

Modified Files:
	imuse_digi.cpp sound.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: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- imuse_digi.cpp	18 Nov 2003 02:05:45 -0000	1.62
+++ imuse_digi.cpp	21 Dec 2003 00:40:42 -0000	1.63
@@ -703,7 +703,7 @@
 	_scumm->_timer->removeTimerProc(timer_handler);
 
 	for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
-		_scumm->_mixer->stopChannel(_channel[l]._mixerChannel);
+		_scumm->_mixer->stopHandle(_channel[l]._mixerChannel);
 	}
 }
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -d -r1.281 -r1.282
--- sound.cpp	18 Dec 2003 01:22:27 -0000	1.281
+++ sound.cpp	21 Dec 2003 00:40:42 -0000	1.282
@@ -548,7 +548,7 @@
 		|| (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) {
 		for (i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
 			if (i != talkChannel) {
-				_scumm->_mixer->stopChannel(i);
+				_scumm->_mixer->stopHandle(i+1);	// EVIL HACK!!!!
 			}
 		}
 	}
@@ -1078,7 +1078,7 @@
 	// First stop the music timer
 	_scumm->_timer->removeTimerProc(&music_handler);
 	_nameBundleMusic = "";
-	_scumm->_mixer->stopChannel(_bundleMusicTrack);
+	_scumm->_mixer->stopHandle(_bundleMusicTrack);
 	if (_musicBundleBufFinal) {
 		free(_musicBundleBufFinal);
 		_musicBundleBufFinal = NULL;