diff options
author | Max Horn | 2003-10-18 13:04:59 +0000 |
---|---|---|
committer | Max Horn | 2003-10-18 13:04:59 +0000 |
commit | 7eab653832b85f8da29ab4dab50f28948d040e37 (patch) | |
tree | 1c2f08ede084b491f7fd517fae22382e0b3ec2b7 /backends/midi | |
parent | 1a8397a475479827b72b9423e6c9eedb8763746d (diff) | |
download | scummvm-rg350-7eab653832b85f8da29ab4dab50f28948d040e37.tar.gz scummvm-rg350-7eab653832b85f8da29ab4dab50f28948d040e37.tar.bz2 scummvm-rg350-7eab653832b85f8da29ab4dab50f28948d040e37.zip |
cleanup
svn-id: r10894
Diffstat (limited to 'backends/midi')
-rw-r--r-- | backends/midi/adlib.cpp | 6 | ||||
-rw-r--r-- | backends/midi/ym2612.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/backends/midi/adlib.cpp b/backends/midi/adlib.cpp index 8cde3a0b6e..8eebde5240 100644 --- a/backends/midi/adlib.cpp +++ b/backends/midi/adlib.cpp @@ -561,7 +561,7 @@ public: 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 @@ void MidiDriver_ADLIB::sysEx_customInstrument(byte channel, uint32 type, byte *i _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; } diff --git a/backends/midi/ym2612.cpp b/backends/midi/ym2612.cpp index 0b1eb28c9f..f90c330aba 100644 --- a/backends/midi/ym2612.cpp +++ b/backends/midi/ym2612.cpp @@ -193,7 +193,7 @@ public: 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 @@ void MidiDriver_YM2612::close() { _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; } |