aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostas Nakos2009-07-12 15:59:27 +0000
committerKostas Nakos2009-07-12 15:59:27 +0000
commitd6fb5bb9227aeaf5452af722d27bdde4c6805337 (patch)
tree05dfed026791c2fb3ff9923b5f4b1f729009ef87
parent32f1e47effadf6e361f3e6c658ca43a36f37852a (diff)
downloadscummvm-rg350-d6fb5bb9227aeaf5452af722d27bdde4c6805337.tar.gz
scummvm-rg350-d6fb5bb9227aeaf5452af722d27bdde4c6805337.tar.bz2
scummvm-rg350-d6fb5bb9227aeaf5452af722d27bdde4c6805337.zip
Apply patch 2802544: WINCE: Implement OSystem::engineInit to remove hack
svn-id: r42419
-rwxr-xr-x[-rw-r--r--]backends/platform/wince/wince-sdl.cpp7
-rw-r--r--backends/platform/wince/wince-sdl.h3
2 files changed, 2 insertions, 8 deletions
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index b8261d029e..9a4b312631 100644..100755
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -908,18 +908,13 @@ int OSystem_WINCE3::getOutputSampleRate() const {
return _sampleRate;
}
-void OSystem_WINCE3::setWindowCaption(const char *caption) {
+void OSystem_WINCE3::engineInit() {
check_mappings(); // called here to initialize virtual keys handling
//update_game_settings();
// finalize mixer init
compute_sample_rate();
setupMixer();
-
-FIXME: move check_mappings() etc. calls to engineInit() & engineDone()
-
- // handle the actual event
- OSystem_SDL::setWindowCaption(caption);
}
bool OSystem_WINCE3::openCD(int drive) {
diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h
index 13f20ecccf..cc2948f93d 100644
--- a/backends/platform/wince/wince-sdl.h
+++ b/backends/platform/wince/wince-sdl.h
@@ -84,7 +84,7 @@ public:
// Overloaded from SDL backend (master volume and sample rate subtleties)
void setupMixer();
// Overloaded from OSystem
- //void engineInit();
+ void engineInit();
void getTimeAndDate(struct tm &t) const;
virtual Common::SeekableReadStream *createConfigReadStream();
virtual Common::WriteStream *createConfigWriteStream();
@@ -145,7 +145,6 @@ protected:
//int getGraphicsMode() const;
int getDefaultGraphicsMode() const;
- void setWindowCaption(const char *caption);
bool openCD(int drive);
int getOutputSampleRate() const;