Added SdlTimerManager. Added getMillis, delayMillis and getTimeAndDate to Common::TimerManager, DefaultTimerManager and ModularBackend. Removed timer code from OSystem_SDL.
svn-id: r49637
This commit is contained in:
parent
a77738e53b
commit
77f114b835
9 changed files with 152 additions and 76 deletions
|
@ -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();
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue