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

MAEMO: Move static table out of .h file

Browse source 
Thanks fuzzie & LordHoto for pointing this out
This commit is contained in:
Tarek Soliman 2012-02-24 21:43:08 -06:00
parent f1a4f508af
commit 3edd4180f3
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
backends/platform/maemo/maemo-common.h
View file

@ -43,15 +43,6 @@ struct Model {
bool hasMenuKey; bool hasMenuKey;
}; };
static const Model models[] = {
{"SU-18", kModelType770, "770", false, true},
{"RX-34", kModelTypeN800, "N800", false, true},
{"RX-44", kModelTypeN810, "N810", true, true},
{"RX-48", kModelTypeN810, "N810W", true, true},
{"RX-51", kModelTypeN900, "N900", true, false},
{0, kModelTypeInvalid, 0, true, true}
};
enum CustomEventType { enum CustomEventType {
kEventClickMode = 1, kEventClickMode = 1,
kEventInvalid = 0 kEventInvalid = 0

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

@ -156,10 +156,19 @@ void OSystem_SDL_Maemo::setWindowCaption(const char *caption) {
setXWindowName(cap.c_str()); setXWindowName(cap.c_str());
} }
static const Model models[] = {
{"SU-18", kModelType770, "770", false, true},
{"RX-34", kModelTypeN800, "N800", false, true},
{"RX-44", kModelTypeN810, "N810", true, true},
{"RX-48", kModelTypeN810, "N810W", true, true},
{"RX-51", kModelTypeN900, "N900", true, false},
{0, kModelTypeInvalid, 0, true, true}
};
const Maemo::Model OSystem_SDL_Maemo::detectModel() { const Maemo::Model OSystem_SDL_Maemo::detectModel() {
Common::String deviceHwId = Common::String(getenv("SCUMMVM_MAEMO_DEVICE")); Common::String deviceHwId = Common::String(getenv("SCUMMVM_MAEMO_DEVICE"));
const Model *model; const Model *model;
for (model = models; model->hwId; model++) { for (model = models; model->hwId; ++model) {
if (deviceHwId.equals(model->hwId)) if (deviceHwId.equals(model->hwId))
return *model; return *model;
} }