[Scummvm-cvs-logs] CVS: scummvm/backends/midi ym2612.cpp,1.22,1.23 adlib.cpp,1.57,1.58
Max Horn
fingolfin at users.sourceforge.net
Sun Aug 22 06:31:23 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23715/backends/midi
Modified Files:
ym2612.cpp adlib.cpp
Log Message:
cleanup of TimerProc mess
Index: ym2612.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/ym2612.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ym2612.cpp 6 Jan 2004 12:45:27 -0000 1.22
+++ ym2612.cpp 22 Aug 2004 13:27:32 -0000 1.23
@@ -166,8 +166,7 @@
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 @@
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 @@
_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;
}
Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- adlib.cpp 19 Mar 2004 07:36:20 -0000 1.57
+++ adlib.cpp 22 Aug 2004 13:27:32 -0000 1.58
@@ -537,8 +537,6 @@
lookup_table[i][0] = 0;
}
-typedef void TimerCallback (void *);
-
////////////////////////////////////////
//
// Adlib MIDI driver
@@ -561,7 +559,7 @@
void setPitchBendRange(byte channel, uint range);
void sysEx_customInstrument(byte channel, uint32 type, byte *instr);
- void setTimerCallback(void *timer_param, TimerProc timer_proc);
+ void setTimerCallback(void *timer_param, Timer::TimerProc timer_proc);
uint32 getBaseTempo() {
return 1000000 / BASE_FREQ;
}
@@ -577,7 +575,7 @@
byte *_adlib_reg_cache;
SoundMixer *_mixer;
- TimerCallback *_timer_proc;
+ Timer::TimerProc _timer_proc;
void *_timer_param;
int _adlib_timer_counter;
@@ -966,7 +964,7 @@
_parts[channel].sysEx_customInstrument(type, instr);
}
-void MidiDriver_ADLIB::setTimerCallback(void *timer_param, TimerProc timer_proc) {
+void MidiDriver_ADLIB::setTimerCallback(void *timer_param, Timer::TimerProc timer_proc) {
_timer_proc = timer_proc;
_timer_param = timer_param;
}
More information about the Scummvm-git-logs
mailing list