diff options
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi.cpp | 4 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 4 | ||||
| -rw-r--r-- | scumm/sound.cpp | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index faa8b9e425..adfe7ff35c 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -695,12 +695,12 @@ IMuseDigital::IMuseDigital(ScummEngine *scumm) for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) { _channel[l]._mixerChannel = 0; } - _scumm->_timer->installProcedure(timer_handler, 200000, this); + _scumm->_timer->installTimerProc(timer_handler, 200000, this); _pause = false; } IMuseDigital::~IMuseDigital() { - _scumm->_timer->releaseProcedure(timer_handler); + _scumm->_timer->removeTimerProc(timer_handler); for (int l = 0; l < MAX_DIGITAL_CHANNELS; l++) { _scumm->_mixer->stopChannel(_channel[l]._mixerChannel); diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index c00c493ce5..087a8100b8 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -260,13 +260,13 @@ void SmushPlayer::init() { _smixer->_silentMixer = _scumm->_silentDigitalImuse; _scumm->_smushPlay = true; _dst = _scumm->virtscr[0].screenPtr + _scumm->virtscr[0].xstart; - _scumm->_timer->installProcedure(&timerCallback, _speed, _scumm); + _scumm->_timer->installTimerProc(&timerCallback, _speed, _scumm); _alreadyInit = false; } void SmushPlayer::deinit() { - _scumm->_timer->releaseProcedure(&timerCallback); + _scumm->_timer->removeTimerProc(&timerCallback); _scumm->_smushPlay = false; // In case the timerCallback is active right now, we loop till it finishes. // Note: even this still leaves a window for race conditions to occur. diff --git a/scumm/sound.cpp b/scumm/sound.cpp index fc76119742..7f08607cf7 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -1044,7 +1044,7 @@ void Sound::playBundleMusic(const char *song) { _bundleMusicTrack = 0; _numberSamplesBundleMusic = _bundle->getNumberOfMusicSamplesByName(song); _nameBundleMusic = song; - _scumm->_timer->installProcedure(&music_handler, 1000000, this); + _scumm->_timer->installTimerProc(&music_handler, 1000000, this); } else if (strcmp(_nameBundleMusic, song) != 0) { _newNameBundleMusic = song; _musicBundleToBeChanged = true; @@ -1057,7 +1057,7 @@ void Sound::pauseBundleMusic(bool state) { void Sound::stopBundleMusic() { // First stop the music timer - _scumm->_timer->releaseProcedure(&music_handler); + _scumm->_timer->removeTimerProc(&music_handler); _nameBundleMusic = ""; _scumm->_mixer->stopChannel(_bundleMusicTrack); if (_musicBundleBufFinal) { @@ -1412,12 +1412,12 @@ void Sound::startCDTimer() { else timer_interval = 101; - _scumm->_timer->releaseProcedure(&cd_timer_handler); - _scumm->_timer->installProcedure(&cd_timer_handler, 1000 * timer_interval, _scumm); + _scumm->_timer->removeTimerProc(&cd_timer_handler); + _scumm->_timer->installTimerProc(&cd_timer_handler, 1000 * timer_interval, _scumm); } void Sound::stopCDTimer() { - _scumm->_timer->releaseProcedure(&cd_timer_handler); + _scumm->_timer->removeTimerProc(&cd_timer_handler); } void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) { |