diff options
| author | Max Horn | 2008-12-25 20:53:59 +0000 |
|---|---|---|
| committer | Max Horn | 2008-12-25 20:53:59 +0000 |
| commit | 6837416556cb84b0f84a1bc231be8d4d59e835bb (patch) | |
| tree | 26f03a6d3ca2ce36358a2d3cb2a2aae13478405b /engines/scumm | |
| parent | df20d264fd300a26b15f46dfdfc2d9aa94810d5f (diff) | |
| download | scummvm-rg350-6837416556cb84b0f84a1bc231be8d4d59e835bb.tar.gz scummvm-rg350-6837416556cb84b0f84a1bc231be8d4d59e835bb.tar.bz2 scummvm-rg350-6837416556cb84b0f84a1bc231be8d4d59e835bb.zip | |
Made Engine::_timer protected
svn-id: r35543
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index d3359fa33e..2d9ce251a4 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -60,14 +60,14 @@ IMuseDigital::IMuseDigital(ScummEngine_v7 *scumm, Audio::Mixer *mixer, int fps) memset(_track[l], 0, sizeof(Track)); _track[l]->trackId = l; } - _vm->_timer->installTimerProc(timer_handler, 1000000 / _callbackFps, this); + _vm->getTimerManager()->installTimerProc(timer_handler, 1000000 / _callbackFps, this); _audioNames = NULL; _numAudioNames = 0; } IMuseDigital::~IMuseDigital() { - _vm->_timer->removeTimerProc(timer_handler); + _vm->getTimerManager()->removeTimerProc(timer_handler); stopAllSounds(); for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) { delete _track[l]; diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 7500b16c87..2807b086d3 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1054,12 +1054,12 @@ void Sound::startCDTimer() { // it too high, and there will be a nasty "hiccup" just as Chaos // appears. - _vm->_timer->removeTimerProc(&cd_timer_handler); - _vm->_timer->installTimerProc(&cd_timer_handler, 100700, _vm); + _vm->getTimerManager()->removeTimerProc(&cd_timer_handler); + _vm->getTimerManager()->installTimerProc(&cd_timer_handler, 100700, _vm); } void Sound::stopCDTimer() { - _vm->_timer->removeTimerProc(&cd_timer_handler); + _vm->getTimerManager()->removeTimerProc(&cd_timer_handler); } void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) { |