[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.51,1.52 ym2612.cpp,1.18,1.19

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv8102/backends/midi

Modified Files:
	adlib.cpp ym2612.cpp 
Log Message:
cleanup

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- adlib.cpp	28 Sep 2003 21:08:47 -0000	1.51
+++ adlib.cpp	18 Oct 2003 13:04:59 -0000	1.52
@@ -561,7 +561,7 @@
 	void setPitchBendRange(byte channel, uint range); 
 	void sysEx_customInstrument(byte channel, uint32 type, byte *instr);
 
-	void setTimerCallback(void *timer_param, void (*timer_proc) (void *));
+	void setTimerCallback(void *timer_param, TimerProc timer_proc);
 	uint32 getBaseTempo() {
 		return 1000000 / BASE_FREQ;
 	}
@@ -970,8 +970,8 @@
 	_parts[channel].sysEx_customInstrument(type, instr);
 }
 
-void MidiDriver_ADLIB::setTimerCallback(void *timer_param, void (*timer_proc) (void *)) {
-	_timer_proc = (TimerCallback *) timer_proc;
+void MidiDriver_ADLIB::setTimerCallback(void *timer_param, TimerProc timer_proc) {
+	_timer_proc = timer_proc;
 	_timer_param = timer_param;
 }
 

Index: ym2612.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/ym2612.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ym2612.cpp	17 Oct 2003 08:15:00 -0000	1.18
+++ ym2612.cpp	18 Oct 2003 13:04:59 -0000	1.19
@@ -193,7 +193,7 @@
 	void setPitchBendRange(byte channel, uint range) { }
 	void sysEx(byte *msg, uint16 length);
 
-	void setTimerCallback(void *timer_param, void (*timer_proc)(void *));
+	void setTimerCallback(void *timer_param, TimerProc timer_proc);
 	uint32 getBaseTempo() { return 1000000 / BASE_FREQ; }
 
 	MidiChannel *allocateChannel() { return 0; }
@@ -770,8 +770,8 @@
 	_mixer->setupPremix(0, 0);
 }
 
-void MidiDriver_YM2612::setTimerCallback(void *timer_param, void (*timer_proc)(void *)) {
-	_timer_proc = (TimerCallback *) timer_proc;
+void MidiDriver_YM2612::setTimerCallback(void *timer_param, TimerProc timer_proc) {
+	_timer_proc = timer_proc;
 	_timer_param = timer_param;
 }