tweak and refactor frontends, menu and config

[libpicofe.git] / common / emu.c

diff --git a/common/emu.c b/common/emu.c
index b1927c1..8e5a8d5 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
@@ -1250,7 +1256,7 @@ static void run_events_ui(unsigned int which)
 \r
                        plat_status_msg_busy_first(tmp);\r
 \r
-                       in_set_blocking(1);\r
+                       in_set_config_int(0, IN_CFG_BLOCKING, 1);\r
                        while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))\r
                                ;\r
                        while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) )\r
@@ -1259,7 +1265,7 @@ static void run_events_ui(unsigned int which)
                                do_it = 0;\r
                        while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))\r
                                ;\r
-                       in_set_blocking(0);\r
+                       in_set_config_int(0, IN_CFG_BLOCKING, 0);\r
                }\r
                if (do_it) {\r
                        plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING STATE" : "SAVING STATE");\r