diff options
author | Pawel Kolodziejski | 2011-05-24 20:32:08 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-05-24 20:34:45 +0200 |
commit | 48b4c6c9233b05843a16504064adbe5fd6f4c57c (patch) | |
tree | 8a93fd1c6bc1f23932c81e73344749efffd69d5b /backends/platform/samsungtv/samsungtv.cpp | |
parent | 96519ad939fab21d07727662aa28a059a3c1d510 (diff) | |
download | scummvm-rg350-48b4c6c9233b05843a16504064adbe5fd6f4c57c.tar.gz scummvm-rg350-48b4c6c9233b05843a16504064adbe5fd6f4c57c.tar.bz2 scummvm-rg350-48b4c6c9233b05843a16504064adbe5fd6f4c57c.zip |
SAMSUNGTV: Update port
This combines the following Samsung TV port updates from master:
944e0be209f5ab47c3b903f258d2d41b990d80cb
dc1d07774fc8ab0554047115d319ef8c0a2c3f63
It also includes the parts touching this backend of:
69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e
2fa63ca01586c4e5fda8eb12dca444d47a2375f1
Diffstat (limited to 'backends/platform/samsungtv/samsungtv.cpp')
-rw-r--r-- | backends/platform/samsungtv/samsungtv.cpp | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp index 4d6dca7403..1b978d0121 100644 --- a/backends/platform/samsungtv/samsungtv.cpp +++ b/backends/platform/samsungtv/samsungtv.cpp @@ -18,25 +18,17 @@ * 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$ - * */ #include "backends/platform/samsungtv/samsungtv.h" #include "backends/events/samsungtvsdl/samsungtvsdl-events.h" +#include "backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h" #if defined(SAMSUNGTV) OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV() : - OSystem_POSIX("/dtv/usb/sda1/.scummvmrc") { -} - -bool OSystem_SDL_SamsungTV::hasFeature(Feature f) { - return - (f == OSystem::kFeatureAspectRatioCorrection) || - (f == OSystem::kFeatureCursorHasPalette); + OSystem_POSIX("/mtd_rwarea/.scummvmrc") { } void OSystem_SDL_SamsungTV::initBackend() { @@ -44,27 +36,22 @@ void OSystem_SDL_SamsungTV::initBackend() { if (_eventSource == 0) _eventSource = new SamsungTVSdlEventSource(); + if (_graphicsManager == 0) + _graphicsManager = new SamsungTVSdlGraphicsManager(_eventSource); + // Call parent implementation of this method - OSystem_SDL::initBackend(); + OSystem_POSIX::initBackend(); } -void OSystem_SDL_SamsungTV::setFeatureState(Feature f, bool enable) { - switch (f) { - case OSystem::kFeatureAspectRatioCorrection: - _graphicsManager->setFeatureState(f, enable); - break; - default: - break; - } +void OSystem_SDL_SamsungTV::quit() { + delete this; } -bool OSystem_SDL_SamsungTV::getFeatureState(Feature f) { - switch (f) { - case OSystem::kFeatureAspectRatioCorrection: - return _graphicsManager->getFeatureState(f); - default: - return false; - } +void OSystem_SDL_SamsungTV::fatalError() { + delete this; + // FIXME + warning("fatal error"); + for (;;) {} } #endif |