aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/maemo/maemo.cpp
diff options
context:
space:
mode:
authorD G Turner2012-07-16 01:24:40 +0100
committerD G Turner2012-07-16 01:24:40 +0100
commite73dffa57cbe65ffb10af4f2a5b47f644269caab (patch)
tree191c3e8e2ebdf81dec58d4006a98ca20a688120b /backends/platform/maemo/maemo.cpp
parent9669b73ca811af9672215748e92acb3f77805b75 (diff)
parent1fffbe40ceb82bec77479c56176abeff0d2bd5e5 (diff)
downloadscummvm-rg350-e73dffa57cbe65ffb10af4f2a5b47f644269caab.tar.gz
scummvm-rg350-e73dffa57cbe65ffb10af4f2a5b47f644269caab.tar.bz2
scummvm-rg350-e73dffa57cbe65ffb10af4f2a5b47f644269caab.zip
Merge branch 'master' into teenagentRefactor
Conflicts: engines/teenagent/resources.cpp
Diffstat (limited to 'backends/platform/maemo/maemo.cpp')
-rw-r--r--backends/platform/maemo/maemo.cpp6
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);
}