diff options
Diffstat (limited to 'sound/softsynth')
| -rw-r--r-- | sound/softsynth/emumidi.h | 4 | ||||
| -rw-r--r-- | sound/softsynth/mt32.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/softsynth/emumidi.h b/sound/softsynth/emumidi.h index 89124b8024..557e9b04cc 100644 --- a/sound/softsynth/emumidi.h +++ b/sound/softsynth/emumidi.h @@ -32,7 +32,7 @@ protected: Audio::Mixer *_mixer; private: - Common::Timer::TimerProc _timerProc; + Common::TimerManager::TimerProc _timerProc; void *_timerParam; int _nextTick; @@ -70,7 +70,7 @@ public: return 0; } - void setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc) { + void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) { _timerProc = timer_proc; _timerParam = timer_param; } diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp index 1f3434c581..57ab87cb08 100644 --- a/sound/softsynth/mt32.cpp +++ b/sound/softsynth/mt32.cpp @@ -391,7 +391,7 @@ class MidiDriver_ThreadedMT32 : public MidiDriver_MT32 { private: OSystem::Mutex _eventMutex; MidiEvent_MT32 *_events; - Timer::TimerProc _timer_proc; + TimerManager::TimerProc _timer_proc; void pushMidiEvent(MidiEvent_MT32 *event); MidiEvent_MT32 *popMidiEvent(); @@ -405,7 +405,7 @@ public: void onTimer(); void close(); - void setTimerCallback(void *timer_param, Timer::TimerProc timer_proc); + void setTimerCallback(void *timer_param, TimerManager::TimerProc timer_proc); }; @@ -421,7 +421,7 @@ void MidiDriver_ThreadedMT32::close() { } } -void MidiDriver_ThreadedMT32::setTimerCallback(void *timer_param, Timer::TimerProc timer_proc) { +void MidiDriver_ThreadedMT32::setTimerCallback(void *timer_param, TimerManager::TimerProc timer_proc) { if (!_timer_proc || !timer_proc) { if (_timer_proc) g_timer->removeTimerProc(_timer_proc); |