removed dependency on hildon-games-wrapper

[drnoksnes] / platform / sdlv.cpp

diff --git a/platform/sdlv.cpp b/platform/sdlv.cpp
index 66ff48a..0d9ff32 100644 (file)
--- a/platform/sdlv.cpp
+++ b/platform/sdlv.cpp
@@ -11,7 +11,6 @@
 #include "gfx.h"
 #include "ppu.h"
 #include "sdlv.h"
-#include "scaler.h"
 
 #define DIE(format, ...) do { \
                fprintf(stderr, "Died at %s:%d: ", __FILE__, __LINE__ ); \
@@ -27,7 +26,7 @@ static SDL_Rect windowSize, screenSize;
 static bool gotWindowSize, gotScreenSize;
 
 /** The current scaler object */
-static Scaler* scaler;
+Scaler* scaler;
 
 static void calculateScreenSize()
 {
@@ -114,7 +113,7 @@ static void setupVideoSurface()
        GUI.Height = gameHeight;
 #endif
 #if CONF_EXIT_BUTTON
-       exitReset();
+       ExitBtnReset();
 #endif
 
        // Safeguard
@@ -175,15 +174,11 @@ static void drawOnscreenControls()
        }
 }
 
-void S9xInitDisplay(int argc, const char ** argv)
+void S9xInitDisplay(int argc, char ** argv)
 {      
        if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) 
                DIE("SDL_InitSubSystem(VIDEO): %s", SDL_GetError());
 
-#if CONF_HD
-       hd_setup();
-#endif
-
        setupVideoSurface();
        drawOnscreenControls();
 }
@@ -202,17 +197,10 @@ void S9xVideoToggleFullscreen()
        drawOnscreenControls();
 }
 
-void S9xVideoOutputFocus(bool hasFocus)
+void processVideoEvent(const SDL_Event& event)
 {
-#if MAEMO
-       if (scaler) {
-               if (hasFocus) {
-                       scaler->resume();
-               } else {
-                       scaler->pause();
-               }
-       }
-#endif
+       if (scaler)
+               scaler->filter(event);
 }
 
 // This is here for completeness, but palette mode is useless on N8x0
@@ -244,11 +232,10 @@ bool8_32 S9xDeinitUpdate (int width, int height, bool8_32 sixteenBit)
        scaler->finish();
 
 #if CONF_EXIT_BUTTON
-       if (exitRequiresDraw()) {
-               //scaler->pause();
-               exitDraw(screen);
-               SDL_Flip(screen);
-               //scaler->resume();
+       if (ExitBtnRequiresDraw()) {
+               scaler->pause();
+               ExitBtnDraw(screen);
+               scaler->resume();
        }
 #endif