[Scummvm-cvs-logs] CVS: scummvm/sound mpu401.cpp,1.12,1.13 mpu401.h,1.10,1.11
Max Horn
fingolfin at users.sourceforge.net
Wed Jun 11 00:15:10 CEST 2003
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv31213
Modified Files:
mpu401.cpp mpu401.h
Log Message:
fixed cast warnings
Index: mpu401.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mpu401.cpp 11 Jun 2003 05:54:45 -0000 1.12
+++ mpu401.cpp 11 Jun 2003 07:14:39 -0000 1.13
@@ -115,7 +115,7 @@
return NULL;
}
-void MidiDriver_MPU401::setTimerCallback (void *timer_param, void (*timer_proc) (void *)) {
+void MidiDriver_MPU401::setTimerCallback (void *timer_param, TimerCallback timer_proc) {
if (!_timer_proc || !timer_proc) {
_timer_proc = timer_proc;
_timer_param = timer_param;
@@ -132,7 +132,6 @@
}
#if !defined(__MORPHOS__) && !defined(__PALM_OS__)
-typedef void (*TimerCallback) (void*);
int MidiDriver_MPU401::midi_driver_thread(void *param) {
MidiDriver_MPU401 *mid = (MidiDriver_MPU401 *)param;
@@ -151,7 +150,7 @@
while (old_time < cur_time) {
old_time += 10;
if (mid->_timer_proc)
- (*(TimerCallback)(mid->_timer_proc)) (mid->_timer_param);
+ (*(mid->_timer_proc)) (mid->_timer_param);
}
}
Index: mpu401.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mpu401.h 11 Jun 2003 05:54:45 -0000 1.10
+++ mpu401.h 11 Jun 2003 07:14:39 -0000 1.11
@@ -75,10 +75,12 @@
class MidiDriver_MPU401 : public MidiDriver {
private:
+ typedef void (*TimerCallback) (void*);
+
MidiChannel_MPU401 _midi_channels [16];
volatile bool _started_thread;
void *_mutex; // Concurrent shutdown barrier
- volatile void *_timer_proc;
+ volatile TimerCallback _timer_proc;
void *_timer_param;
static int midi_driver_thread (void *param);
@@ -87,7 +89,7 @@
MidiDriver_MPU401();
virtual void close();
- void setTimerCallback(void *timer_param, void (*timer_proc) (void *));
+ void setTimerCallback(void *timer_param, TimerCallback timer_proc);
uint32 getBaseTempo(void) { return 10000; }
MidiChannel *allocateChannel();
More information about the Scummvm-git-logs
mailing list