aboutsummaryrefslogtreecommitdiff
path: root/backends/midi/ym2612.cpp
diff options
context:
space:
mode:
authorMax Horn2004-08-22 13:27:34 +0000
committerMax Horn2004-08-22 13:27:34 +0000
commit759cd67de518a583804ccfb14d5fead44ef05e96 (patch)
tree6692779fa4d01fecbf54f0ab162df7cfefe73975 /backends/midi/ym2612.cpp
parent50719f7b6843ba6383ca75c881af589d947150f2 (diff)
downloadscummvm-rg350-759cd67de518a583804ccfb14d5fead44ef05e96.tar.gz
scummvm-rg350-759cd67de518a583804ccfb14d5fead44ef05e96.tar.bz2
scummvm-rg350-759cd67de518a583804ccfb14d5fead44ef05e96.zip
cleanup of TimerProc mess
svn-id: r14683
Diffstat (limited to 'backends/midi/ym2612.cpp')
-rw-r--r--backends/midi/ym2612.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/backends/midi/ym2612.cpp b/backends/midi/ym2612.cpp
index de13537c1c..c6fe5bb646 100644
--- a/backends/midi/ym2612.cpp
+++ b/backends/midi/ym2612.cpp
@@ -166,8 +166,7 @@ protected:
bool _isOpen;
SoundMixer *_mixer;
- typedef void TimerCallback(void *);
- TimerCallback *_timer_proc;
+ Timer::TimerProc _timer_proc;
void *_timer_param;
int _next_tick;
int _samples_per_tick;
@@ -194,7 +193,7 @@ public:
void setPitchBendRange(byte channel, uint range) { }
void sysEx(byte *msg, uint16 length);
- void setTimerCallback(void *timer_param, TimerProc timer_proc);
+ void setTimerCallback(void *timer_param, Timer::TimerProc timer_proc);
uint32 getBaseTempo() { return 1000000 / BASE_FREQ; }
MidiChannel *allocateChannel() { return 0; }
@@ -769,7 +768,7 @@ void MidiDriver_YM2612::close() {
_mixer->setupPremix(0, 0);
}
-void MidiDriver_YM2612::setTimerCallback(void *timer_param, TimerProc timer_proc) {
+void MidiDriver_YM2612::setTimerCallback(void *timer_param, Timer::TimerProc timer_proc) {
_timer_proc = timer_proc;
_timer_param = timer_param;
}