5 files changed, 26 insertions, 15 deletions
diff --git a/backends/events/samsungtv/samsungtv-events.cpp b/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
index c36684122f..d1c35d3a5a 100644
--- a/backends/events/samsungtv/samsungtv-events.cpp
+++ b/backends/events/samsungtvsdl/samsungtvsdl-events.cpp
@@ -23,17 +23,17 @@
  *
  */
 
-#if defined(SAMSUNGTV)
+#ifdef SAMSUNGTV
 
-#include "backends/events/samsungtv/samsungtv-events.h"
+#include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
 
-SdlSamsungTVEventManager::SdlSamsungTVEventManager(Common::EventSource *boss)
+SamsungTVSdlEventManager::SamsungTVSdlEventManager(Common::EventSource *boss)
 	:
 	SdlEventManager(boss) {
 
 }
 
-bool SdlSamsungTVEventManager::remapKey(SDL_Event &ev, Common::Event &event) {
+bool SamsungTVSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) {
 	switch (ev.type) {
 		case SDL_KEYDOWN:{
 			if (ev.key.keysym.sym == SDLK_POWER) {
diff --git a/backends/events/samsungtv/samsungtv-events.h b/backends/events/samsungtvsdl/samsungtvsdl-events.h
index 1c7e38984f..1189af4500 100644
--- a/backends/events/samsungtv/samsungtv-events.h
+++ b/backends/events/samsungtvsdl/samsungtvsdl-events.h
@@ -28,13 +28,13 @@
 
 #include "backends/events/sdl/sdl-events.h"
 
-class SdlSamsungTVEventManager : public SdlEventManager {
+class SamsungTVSdlEventManager : public SdlEventManager {
 public:
-	SdlSamsungTVEventManager(Common::EventSource *boss);
-	~SdlSamsungTVEventManager() {}
+	SamsungTVSdlEventManager(Common::EventSource *boss);
+	~SamsungTVSdlEventManager() {}
 
 protected:
-	bool remapKey(SDL_Event &ev, Common::Event &event);
+	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 };
 
 #endif
diff --git a/backends/module.mk b/backends/module.mk
index 987810dd11..d7ea193004 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -7,7 +7,7 @@ MODULE_OBJS := \
 	audiocd/sdl/sdl-audiocd.o \
 	events/default/default-events.o \
 	events/linuxmotosdl/linuxmotosdl-events.o \
-	events/samsungtv/samsungtv-events.o \
+	events/samsungtvsdl/samsungtvsdl-events.o \
 	events/sdl/sdl-events.o \
 	events/symbiansdl/symbiansdl-events.o \
 	fs/abstract-fs.o \
diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp
index bf6e20adae..34ddbd2f10 100644
--- a/backends/platform/samsungtv/samsungtv.cpp
+++ b/backends/platform/samsungtv/samsungtv.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "backends/platform/samsungtv/samsungtv.h"
+#include "backends/events/samsungtvsdl/samsungtvsdl-events.h"
 
 OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV()
 	:
@@ -36,6 +37,14 @@ bool OSystem_SDL_SamsungTV::hasFeature(Feature f) {
 		(f == OSystem::kFeatureCursorHasPalette);
 }
 
+void OSystem_SDL_SamsungTV::initBackend() {
+	if (_eventManager == 0)
+		_eventManager = new SamsungTVSdlEventManager(this);
+
+	// Call parent implementation of this method
+	OSystem_SDL::initBackend();
+}
+
 void OSystem_SDL_SamsungTV::setFeatureState(Feature f, bool enable) {
 	switch (f) {
 	case OSystem::kFeatureAspectRatioCorrection:
diff --git a/backends/platform/samsungtv/samsungtv.h b/backends/platform/samsungtv/samsungtv.h
index 0c3e49ac63..49460a9ddc 100644
--- a/backends/platform/samsungtv/samsungtv.h
+++ b/backends/platform/samsungtv/samsungtv.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SDL_SAMSUNGTV_COMMON_H
-#define SDL_SAMSUNGTV_COMMON_H
+#ifndef PLATFORM_SDL_SAMSUNGTV_H
+#define PLATFORM_SDL_SAMSUNGTV_H
 
 #include "backends/platform/sdl/posix/posix.h"
 
@@ -32,11 +32,13 @@ class OSystem_SDL_SamsungTV : public OSystem_POSIX {
 public:
 	OSystem_SDL_SamsungTV();
 
-	bool hasFeature(Feature f);
-	void setFeatureState(Feature f, bool enable);
-	bool getFeatureState(Feature f);
+	virtual void initBackend();
 
-	void quit();
+	virtual bool hasFeature(Feature f);
+	virtual void setFeatureState(Feature f, bool enable);
+	virtual bool getFeatureState(Feature f);
+
+	virtual void quit();
 };
 
 #endif