diff options
| author | vanfanel | 2015-11-12 14:03:14 +0100 |
|---|---|---|
| committer | vanfanel | 2015-11-12 14:03:14 +0100 |
| commit | 9d831d0c428df4f21272a3b7df2d1016f657b63f (patch) | |
| tree | 645fc04e0cc903b9888605f6a0559ec03b8d4510 /backends | |
| parent | 99739a13fe844c807d3cdd87e67e207e888fd48a (diff) | |
| download | scummvm-rg350-9d831d0c428df4f21272a3b7df2d1016f657b63f.tar.gz scummvm-rg350-9d831d0c428df4f21272a3b7df2d1016f657b63f.tar.bz2 scummvm-rg350-9d831d0c428df4f21272a3b7df2d1016f657b63f.zip | |
SDL/DISPMANX Fixed small issues with merging: Use append_var, fix spacing issues and changed SurfaceSdlGraphicsManager constructor call parameters on DispmanXSdlGraphicsManager constructor.
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp | 4 | ||||
| -rw-r--r-- | backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h | 2 | ||||
| -rw-r--r-- | backends/platform/sdl/raspberrypi/raspberrypi.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp index 7e208db4b7..3da536be2b 100644 --- a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp +++ b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp @@ -76,8 +76,8 @@ struct dispmanxPage { struct dispvarsStruct *dispvars; }; -DispmanXSdlGraphicsManager::DispmanXSdlGraphicsManager(SdlEventSource *sdlEventSource) - : SurfaceSdlGraphicsManager(sdlEventSource) { +DispmanXSdlGraphicsManager::DispmanXSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window) + : SurfaceSdlGraphicsManager(sdlEventSource, window) { _dispvars = new(dispvarsStruct); dispmanXInit(); } diff --git a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h index 1866ec14a2..6a2ede2383 100644 --- a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h +++ b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.h @@ -30,7 +30,7 @@ struct dispmanxPage; class DispmanXSdlGraphicsManager : public SurfaceSdlGraphicsManager { public: - DispmanXSdlGraphicsManager(SdlEventSource *sdlEventSource); + DispmanXSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window); ~DispmanXSdlGraphicsManager(); bool loadGFXMode(); void internUpdateScreen(); diff --git a/backends/platform/sdl/raspberrypi/raspberrypi.cpp b/backends/platform/sdl/raspberrypi/raspberrypi.cpp index a3f79fd5b3..206203d82e 100644 --- a/backends/platform/sdl/raspberrypi/raspberrypi.cpp +++ b/backends/platform/sdl/raspberrypi/raspberrypi.cpp @@ -32,7 +32,7 @@ void OSystem_SDL_RaspberryPi::initBackend() { // Create the graphics manager if (_graphicsManager == 0) { - _graphicsManager = new DispmanXSdlGraphicsManager(_eventSource); + _graphicsManager = new DispmanXSdlGraphicsManager(_eventSource, _window); } // Call parent implementation of this method |