diff options
| author | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-13 02:09:09 +0200 |
| commit | bca8ce861ad3439881fef0f916b592aafc4ee010 (patch) | |
| tree | caaa3d79b0b47624ef48a48248b63f765a5e0628 /backends/platform/maemo/maemo.cpp | |
| parent | c1b5626bca1e0e08316353f1ead00ed763cd5380 (diff) | |
| parent | c839fd50b5ddfcceada8cbbd3046ce219df248a0 (diff) | |
| download | scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.gz scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.tar.bz2 scummvm-rg350-bca8ce861ad3439881fef0f916b592aafc4ee010.zip | |
Merge remote-tracking branch 'origin/master' into wintermute
Diffstat (limited to 'backends/platform/maemo/maemo.cpp')
| -rw-r--r-- | backends/platform/maemo/maemo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index e296d4787c..6bd229177b 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -43,6 +43,7 @@ namespace Maemo { OSystem_SDL_Maemo::OSystem_SDL_Maemo() : + _eventObserver(0), OSystem_POSIX() { } @@ -84,6 +85,9 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap #endif void OSystem_SDL_Maemo::initBackend() { + ConfMan.registerDefault("fullscreen", true); + ConfMan.registerDefault("aspect_ratio", true); + // Create the events manager if (_eventSource == 0) _eventSource = new MaemoSdlEventSource(); @@ -180,6 +184,7 @@ void OSystem_SDL_Maemo::setupIcon() { // http://bugzilla.libsdl.org/show_bug.cgi?id=586 } +#ifdef ENABLE_KEYMAPPER static const Common::KeyTableEntry maemoKeys[] = { // Function keys {"MENU", Common::KEYCODE_F11, 0, "Menu", false}, @@ -191,7 +196,6 @@ static const Common::KeyTableEntry maemoKeys[] = { {0, Common::KEYCODE_INVALID, 0, 0, false} }; -#ifdef ENABLE_KEYMAPPER Common::HardwareInputSet *OSystem_SDL_Maemo::getHardwareInputSet() { return new Common::HardwareInputSet(true, maemoKeys); } |