aboutsummaryrefslogtreecommitdiff
path: root/sound/mpu401.h
diff options
context:
space:
mode:
authorMax Horn2004-08-22 13:27:34 +0000
committerMax Horn2004-08-22 13:27:34 +0000
commit759cd67de518a583804ccfb14d5fead44ef05e96 (patch)
tree6692779fa4d01fecbf54f0ab162df7cfefe73975 /sound/mpu401.h
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 'sound/mpu401.h')
-rw-r--r--sound/mpu401.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/mpu401.h b/sound/mpu401.h
index 5d87f52bc1..365c46c5a5 100644
--- a/sound/mpu401.h
+++ b/sound/mpu401.h
@@ -70,17 +70,15 @@ public:
class MidiDriver_MPU401 : public MidiDriver {
private:
- typedef void (*TimerProc)(void *refCon); // Copied from class Timer
-
MidiChannel_MPU401 _midi_channels [16];
- TimerProc _timer_proc;
+ Timer::TimerProc _timer_proc;
uint16 _channel_mask;
public:
MidiDriver_MPU401();
virtual void close();
- void setTimerCallback(void *timer_param, TimerProc timer_proc);
+ void setTimerCallback(void *timer_param, Timer::TimerProc timer_proc);
uint32 getBaseTempo(void) { return 10000; }
uint32 property(int prop, uint32 param);