pandora: use hw scaler (resolves 32x+sms), frontend refactoring

[libpicofe.git] / common / emu.c

diff --git a/common/emu.c b/common/emu.c
index a075abd..f995c1d 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -453,11 +453,14 @@ static void shutdown_MCD(void)
 \r
 static void system_announce(void)\r
 {\r
-       const char *sys_name, *tv_standard;\r
+       const char *sys_name, *tv_standard, *extra = "";\r
        int fps;\r
 \r
        if (PicoAHW & PAHW_SMS) {\r
                sys_name = "Master System";\r
+#ifdef NO_SMS\r
+               extra = " [no support]";\r
+#endif\r
        } else if (PicoAHW & PAHW_PICO) {\r
                sys_name = "Pico";\r
        } else if (PicoAHW & PAHW_MCD) {\r
@@ -474,7 +477,7 @@ static void system_announce(void)
        tv_standard = Pico.m.pal ? "PAL" : "NTSC";\r
        fps = Pico.m.pal ? 50 : 60;\r
 \r
-       emu_status_msg("%s %s / %dFPS", tv_standard, sys_name, fps);\r
+       emu_status_msg("%s %s / %dFPS%s", tv_standard, sys_name, fps, extra);\r
 }\r
 \r
 // note: this function might mangle rom_fname\r
@@ -1137,8 +1140,11 @@ static void emu_tray_close(void)
 \r
 void emu_32x_startup(void)\r
 {\r
-       plat_video_toggle_renderer(0, 0);\r
+       plat_video_toggle_renderer(0, 0); // HACK\r
        system_announce();\r
+\r
+       // force mode change event\r
+       rendstatus_old = -1;\r
 }\r
 \r
 void emu_reset_game(void)\r
@@ -1428,6 +1434,14 @@ void emu_loop(void)
        Pico.m.dirtyPal = 1;\r
        rendstatus_old = -1;\r
 \r
+       PicoLoopPrepare();\r
+\r
+       // prepare CD buffer\r
+       if (PicoAHW & PAHW_MCD)\r
+               PicoCDBufferInit();\r
+\r
+       pemu_loop_prep();\r
+\r
        /* number of ticks per frame */\r
        if (Pico.m.pal) {\r
                target_fps = 50;\r
@@ -1437,13 +1451,6 @@ void emu_loop(void)
                target_frametime = ms_to_ticks(1000) / 60 + 1;\r
        }\r
 \r
-       // prepare CD buffer\r
-       if (PicoAHW & PAHW_MCD)\r
-               PicoCDBufferInit();\r
-       PicoLoopPrepare();\r
-\r
-       pemu_loop_prep();\r
-\r
        timestamp_fps = get_ticks();\r
        reset_timing = 1;\r
 \r