diff options
| author | Max Horn | 2003-12-21 00:40:42 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-21 00:40:42 +0000 |
| commit | fbcca630582d141d9bca1b2fad053ae089f096f0 (patch) | |
| tree | af40dbfa145e036cfd7b1927ffdb7b388f022531 | |
| parent | c55652d4a60ee51dde381417c590fff9a59ecb0d (diff) | |
| download | scummvm-rg350-fbcca630582d141d9bca1b2fad053ae089f096f0.tar.gz scummvm-rg350-fbcca630582d141d9bca1b2fad053ae089f096f0.tar.bz2 scummvm-rg350-fbcca630582d141d9bca1b2fad053ae089f096f0.zip | |
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)
svn-id: r11799
| -rw-r--r-- | scumm/imuse_digi.cpp | 2 | ||||
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 2 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 2 | ||||
| -rw-r--r-- | scumm/sound.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index 42517b16b8..3b02f989d7 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -703,7 +703,7 @@ IMuseDigital::~IMuseDigital() { _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); } } diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index 195a0d9dd4..e6113d3ae3 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -45,7 +45,7 @@ SmushMixer::SmushMixer(SoundMixer *m) : SmushMixer::~SmushMixer() { for (int32 i = 0; i < NUM_CHANNELS; i++) { - _mixer->stopChannel(_channels[i].handle); + _mixer->stopHandle(_channels[i].handle); } } diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 758b95f145..b97b771aa2 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -303,7 +303,7 @@ void SmushPlayer::deinit() { _base = NULL; } - _scumm->_mixer->stopChannel(_IACTchannel); + _scumm->_mixer->stopHandle(_IACTchannel); _scumm->_insaneState = false; if (_scumm->_imuseDigital) { diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 063331f393..6a5ade9e5c 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -548,7 +548,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle || (_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 @@ void Sound::stopBundleMusic() { // 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; |