[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.231,1.232 imuse_digi.cpp,1.40,1.41

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


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

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

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- sound.cpp	6 Sep 2003 03:05:01 -0000	1.231
+++ sound.cpp	6 Sep 2003 10:47:30 -0000	1.232
@@ -590,7 +590,7 @@
 		|| (_scumm->_gameId == GID_SAMNMAX && !_scumm->isScriptRunning(99)))) {
 		for (i = 0; i < _scumm->_mixer->NUM_CHANNELS; i++) {
 			if (i != talkChannel) {
-				_scumm->_mixer->stop(i);
+				_scumm->_mixer->stopChannel(i);
 			}
 		}
 	}
@@ -871,7 +871,8 @@
 		return;
 
 	_soundsPaused = pause;
-	_scumm->_mixer->pauseMixer(pause);
+
+	_scumm->_mixer->pauseAll(pause);
 
 	_scumm->_sound->pauseBundleMusic(pause);
 
@@ -1148,7 +1149,7 @@
 	if (_musicBundleToBeRemoved) {
 		_scumm->_timer->releaseProcedure(&music_handler);
 		_nameBundleMusic = "";
-		_scumm->_mixer->stop(_bundleMusicTrack);
+		_scumm->_mixer->stopChannel(_bundleMusicTrack);
 		if (_musicBundleBufFinal) {
 			free(_musicBundleBufFinal);
 			_musicBundleBufFinal = NULL;

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- imuse_digi.cpp	2 Sep 2003 22:35:36 -0000	1.40
+++ imuse_digi.cpp	6 Sep 2003 10:47:30 -0000	1.41
@@ -709,7 +709,7 @@
 	_scumm->_timer->releaseProcedure(imus_digital_handler);
 
 	for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) {
-		_scumm->_mixer->stop(_channel[l]._mixerChannel);
+		_scumm->_mixer->stopChannel(_channel[l]._mixerChannel);
 	}
 }
 





More information about the Scummvm-git-logs mailing list