2 files changed, 26 insertions, 0 deletions
diff --git a/common/system.cpp b/common/system.cpp
index 614dff6199..d15f026df0 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -31,6 +31,7 @@
 
 #include "common/config-manager.h"
 #include "common/system.h"
+#include "common/timer.h"
 #include "common/util.h"
 
 OSystem *g_system = 0;
@@ -63,9 +64,22 @@ void OSystem::displayMessageOnOSD(const char *msg) {
 }
 
 Common::SaveFileManager *OSystem::getSavefileManager() {
+	// TODO: Change this to always return the same 
+	// instance, instead of a new one each time around...
 	return new DefaultSaveFileManager();
 }
 
+Audio::Mixer *OSystem::getMixer() {
+	// FIXME
+	extern Audio::Mixer *g_mixer;
+	return g_mixer;
+}
+
+Common::TimerManager *OSystem::getTimerManager() {
+	// FIXME
+	return Common::g_timer;
+}
+
 
 bool OSystem::openCD(int drive) {
 	return false;
diff --git a/common/system.h b/common/system.h
index 9508520cc1..1682426ab0 100644
--- a/common/system.h
+++ b/common/system.h
@@ -28,12 +28,17 @@
 #include "common/mutex.h"
 #include "common/rect.h"
 
+namespace Audio {
+	class Mixer;
+}
+
 namespace Graphics {
 	struct Surface;
 }
 
 namespace Common {
 	class SaveFileManager;
+	class TimerManager;
 }
 
 /**
@@ -970,6 +975,13 @@ public:
 	/** Savefile management. */
 	virtual Common::SaveFileManager *getSavefileManager();
 
+
+	/** TODO */
+	virtual Audio::Mixer *getMixer();
+
+	/** TODO */
+	virtual Common::TimerManager *getTimerManager();
+
 	//@}
 };