[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.h,1.44,1.45 mpu401.cpp,1.28,1.29 mpu401.h,1.22,1.23

[Max Horn]

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

Modified Files:
	mididrv.h mpu401.cpp mpu401.h 
Log Message:
Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- mididrv.h	13 Apr 2005 00:11:49 -0000	1.44
+++ mididrv.h	10 May 2005 23:17:37 -0000	1.45
@@ -146,7 +146,7 @@
 	virtual void metaEvent (byte type, byte*data, uint16 length) { }
 
 	// Timing functions - MidiDriver now operates timers
-	virtual void setTimerCallback (void *timer_param, Timer::TimerProc timer_proc) = 0;
+	virtual void setTimerCallback (void *timer_param, Common::Timer::TimerProc timer_proc) = 0;
 	
 	/** The time in microseconds between invocations of the timer callback. */
 	virtual uint32 getBaseTempo (void) = 0;

Index: mpu401.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mpu401.cpp	1 Jan 2005 16:09:23 -0000	1.28
+++ mpu401.cpp	10 May 2005 23:17:37 -0000	1.29
@@ -99,7 +99,7 @@
 
 void MidiDriver_MPU401::close() {
 	if (_timer_proc)
-		g_timer->removeTimerProc(_timer_proc);
+		Common::g_timer->removeTimerProc(_timer_proc);
 	_timer_proc = 0;
 	for (int i = 0; i < 16; ++i)
 		send (0x7B << 8 | 0xB0 | i);
@@ -130,12 +130,12 @@
 	return NULL;
 }
 
-void MidiDriver_MPU401::setTimerCallback(void *timer_param, Timer::TimerProc timer_proc) {
+void MidiDriver_MPU401::setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc) {
 	if (!_timer_proc || !timer_proc) {
 		if (_timer_proc)
-			g_timer->removeTimerProc(_timer_proc);
+			Common::g_timer->removeTimerProc(_timer_proc);
 		_timer_proc = timer_proc;
 		if (timer_proc)
-			g_timer->installTimerProc(timer_proc, 10000, timer_param);
+			Common::g_timer->installTimerProc(timer_proc, 10000, timer_param);
 	}
 }

Index: mpu401.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mpu401.h	10 Jan 2005 22:06:19 -0000	1.22
+++ mpu401.h	10 May 2005 23:17:37 -0000	1.23
@@ -70,14 +70,14 @@
 class MidiDriver_MPU401 : public MidiDriver {
 private:
 	MidiChannel_MPU401 _midi_channels [16];
-	Timer::TimerProc _timer_proc;
+	Common::Timer::TimerProc _timer_proc;
 	uint16 _channel_mask;
 
 public:
 	MidiDriver_MPU401();
 
 	virtual void close();
-	void setTimerCallback(void *timer_param, Timer::TimerProc timer_proc);
+	void setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc);
 	uint32 getBaseTempo(void) { return 10000; }
 	uint32 property(int prop, uint32 param);