aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorMax Horn2010-11-28 22:04:39 +0000
committerMax Horn2010-11-28 22:04:39 +0000
commita162ff18bc88b7ad364576ae091f0becba9117e2 (patch)
tree296771d022944e6ff883c4f202f124f28af53a76 /backends/platform
parent5a825eaae249d1a92f6252ce340d5801d84e15ca (diff)
downloadscummvm-rg350-a162ff18bc88b7ad364576ae091f0becba9117e2.tar.gz
scummvm-rg350-a162ff18bc88b7ad364576ae091f0becba9117e2.tar.bz2
scummvm-rg350-a162ff18bc88b7ad364576ae091f0becba9117e2.zip
SDL: Various more SdlEventSource related fixes
svn-id: r54553
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/gp2x/gp2x.cpp6
-rw-r--r--backends/platform/linuxmoto/linuxmoto-sdl.cpp6
-rw-r--r--backends/platform/samsungtv/samsungtv.cpp4
-rw-r--r--backends/platform/symbian/src/SymbianOS.cpp6
4 files changed, 11 insertions, 11 deletions
diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 49a7132974..8ae54d679c 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -136,12 +136,12 @@ void OSystem_GP2X::initBackend() {
GP2X_HW::mixerMoveVolume(0);
// Create the events manager
- if (_eventManager == 0)
- _eventManager = new GP2XSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new GP2XSdlEventSource();
// Create the graphics manager
if (_graphicsManager == 0)
- _graphicsManager = new GP2XSdlGraphicsManager();
+ _graphicsManager = new GP2XSdlGraphicsManager(_eventSource);
// Call parent implementation of this method
OSystem_POSIX::initBackend();
diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.cpp b/backends/platform/linuxmoto/linuxmoto-sdl.cpp
index 6a44bfe882..3bee53cc9c 100644
--- a/backends/platform/linuxmoto/linuxmoto-sdl.cpp
+++ b/backends/platform/linuxmoto/linuxmoto-sdl.cpp
@@ -30,11 +30,11 @@
void OSystem_LINUXMOTO::initBackend() {
// Create the backend custom managers
- if (_eventManager == 0)
- _eventManager = new LinuxmotoSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new LinuxmotoSdlEventSource();
if (_graphicsManager == 0)
- _graphicsManager = new LinuxmotoSdlGraphicsManager();
+ _graphicsManager = new LinuxmotoSdlGraphicsManager(_eventSource);
// Call parent implementation of this method
OSystem_POSIX::initBackend();
diff --git a/backends/platform/samsungtv/samsungtv.cpp b/backends/platform/samsungtv/samsungtv.cpp
index d0b4a578de..4d6dca7403 100644
--- a/backends/platform/samsungtv/samsungtv.cpp
+++ b/backends/platform/samsungtv/samsungtv.cpp
@@ -41,8 +41,8 @@ bool OSystem_SDL_SamsungTV::hasFeature(Feature f) {
void OSystem_SDL_SamsungTV::initBackend() {
// Create the events manager
- if (_eventManager == 0)
- _eventManager = new SamsungTVSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new SamsungTVSdlEventSource();
// Call parent implementation of this method
OSystem_SDL::initBackend();
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 10555ca33a..20bfe5b8ea 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -101,8 +101,8 @@ void OSystem_SDL_Symbian::initBackend() {
GUI::Actions::init();
// Creates the backend managers
- if (_eventManager == 0)
- _eventManager = new SymbianSdlEventSource(this);
+ if (_eventSource == 0)
+ _eventSource = new SymbianSdlEventSource();
if (_mixerManager == 0) {
_mixerManager = new SymbianSdlMixerManager();
@@ -110,7 +110,7 @@ void OSystem_SDL_Symbian::initBackend() {
_mixerManager->init();
}
if (_graphicsManager == 0)
- _graphicsManager = new SymbianSdlGraphicsManager();
+ _graphicsManager = new SymbianSdlGraphicsManager(_eventSource);
// Call parent implementation of this method
OSystem_SDL::initBackend();