Moved (In/Out)SaveFile(Manager) and Timer to namespace Common

svn-id: r18038

4 files changed, 9 insertions, 9 deletions

diff --git a/sound/mididrv.h b/sound/mididrv.h
index af538d096a..98b29747d2 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -146,7 +146,7 @@ public:
 	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;
diff --git a/sound/mpu401.cpp b/sound/mpu401.cpp
index 88a1afd32f..00e867cf3a 100644
--- a/sound/mpu401.cpp
+++ b/sound/mpu401.cpp
@@ -99,7 +99,7 @@ MidiDriver_MPU401::MidiDriver_MPU401() :
 
 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 @@ MidiChannel *MidiDriver_MPU401::allocateChannel() {
 	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);
 	}
 }
diff --git a/sound/mpu401.h b/sound/mpu401.h
index 7b722df7c9..6dc391aaca 100644
--- a/sound/mpu401.h
+++ b/sound/mpu401.h
@@ -70,14 +70,14 @@ public:
 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);
 
diff --git a/sound/softsynth/emumidi.h b/sound/softsynth/emumidi.h
index 160a4fa83b..19e2e86476 100644
--- a/sound/softsynth/emumidi.h
+++ b/sound/softsynth/emumidi.h
@@ -31,7 +31,7 @@ protected:
 	SoundMixer *_mixer;
 
 private:
-	Timer::TimerProc _timerProc;
+	Common::Timer::TimerProc _timerProc;
 	void *_timerParam;
 
 	int _nextTick;
@@ -69,7 +69,7 @@ public:
 		return 0;
 	}
 
-	void setTimerCallback(void *timer_param, Timer::TimerProc timer_proc) {
+	void setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc) {
 		_timerProc = timer_proc;
 		_timerParam = timer_param;
 	}