5 files changed, 27 insertions, 38 deletions
diff --git a/backends/platform/samsungtv/main.cpp b/backends/platform/samsungtv/main.cpp
index 3beb97165f..4f3291613d 100644
--- a/backends/platform/samsungtv/main.cpp
+++ b/backends/platform/samsungtv/main.cpp
@@ -18,11 +18,10 @@
  * 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$
- *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
+
 #include "backends/platform/samsungtv/samsungtv.h"
 #include "backends/plugins/sdl/sdl-provider.h"
 #include "base/main.h"
@@ -39,7 +38,7 @@ extern "C" int Game_Main(char *path, char *) {
 	assert(g_system);
 
 	// Pre initialize the backend
-	((OSystem_SDL_SamsungTV *)g_system)->init();
+	((OSystem_POSIX *)g_system)->init();
 
 #ifdef DYNAMIC_MODULES
 	PluginManager::instance().addPluginProvider(new SDLPluginProvider());
@@ -49,7 +48,7 @@ extern "C" int Game_Main(char *path, char *) {
 	int res = scummvm_main(0, 0);
 
 	// Free OSystem
-	delete g_system;
+	delete (OSystem_SDL_SamsungTV *)g_system;
 
 	return res;
 }
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
diff --git a/backends/platform/samsungtv/samsungtv.h b/backends/platform/samsungtv/samsungtv.h
index bccb6baee9..b7a78a96cd 100644
--- a/backends/platform/samsungtv/samsungtv.h
+++ b/backends/platform/samsungtv/samsungtv.h
@@ -18,14 +18,13 @@
  * 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$
- *
  */
 
 #ifndef PLATFORM_SDL_SAMSUNGTV_H
 #define PLATFORM_SDL_SAMSUNGTV_H
 
+#if defined(SAMSUNGTV)
+
 #include "backends/platform/sdl/posix/posix.h"
 
 class OSystem_SDL_SamsungTV : public OSystem_POSIX {
@@ -33,10 +32,10 @@ public:
 	OSystem_SDL_SamsungTV();
 
 	virtual void initBackend();
-
-	virtual bool hasFeature(Feature f);
-	virtual void setFeatureState(Feature f, bool enable);
-	virtual bool getFeatureState(Feature f);
+	virtual void quit();
+	virtual void fatalError();
 };
 
 #endif
+
+#endif
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp
index 14cfaaee57..871fb2c531 100644
--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@@ -36,6 +36,7 @@
     !defined(DINGUX) && \
     !defined(CAANOO) && \
     !defined(LINUXMOTO) && \
+    !defined(SAMSUNGTV) && \
     !defined(OPENPANDORA)
 
 #include "backends/platform/sdl/sdl.h"
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp
index 71a88265a0..e15c09fec7 100644
--- a/backends/platform/sdl/posix/posix.cpp
+++ b/backends/platform/sdl/posix/posix.cpp
@@ -81,6 +81,9 @@ Common::WriteStream *OSystem_POSIX::createLogFile() {
 #else
 	logFile += "/.scummvm";
 #endif
+#ifdef SAMSUNGTV
+	logFile = "/mtd_ram";
+#endif
 
 	struct stat sb;