diff options
| author | Max Horn | 2011-06-07 10:58:20 +0200 |
|---|---|---|
| committer | Max Horn | 2011-06-07 14:57:57 +0200 |
| commit | 0b859e026d4f2b4631afa76779976fae1f0c6878 (patch) | |
| tree | fd33001a5b56de959798ded0bbce9d50dd9cb388 | |
| parent | 8ac63a37a8a0e995b9228c90b24d4fbdffcf940d (diff) | |
| download | scummvm-rg350-0b859e026d4f2b4631afa76779976fae1f0c6878.tar.gz scummvm-rg350-0b859e026d4f2b4631afa76779976fae1f0c6878.tar.bz2 scummvm-rg350-0b859e026d4f2b4631afa76779976fae1f0c6878.zip | |
PSP: Use OSystem's 'slots' for timer/savefile manager
| -rw-r--r-- | backends/platform/psp/osys_psp.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/psp/osys_psp.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 4408cbf481..12916f8725 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -89,9 +89,9 @@ void OSystem_PSP::initBackend() { _imageViewer.setInputHandler(&_inputHandler); _imageViewer.setDisplayManager(&_displayManager); - _savefile = new PSPSaveFileManager; + _savefileManager = new PSPSaveFileManager; - _timer = new DefaultTimerManager(); + _timerManager = new DefaultTimerManager(); PSP_DEBUG_PRINT("calling keyboard.load()\n"); _keyboard.load(); // Load virtual keyboard files into memory diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 4f1d6f2fa7..8ca09924ad 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -45,9 +45,7 @@ class OSystem_PSP : public BaseBackend, public PaletteManager { private: - Common::SaveFileManager *_savefile; Audio::MixerImpl *_mixer; - Common::TimerManager *_timer; bool _pendingUpdate; // save an update we couldn't perform uint32 _pendingUpdateCounter; // prevent checking for pending update too often, in a cheap way @@ -63,7 +61,7 @@ private: ImageViewer _imageViewer; public: - OSystem_PSP() : _savefile(0), _mixer(0), _timer(0), _pendingUpdate(false), _pendingUpdateCounter(0) {} + OSystem_PSP() : _mixer(0), _pendingUpdate(false), _pendingUpdateCounter(0) {} ~OSystem_PSP(); static OSystem *instance(); @@ -133,7 +131,6 @@ public: // Timer typedef int (*TimerProc)(int interval); void setTimerCallback(TimerProc callback, int interval); - Common::TimerManager *getTimerManager() { return _timer; } // Mutex MutexRef createMutex(void); @@ -147,7 +144,6 @@ public: Audio::Mixer *getMixer() { return _mixer; } // Misc - Common::SaveFileManager *getSavefileManager() { return _savefile; } FilesystemFactory *getFilesystemFactory() { return &PSPFilesystemFactory::instance(); } void getTimeAndDate(TimeDate &t) const; virtual void engineDone(); |