removed pauseMixer method from mixer, and renamed stop to stopChannel

svn-id: r10042

4 files changed, 7 insertions, 6 deletions

diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp
index 280ba51e94..d48b570bcb 100644
--- a/scumm/imuse_digi.cpp
+++ b/scumm/imuse_digi.cpp
@@ -709,7 +709,7 @@ IMuseDigital::~IMuseDigital() {
 	_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);
 	}
 }
 
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index 02dc117b29..a20b5e68a3 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -41,7 +41,7 @@ SmushMixer::SmushMixer(SoundMixer *m) :
 
 SmushMixer::~SmushMixer() {
 	for (int32 i = 0; i < SoundMixer::NUM_CHANNELS; i++) {
-		_mixer->stop(_channels[i].mixer_index);
+		_mixer->stopChannel(_channels[i].mixer_index);
 	}
 }
 
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index e82c7d6ae8..fb99c8a668 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -290,7 +290,7 @@ void SmushPlayer::deinit() {
 		_base = NULL;
 	}
 	
-	_scumm->_mixer->stop(_IACTchannel);
+	_scumm->_mixer->stopChannel(_IACTchannel);
 
 	_scumm->_insaneState = false;
 	_scumm->abortCutscene();
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index ca8ed4303f..377adfb46e 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -590,7 +590,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle
 		|| (_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 @@ void Sound::pauseSounds(bool pause) {
 		return;
 
 	_soundsPaused = pause;
-	_scumm->_mixer->pauseMixer(pause);
+
+	_scumm->_mixer->pauseAll(pause);
 
 	_scumm->_sound->pauseBundleMusic(pause);
 
@@ -1148,7 +1149,7 @@ void Sound::bundleMusicHandler(Scumm *scumm) {
 	if (_musicBundleToBeRemoved) {
 		_scumm->_timer->releaseProcedure(&music_handler);
 		_nameBundleMusic = "";
-		_scumm->_mixer->stop(_bundleMusicTrack);
+		_scumm->_mixer->stopChannel(_bundleMusicTrack);
 		if (_musicBundleBufFinal) {
 			free(_musicBundleBufFinal);
 			_musicBundleBufFinal = NULL;