aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl/sdl.h
diff options
context:
space:
mode:
authorAlejandro Marzini2010-06-13 21:09:52 +0000
committerAlejandro Marzini2010-06-13 21:09:52 +0000
commit77f114b835eaafcc334ad38c407faaa04cb62eb8 (patch)
treef002824921d8babc0c3ceab53fc44e5aa5cce286 /backends/platform/sdl/sdl.h
parenta77738e53b8c52ebe8bf56fa753692832f851956 (diff)
downloadscummvm-rg350-77f114b835eaafcc334ad38c407faaa04cb62eb8.tar.gz
scummvm-rg350-77f114b835eaafcc334ad38c407faaa04cb62eb8.tar.bz2
scummvm-rg350-77f114b835eaafcc334ad38c407faaa04cb62eb8.zip
Added SdlTimerManager. Added getMillis, delayMillis and getTimeAndDate to Common::TimerManager, DefaultTimerManager and ModularBackend. Removed timer code from OSystem_SDL.
svn-id: r49637
Diffstat (limited to 'backends/platform/sdl/sdl.h')
-rw-r--r--backends/platform/sdl/sdl.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 5a621a8645..8dae6a779c 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -33,22 +33,7 @@
#endif
#include "backends/modular-backend.h"
-
-#include "backends/mutex/sdl/sdl-mutex.h"
#include "backends/graphics/sdl/sdl-graphics.h"
-#include "backends/audiocd/sdl/sdl-audiocd.h"
-
-#include "graphics/scaler.h"
-
-
-namespace Audio {
- class MixerImpl;
-}
-
-#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
-// Uncomment this to enable the 'on screen display' code.
-#define USE_OSD 1
-#endif
class OSystem_SDL : public ModularBackend {
public:
@@ -57,14 +42,6 @@ public:
virtual void initBackend();
- // Get the number of milliseconds since the program was started.
- uint32 getMillis();
-
- // Delay for a specified amount of milliseconds
- void delayMillis(uint msecs);
-
- virtual void getTimeAndDate(TimeDate &t) const;
-
// Define all hardware keys for keymapper
virtual Common::HardwareKeySet *getHardwareKeySet();
@@ -86,8 +63,6 @@ public:
protected:
bool _inited;
- SDL_TimerID _timerID;
-
void setupIcon();
};