diff options
author | Max Horn | 2006-10-21 12:03:43 +0000 |
---|---|---|
committer | Max Horn | 2006-10-21 12:03:43 +0000 |
commit | f95f5ed13356233b1f1976c6a793b6e104373a4d (patch) | |
tree | 299fd488a8742bcc0245ad3ae3c5e112f6742645 /common/system.cpp | |
parent | 772affc7dbb75faad85b69c00b381d12340f809d (diff) | |
download | scummvm-rg350-f95f5ed13356233b1f1976c6a793b6e104373a4d.tar.gz scummvm-rg350-f95f5ed13356233b1f1976c6a793b6e104373a4d.tar.bz2 scummvm-rg350-f95f5ed13356233b1f1976c6a793b6e104373a4d.zip |
Added OSystem::getTimerManager and OSystem::getMixer methods (wip)
svn-id: r24405
Diffstat (limited to 'common/system.cpp')
-rw-r--r-- | common/system.cpp | 14 |
1 files changed, 14 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; |