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

2
backends/events/maemosdl/maemosdl-events.cpp
View file

@ -200,6 +200,7 @@ MaemoSdlEventObserver::MaemoSdlEventObserver(MaemoSdlEventSource *eventSource) {
} }
bool MaemoSdlEventObserver::notifyEvent(const Common::Event &event) { bool MaemoSdlEventObserver::notifyEvent(const Common::Event &event) {
#ifdef ENABLE_KEYMAPPER
if (event.type != Common::EVENT_CUSTOM_BACKEND) if (event.type != Common::EVENT_CUSTOM_BACKEND)
return false; return false;
if (event.customType == kEventClickMode) { if (event.customType == kEventClickMode) {
@ -207,6 +208,7 @@ bool MaemoSdlEventObserver::notifyEvent(const Common::Event &event) {
_eventSource->toggleClickMode(); _eventSource->toggleClickMode();
return true; return true;
} }
#endif
return false; return false;
} }

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

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

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

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