[Scummvm-cvs-logs] CVS: scummvm/sound mpu401.cpp,1.25,1.26 mididrv.h,1.35,1.36 mpu401.h,1.18,1.19

Max Horn fingolfin at users.sourceforge.net
Sun Aug 22 06:31:26 CEST 2004


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23715/sound

Modified Files:
	mpu401.cpp mididrv.h mpu401.h 
Log Message:
cleanup of TimerProc mess

Index: mpu401.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- mpu401.cpp	6 Jan 2004 12:45:33 -0000	1.25
+++ mpu401.cpp	22 Aug 2004 13:27:34 -0000	1.26
@@ -125,7 +125,7 @@
 	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);

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- mididrv.h	26 Apr 2004 20:34:59 -0000	1.35
+++ mididrv.h	22 Aug 2004 13:27:34 -0000	1.36
@@ -125,7 +125,7 @@
 	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

Index: mpu401.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mpu401.h	6 Jan 2004 12:45:33 -0000	1.18
+++ mpu401.h	22 Aug 2004 13:27:34 -0000	1.19
@@ -70,17 +70,15 @@
 
 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);
 





More information about the Scummvm-git-logs mailing list