diff options
| -rw-r--r-- | backends/events/samsungtv/samsungtv-events.cpp (renamed from backends/platform/samsungtv/events.cpp) | 17 | ||||
| -rw-r--r-- | backends/events/samsungtv/samsungtv-events.h | 40 | ||||
| -rw-r--r-- | backends/events/sdl/sdl-events.h | 8 | ||||
| -rw-r--r-- | backends/platform/samsungtv/main.cpp | 9 | ||||
| -rw-r--r-- | backends/platform/samsungtv/module.mk | 1 | ||||
| -rw-r--r-- | backends/platform/samsungtv/samsungtv.cpp | 14 | ||||
| -rw-r--r-- | backends/platform/samsungtv/samsungtv.h | 13 | ||||
| -rw-r--r-- | backends/platform/sdl/posix/posix-main.cpp | 2 |
8 files changed, 71 insertions, 33 deletions
diff --git a/backends/platform/samsungtv/events.cpp b/backends/events/samsungtv/samsungtv-events.cpp index af39e67fe5..c36684122f 100644 --- a/backends/platform/samsungtv/events.cpp +++ b/backends/events/samsungtv/samsungtv-events.cpp @@ -23,13 +23,17 @@ * */ -#include "backends/platform/samsungtv/samsungtv.h" -#include "common/util.h" -#include "common/events.h" - #if defined(SAMSUNGTV) -bool OSystem_SDL_SamsungTV::remapKey(SDL_Event &ev, Common::Event &event) { +#include "backends/events/samsungtv/samsungtv-events.h" + +SdlSamsungTVEventManager::SdlSamsungTVEventManager(Common::EventSource *boss) + : + SdlEventManager(boss) { + +} + +bool SdlSamsungTVEventManager::remapKey(SDL_Event &ev, Common::Event &event) { switch (ev.type) { case SDL_KEYDOWN:{ if (ev.key.keysym.sym == SDLK_POWER) { @@ -67,7 +71,8 @@ bool OSystem_SDL_SamsungTV::remapKey(SDL_Event &ev, Common::Event &event) { } } - return false; + // Invoke parent implementation of this method + return SdlEventManager::remapKey(ev, event); } #endif diff --git a/backends/events/samsungtv/samsungtv-events.h b/backends/events/samsungtv/samsungtv-events.h new file mode 100644 index 0000000000..1c7e38984f --- /dev/null +++ b/backends/events/samsungtv/samsungtv-events.h @@ -0,0 +1,40 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#if !defined(BACKEND_EVENTS_SDL_SAMSUNGTV_H) && !defined(DISABLE_DEFAULT_EVENTMANAGER) +#define BACKEND_EVENTS_SDL_SAMSUNGTV_H + +#include "backends/events/sdl/sdl-events.h" + +class SdlSamsungTVEventManager : public SdlEventManager { +public: + SdlSamsungTVEventManager(Common::EventSource *boss); + ~SdlSamsungTVEventManager() {} + +protected: + bool remapKey(SDL_Event &ev, Common::Event &event); +}; + +#endif diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h index 8dd2840e1d..7a399cc186 100644 --- a/backends/events/sdl/sdl-events.h +++ b/backends/events/sdl/sdl-events.h @@ -37,11 +37,11 @@ class SdlEventManager : public DefaultEventManager { public: SdlEventManager(Common::EventSource *boss); - ~SdlEventManager(); + virtual ~SdlEventManager(); virtual bool pollSdlEvent(Common::Event &event); - void resetKeyboadEmulation(int16 x_max, int16 y_max); + virtual void resetKeyboadEmulation(int16 x_max, int16 y_max); protected: virtual void preprocessEvents(SDL_Event *event) {} @@ -78,9 +78,9 @@ protected: virtual bool handleJoyAxisMotion(SDL_Event &ev, Common::Event &event); virtual void fillMouseEvent(Common::Event &event, int x, int y); // overloaded by CE backend - void toggleMouseGrab(); + virtual void toggleMouseGrab(); - void handleKbdMouse(); + virtual void handleKbdMouse(); virtual bool remapKey(SDL_Event &ev, Common::Event &event); int _lastScreenID; diff --git a/backends/platform/samsungtv/main.cpp b/backends/platform/samsungtv/main.cpp index 2c025b750c..f3d868641b 100644 --- a/backends/platform/samsungtv/main.cpp +++ b/backends/platform/samsungtv/main.cpp @@ -34,16 +34,23 @@ extern "C" int Game_Main(char *path, char *) { chdir(path); + // Create OSystem instance g_system = new OSystem_SDL_SamsungTV(); assert(g_system); + // Pre initialize the backend + ((OSystem_SDL_SamsungTV *)g_system)->init(); + #ifdef DYNAMIC_MODULES PluginManager::instance().addPluginProvider(new SDLPluginProvider()); #endif // Invoke the actual ScummVM main entry point: int res = scummvm_main(0, 0); - ((OSystem_SDL *)g_system)->deinit(); + + // Free OSystem + delete (OSystem_SDL_SamsungTV *)g_system; + return res; } diff --git a/backends/platform/samsungtv/module.mk b/backends/platform/samsungtv/module.mk index 27e2cfa77d..1d3bb7aefe 100644 --- a/backends/platform/samsungtv/module.mk +++ b/backends/platform/samsungtv/module.mk @@ -1,7 +1,6 @@ MODULE := backends/platform/samsungtv MODULE_OBJS := \ - events.o \ main.o \ samsungtv.o diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp index aa79b92558..e391f19c57 100644 --- a/backends/platform/samsungtv/samsungtv.cpp +++ b/backends/platform/samsungtv/samsungtv.cpp @@ -29,14 +29,14 @@ bool OSystem_SDL_SamsungTV::hasFeature(Feature f) { return - (f == kFeatureAspectRatioCorrection) || - (f == kFeatureCursorHasPalette); + (f == OSystem::kFeatureAspectRatioCorrection) || + (f == OSystem::kFeatureCursorHasPalette); } void OSystem_SDL_SamsungTV::setFeatureState(Feature f, bool enable) { switch (f) { - case kFeatureAspectRatioCorrection: - setAspectRatioCorrection(enable); + case OSystem::kFeatureAspectRatioCorrection: + _graphicsManager->setFeatureState(f, enable); break; default: break; @@ -44,11 +44,9 @@ void OSystem_SDL_SamsungTV::setFeatureState(Feature f, bool enable) { } bool OSystem_SDL_SamsungTV::getFeatureState(Feature f) { - assert (_transactionMode == kTransactionNone); - switch (f) { - case kFeatureAspectRatioCorrection: - return _videoMode.aspectRatioCorrection; + case OSystem::kFeatureAspectRatioCorrection: + return _graphicsManager->getFeatureState(f); default: return false; } diff --git a/backends/platform/samsungtv/samsungtv.h b/backends/platform/samsungtv/samsungtv.h index b3344385aa..ec2e142b0f 100644 --- a/backends/platform/samsungtv/samsungtv.h +++ b/backends/platform/samsungtv/samsungtv.h @@ -26,26 +26,15 @@ #ifndef SDL_SAMSUNGTV_COMMON_H #define SDL_SAMSUNGTV_COMMON_H -#include <SDL.h> - -#include "backends/base-backend.h" -#include "backends/platform/sdl/sdl.h" - #if defined(SAMSUNGTV) -namespace Audio { - class MixerImpl; -} +#include "backends/platform/sdl/posix/posix.h" class OSystem_SDL_SamsungTV : public OSystem_SDL { public: virtual bool hasFeature(Feature f); virtual void setFeatureState(Feature f, bool enable); virtual bool getFeatureState(Feature f); - -protected: - - virtual bool remapKey(SDL_Event &ev, Common::Event &event); }; #endif diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp index bce3ecae7f..5d865ca325 100644 --- a/backends/platform/sdl/posix/posix-main.cpp +++ b/backends/platform/sdl/posix/posix-main.cpp @@ -23,7 +23,7 @@ * */ -#if defined(UNIX) && !defined(MACOSX) +#if defined(UNIX) && !defined(MACOSX) && !defined(SAMSUNGTV) #include "common/scummsys.h" |