Added OSystem::getTimerManager and OSystem::getMixer methods (wip)

svn-id: r24405

1 files changed, 11 insertions, 0 deletions

diff --git a/base/main.cpp b/base/main.cpp
index ced240973f..6c97e4243b 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -44,6 +44,7 @@
 #include "gui/newgui.h"
 #include "gui/message.h"
 #include "sound/mididrv.h"
+#include "sound/mixer.h"
 
 #if defined(_WIN32_WCE)
 #include "backends/platform/wince/CELauncherDialog.h"
@@ -225,6 +226,11 @@ static int runGame(const Plugin *plugin, OSystem &system, const Common::String &
 	return result;
 }
 
+
+// FIXME: Temporary hack, to be removed soon
+Audio::Mixer *g_mixer = 0;
+
+
 extern "C" int scummvm_main(int argc, char *argv[]) {
 	Common::String specialDebug;
 	Common::String command;
@@ -284,6 +290,8 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 
 	// Create the timer services
 	Common::g_timer = new DefaultTimerManager(&system);
+	
+	g_mixer = new Audio::Mixer();
 
 	// Set initial window caption
 	system.setWindowCaption(gScummVMFullVersion);
@@ -328,6 +336,9 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 		launcherDialog(system);
 	}
 
+	// Deinit the mixer
+	delete g_mixer;
+
 	// Deinit the timer
 	delete Common::g_timer;