thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MAEMO: Fix building without keymapper enabled

Browse source
This commit is contained in:
Tarek Soliman 2012-02-17 14:41:41 -06:00
parent c87657f066
commit 53d6ef1209
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backends/platform/maemo/maemo.cpp
View file

@ -49,9 +49,12 @@ OSystem_SDL_Maemo::OSystem_SDL_Maemo()
OSystem_SDL_Maemo::~OSystem_SDL_Maemo() {
delete _eventObserver;
#ifdef ENABLE_KEYMAPPER
delete _keymapperDefaultBindings;
#endif
}
#ifdef ENABLE_KEYMAPPER
static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymapperDefaultBindings, Model _model) {
_keymapperDefaultBindings->setDefaultBinding("gui", "REM", "HOME");
_keymapperDefaultBindings->setDefaultBinding("global", "REM", "HOME");
@ -79,6 +82,7 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap
_keymapperDefaultBindings->setDefaultBinding("maemo", "RCL", "ZOOMPLUS");
_keymapperDefaultBindings->setDefaultBinding("maemo", "CLK", "ZOOMMINUS");
}
#endif
void OSystem_SDL_Maemo::initBackend() {
// Create the events manager
@ -91,14 +95,18 @@ void OSystem_SDL_Maemo::initBackend() {
if (_eventObserver == 0)
_eventObserver = new MaemoSdlEventObserver((MaemoSdlEventSource *)_eventSource);
#ifdef ENABLE_KEYMAPPER
if (_keymapperDefaultBindings == 0)
_keymapperDefaultBindings = new Common::KeymapperDefaultBindings();
#endif
ConfMan.set("vkeybdpath", DATA_PATH);
_model = detectModel();
#ifdef ENABLE_KEYMAPPER
registerDefaultKeyBindings(_keymapperDefaultBindings, _model);
#endif
// Call parent implementation of this method
OSystem_POSIX::initBackend();

2
backends/platform/maemo/maemo.h
View file

@ -56,7 +56,9 @@ private:
const Model detectModel();
Model _model;
MaemoSdlEventObserver *_eventObserver;
#ifdef ENABLE_KEYMAPPER
Common::KeymapperDefaultBindings *_keymapperDefaultBindings;
#endif
};
} // namespace Maemo