diff options
| author | Bastien Bouclet | 2015-10-16 20:26:34 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2016-07-28 18:23:46 +0200 |
| commit | ad3ab61241d5878c9b66f78f3927adb97f5a84e8 (patch) | |
| tree | f1abd0d54a80777e1547c16eb72860dacbc75120 | |
| parent | 823c2f899b480a1fa494b08e1471142129293779 (diff) | |
| download | scummvm-rg350-ad3ab61241d5878c9b66f78f3927adb97f5a84e8.tar.gz scummvm-rg350-ad3ab61241d5878c9b66f78f3927adb97f5a84e8.tar.bz2 scummvm-rg350-ad3ab61241d5878c9b66f78f3927adb97f5a84e8.zip | |
COMMON: Remove the EventRecorder dependency from OSystem
EventRecorder is in the gui lib which is not linked in the cxxtest suite.
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 8 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.h | 1 | ||||
| -rw-r--r-- | common/system.cpp | 7 | ||||
| -rw-r--r-- | common/system.h | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index c55753194b..dca6891fef 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -492,6 +492,14 @@ AudioCDManager *OSystem_SDL::createAudioCDManager() { #endif } +Common::SaveFileManager *OSystem_SDL::getSavefileManager() { +#ifdef ENABLE_EVENTRECORDER + return g_eventRec.getSaveManager(_savefileManager); +#else + return _savefileManager; +#endif +} + #ifdef USE_OPENGL const OSystem::GraphicsMode *OSystem_SDL::getSupportedGraphicsModes() const { diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index c93c8308a7..1fe670c5c3 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -76,6 +76,7 @@ public: virtual void getTimeAndDate(TimeDate &td) const; virtual Audio::Mixer *getMixer(); virtual Common::TimerManager *getTimerManager(); + virtual Common::SaveFileManager *getSavefileManager(); protected: bool _inited; diff --git a/common/system.cpp b/common/system.cpp index 53f28cafa1..131a7d2580 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -30,9 +30,6 @@ #include "common/taskbar.h" #include "common/updates.h" #include "common/textconsole.h" -#ifdef ENABLE_EVENTRECORDER -#include "gui/EventRecorder.h" -#endif #include "backends/audiocd/default/default-audiocd.h" #include "backends/fs/fs-factory.h" @@ -161,9 +158,5 @@ Common::TimerManager *OSystem::getTimerManager() { } Common::SaveFileManager *OSystem::getSavefileManager() { -#ifdef ENABLE_EVENTRECORDER - return g_eventRec.getSaveManager(_savefileManager); -#else return _savefileManager; -#endif } diff --git a/common/system.h b/common/system.h index 8896554f76..6d185d3075 100644 --- a/common/system.h +++ b/common/system.h @@ -1090,7 +1090,7 @@ public: * and other modifiable persistent game data. For more information, * refer to the SaveFileManager documentation. */ - Common::SaveFileManager *getSavefileManager(); + virtual Common::SaveFileManager *getSavefileManager(); #if defined(USE_TASKBAR) /** |