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/saga/music.cpp | |
| 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/saga/music.cpp')
| -rw-r--r-- | engines/saga/music.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 3124deba57..167861e7f2 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -372,7 +372,7 @@ Music::Music(SagaEngine *vm, Audio::Mixer *mixer, MidiDriver *driver) : _vm(vm), } Music::~Music() { - _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback); + _vm->getTimerManager()->removeTimerProc(&musicVolumeGaugeCallback); _mixer->stopHandle(_musicHandle); delete _player; xmidiParser->setMidiDriver(NULL); @@ -406,7 +406,7 @@ void Music::musicVolumeGauge() { _player->setVolume(volume); if (_currentVolumePercent == 100) { - _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback); + _vm->getTimerManager()->removeTimerProc(&musicVolumeGaugeCallback); _currentVolume = _targetVolume; } } @@ -421,12 +421,12 @@ void Music::setVolume(int volume, int time) { if (time == 1) { _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume); _player->setVolume(volume); - _vm->_timer->removeTimerProc(&musicVolumeGaugeCallback); + _vm->getTimerManager()->removeTimerProc(&musicVolumeGaugeCallback); _currentVolume = volume; return; } - _vm->_timer->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this); + _vm->getTimerManager()->installTimerProc(&musicVolumeGaugeCallback, time * 100L, this); } bool Music::isPlaying() { |