Renamed class Timer to TimerManager (the old name was somewhat incorrect/confusing)

svn-id: r23278

5 files changed, 9 insertions, 9 deletions

diff --git a/sound/mididrv.h b/sound/mididrv.h
index 4c9ab81855..b2d4d37aa0 100644
--- a/sound/mididrv.h
+++ b/sound/mididrv.h
@@ -190,7 +190,7 @@ public:
 	virtual void metaEvent(byte type, byte *data, uint16 length) { }
 
 	// Timing functions - MidiDriver now operates timers
-	virtual void setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc) = 0;
+	virtual void setTimerCallback(void *timer_param, Common::TimerManager::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 7d6c3ff5ee..58c00b4e6a 100644
--- a/sound/mpu401.cpp
+++ b/sound/mpu401.cpp
@@ -131,7 +131,7 @@ MidiChannel *MidiDriver_MPU401::allocateChannel() {
 	return NULL;
 }
 
-void MidiDriver_MPU401::setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc) {
+void MidiDriver_MPU401::setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) {
 	if (!_timer_proc || !timer_proc) {
 		if (_timer_proc)
 			Common::g_timer->removeTimerProc(_timer_proc);
diff --git a/sound/mpu401.h b/sound/mpu401.h
index 1c7b0b00f7..bbdb490585 100644
--- a/sound/mpu401.h
+++ b/sound/mpu401.h
@@ -71,14 +71,14 @@ public:
 class MidiDriver_MPU401 : public MidiDriver {
 private:
 	MidiChannel_MPU401 _midi_channels[16];
-	Common::Timer::TimerProc _timer_proc;
+	Common::TimerManager::TimerProc _timer_proc;
 	uint16 _channel_mask;
 
 public:
 	MidiDriver_MPU401();
 
 	virtual void close();
-	void setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc);
+	void setTimerCallback(void *timer_param, Common::TimerManager::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 89124b8024..557e9b04cc 100644
--- a/sound/softsynth/emumidi.h
+++ b/sound/softsynth/emumidi.h
@@ -32,7 +32,7 @@ protected:
 	Audio::Mixer *_mixer;
 
 private:
-	Common::Timer::TimerProc _timerProc;
+	Common::TimerManager::TimerProc _timerProc;
 	void *_timerParam;
 
 	int _nextTick;
@@ -70,7 +70,7 @@ public:
 		return 0;
 	}
 
-	void setTimerCallback(void *timer_param, Common::Timer::TimerProc timer_proc) {
+	void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) {
 		_timerProc = timer_proc;
 		_timerParam = timer_param;
 	}
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp
index 1f3434c581..57ab87cb08 100644
--- a/sound/softsynth/mt32.cpp
+++ b/sound/softsynth/mt32.cpp
@@ -391,7 +391,7 @@ class MidiDriver_ThreadedMT32 : public MidiDriver_MT32 {
 private:
 	OSystem::Mutex _eventMutex;
 	MidiEvent_MT32 *_events;
-	Timer::TimerProc _timer_proc;
+	TimerManager::TimerProc _timer_proc;
 
 	void pushMidiEvent(MidiEvent_MT32 *event);
 	MidiEvent_MT32 *popMidiEvent();
@@ -405,7 +405,7 @@ public:
 
 	void onTimer();
 	void close();
-	void setTimerCallback(void *timer_param, Timer::TimerProc timer_proc);
+	void setTimerCallback(void *timer_param, TimerManager::TimerProc timer_proc);
 };
 
 
@@ -421,7 +421,7 @@ void MidiDriver_ThreadedMT32::close() {
 	}
 }
 
-void MidiDriver_ThreadedMT32::setTimerCallback(void *timer_param, Timer::TimerProc timer_proc) {
+void MidiDriver_ThreadedMT32::setTimerCallback(void *timer_param, TimerManager::TimerProc timer_proc) {
 	if (!_timer_proc || !timer_proc) {
 		if (_timer_proc)
 			g_timer->removeTimerProc(_timer_proc);