cleanup of TimerProc mess

svn-id: r14683

3 files changed, 4 insertions, 6 deletions

diff --git a/sound/mididrv.h b/sound/mididrv.h
index 24aaab9bf9..512ff6b6ab 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -125,7 +125,7 @@ public:
 	virtual void metaEvent (byte type, byte*data, uint16 length) { }
 
 	// Timing functions - MidiDriver now operates timers
-	virtual void setTimerCallback (void *timer_param, TimerProc timer_proc) = 0;
+	virtual void setTimerCallback (void *timer_param, Timer::TimerProc timer_proc) = 0;
 	virtual uint32 getBaseTempo (void) = 0;
 
 	// Channel allocation functions
diff --git a/sound/mpu401.cpp b/sound/mpu401.cpp
index ae1fe32de9..e301986a83 100644
--- a/sound/mpu401.cpp
+++ b/sound/mpu401.cpp
@@ -125,7 +125,7 @@ MidiChannel *MidiDriver_MPU401::allocateChannel() {
 	return NULL;
 }
 
-void MidiDriver_MPU401::setTimerCallback(void *timer_param, TimerProc timer_proc) {
+void MidiDriver_MPU401::setTimerCallback(void *timer_param, Timer::TimerProc timer_proc) {
 	if (!_timer_proc || !timer_proc) {
 		if (_timer_proc)
 			g_timer->removeTimerProc(_timer_proc);
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);