diff options
author | Eugene Sandulenko | 2013-07-18 08:15:28 -0700 |
---|---|---|
committer | Eugene Sandulenko | 2013-07-18 08:15:28 -0700 |
commit | 2c812ade01714351aeda3dbbe877d376ad3d48ca (patch) | |
tree | 61daae8cca200b51fdea0c82ecc2d555e97ba865 /gui/EventRecorder.h | |
parent | 2eb26ad02ead5fc65cc206cb287ff04c84eba4e8 (diff) | |
parent | 4a7e4e5b22da3587a9d68978d7be31e4e78a8ccc (diff) | |
download | scummvm-rg350-2c812ade01714351aeda3dbbe877d376ad3d48ca.tar.gz scummvm-rg350-2c812ade01714351aeda3dbbe877d376ad3d48ca.tar.bz2 scummvm-rg350-2c812ade01714351aeda3dbbe877d376ad3d48ca.zip |
Merge pull request #353 from clone2727/eventrec_timer_fix
ALL: Don't use EventRecorder at all when not compiled in
Diffstat (limited to 'gui/EventRecorder.h')
-rw-r--r-- | gui/EventRecorder.h | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/gui/EventRecorder.h b/gui/EventRecorder.h index 60fe07fafc..68ffe16fbc 100644 --- a/gui/EventRecorder.h +++ b/gui/EventRecorder.h @@ -233,61 +233,6 @@ private: } // End of namespace GUI -#else - -#ifdef SDL_BACKEND -#include "backends/timer/default/default-timer.h" -#include "backends/mixer/sdl/sdl-mixer.h" -#endif - -#define g_eventRec (GUI::EventRecorder::instance()) - -namespace GUI { - -class EventRecorder : private Common::EventSource, public Common::Singleton<EventRecorder>, private Common::DefaultEventMapper { - friend class Common::Singleton<SingletonBaseType>; - - public: - EventRecorder() { -#ifdef SDL_BACKEND - _timerManager = NULL; - _realMixerManager = NULL; -#endif - } - ~EventRecorder() {} - - bool pollEvent(Common::Event &ev) { return false; } - void RegisterEventSource() {} - void deinit() {} - void suspendRecording() {} - void resumeRecording() {} - void preDrawOverlayGui() {} - void postDrawOverlayGui() {} - void processGameDescription(const ADGameDescription *desc) {} - void updateSubsystems() {} - uint32 getRandomSeed(const Common::String &name) { return g_system->getMillis(); } - Common::SaveFileManager *getSaveManager(Common::SaveFileManager *realSaveManager) { return realSaveManager; } - -#ifdef SDL_BACKEND - private: - DefaultTimerManager *_timerManager; - SdlMixerManager *_realMixerManager; - - public: - DefaultTimerManager *getTimerManager() { return _timerManager; } - void registerTimerManager(DefaultTimerManager *timerManager) { _timerManager = timerManager; } - - SdlMixerManager *getMixerManager() { return _realMixerManager; } - void registerMixerManager(SdlMixerManager *mixerManager) { _realMixerManager = mixerManager; } - - void processMillis(uint32 &millis, bool skipRecord) {} - bool processDelayMillis() { return false; } -#endif - -}; - -} // namespace GUI - #endif // ENABLE_EVENTRECORDER #endif |