diff options
| -rw-r--r-- | backends/platform/samsungtv/events.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/samsungtv/sdl.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/samsungtv/sdl.h | 8 | ||||
| -rwxr-xr-x | configure | 1 |
4 files changed, 3 insertions, 17 deletions
diff --git a/backends/platform/samsungtv/events.cpp b/backends/platform/samsungtv/events.cpp index c65e10fb80..f477f9c4d2 100644 --- a/backends/platform/samsungtv/events.cpp +++ b/backends/platform/samsungtv/events.cpp @@ -29,7 +29,7 @@ #if defined(SAMSUNGTV) -void OSystem_SDL::handleKbdMouse() { +void OSystem_SDL_SamsungTV::handleKbdMouse() { uint32 curTime = getMillis(); if (curTime >= _km.last_time + _km.delay_time) { _km.last_time = curTime; @@ -96,7 +96,7 @@ void OSystem_SDL::handleKbdMouse() { } } -bool OSystem_SDL::pollEvent(Common::Event &event) { +bool OSystem_SDL_SamsungTV::pollEvent(Common::Event &event) { SDL_Event ev; handleKbdMouse(); diff --git a/backends/platform/samsungtv/sdl.cpp b/backends/platform/samsungtv/sdl.cpp index ab6602fa35..0bc82f7b8c 100644 --- a/backends/platform/samsungtv/sdl.cpp +++ b/backends/platform/samsungtv/sdl.cpp @@ -50,13 +50,6 @@ static Uint32 timer_handler(Uint32 interval, void *param) { return interval; } -AspectRatio::AspectRatio(int w, int h) { - // TODO : Validation and so on... - // Currently, we just ensure the program don't instantiate non-supported aspect ratios - _kw = w; - _kh = h; -} - static const size_t AR_COUNT = 4; static const char* desiredAspectRatioAsStrings[AR_COUNT] = { "auto", "4/3", "16/9", "16/10" }; static const AspectRatio desiredAspectRatios[AR_COUNT] = { AspectRatio(0, 0), AspectRatio(4,3), AspectRatio(16,9), AspectRatio(16,10) }; diff --git a/backends/platform/samsungtv/sdl.h b/backends/platform/samsungtv/sdl.h index 26702faf95..c08cdca69a 100644 --- a/backends/platform/samsungtv/sdl.h +++ b/backends/platform/samsungtv/sdl.h @@ -51,10 +51,6 @@ public: // Typically, 320x200 CLUT8 virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format); - // Draw a bitmap to screen. - // The screen will not be updated to reflect the new bitmap - virtual void copyRectToScreen(const byte *src, int pitch, int x, int y, int w, int h); // overloaded by CE backend (FIXME) - // Warp the mouse cursor. Where set_mouse_pos() only informs the // backend of the mouse cursor's current position, this function // actually moves the cursor to the specified position. @@ -88,10 +84,7 @@ protected: SDL_Surface *_prehwscreen; - virtual void setGraphicsModeIntern(); - virtual void drawMouse(); // overloaded by CE backend - virtual void undrawMouse(); // overloaded by CE backend (FIXME) virtual void blitCursor(); // overloaded by CE backend (FIXME) virtual void internUpdateScreen(); // overloaded by CE backend @@ -101,7 +94,6 @@ protected: virtual bool hotswapGFXMode(); // overloaded by CE backend void setFullscreenMode(bool enable); - void setAspectRatioCorrection(bool enable); void handleKbdMouse(); @@ -2260,6 +2260,7 @@ case $_backend in LIBS="$LIBS `$_sdlconfig --libs`" DEFINES="$DEFINES -DSDL_BACKEND -DSAMSUNGTV" LDFLAGS="$LDFLAGS -shared -fpic -Wl,-whole-archive" + MODULES="$MODULES backends/platform/sdl" ;; gp2x) find_sdlconfig |