tweak and refactor frontends, menu and config

[libpicofe.git] / linux / emu.c

diff --git a/linux/emu.c b/linux/emu.c
index 7dc2c14..0b4361d 100644 (file)
--- a/linux/emu.c
+++ b/linux/emu.c
@@ -17,11 +17,8 @@
 \r
 \r
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-char cpu_clk_name[] = "unused";\r
-const char *renderer_names_[] = { "16bit accurate", " 8bit accurate", "     8bit fast", NULL };\r
-const char *renderer_names32x_[] = { "accurate", "faster  ", "fastest ", NULL };\r
-const char **renderer_names = renderer_names_;\r
-const char **renderer_names32x = renderer_names32x_;\r
+const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
+const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };\r
 enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
 \r
 \r
@@ -127,9 +124,6 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 \r
 static void apply_renderer(void)\r
 {\r
-       PicoScanBegin = NULL;\r
-       PicoScanEnd = NULL;\r
-\r
        switch (currentConfig.renderer) {\r
        case RT_16BIT:\r
                PicoOpt &= ~POPT_ALT_RENDERER;\r
@@ -156,6 +150,8 @@ static void apply_renderer(void)
                PicoDraw32xSetFrameMode(1, only_32x);\r
                PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
        }\r
+       //PicoDraw32xSetFrameMode(0, 0);\r
+       //PicoDrawSetOutFormat(PDF_RGB555, 1);\r
 }\r
 \r
 void plat_video_toggle_renderer(int change, int is_menu)\r
@@ -178,7 +174,7 @@ void plat_video_menu_enter(int is_rom_loaded)
 \r
 void plat_video_menu_begin(void)\r
 {\r
-       memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4);\r
+       g_menuscreen_ptr = g_screen_ptr;\r
 }\r
 \r
 void plat_video_menu_end(void)\r
@@ -212,21 +208,29 @@ void plat_update_volume(int has_changed, int is_up)
 {\r
 }\r
 \r
-void pemu_forced_frame(int opts)\r
+void pemu_forced_frame(int no_scale, int do_emu)\r
 {\r
        int po_old = PicoOpt;\r
-       int eo_old = currentConfig.EmuOpt;\r
+\r
+       memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
 \r
        PicoOpt &= ~POPT_ALT_RENDERER;\r
-       PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
+       PicoOpt |= POPT_ACC_SPRITES;\r
+       if (!no_scale)\r
+               PicoOpt |= POPT_EN_SOFTSCALE;\r
 \r
-       PicoDrawSetOutFormat(PDF_RGB555, 0);\r
+       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+       PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
+       PicoDraw32xSetFrameMode(0, 0);\r
 \r
        Pico.m.dirtyPal = 1;\r
-       PicoFrameDrawOnly();\r
+       if (do_emu)\r
+               PicoFrame();\r
+       else\r
+               PicoFrameDrawOnly();\r
 \r
+       g_menubg_src_ptr = g_screen_ptr;\r
        PicoOpt = po_old;\r
-       currentConfig.EmuOpt = eo_old;\r
 }\r
 \r
 static void updateSound(int len)\r
@@ -301,22 +305,10 @@ void pemu_loop_prep(void)
 \r
 void pemu_loop_end(void)\r
 {\r
-       int po_old = PicoOpt;\r
-       int eo_old = currentConfig.EmuOpt;\r
-\r
        pemu_sound_stop();\r
-       memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
 \r
        /* do one more frame for menu bg */\r
-       PicoOpt &= ~POPT_ALT_RENDERER;\r
-       PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
-\r
-       PicoDrawSetOutFormat(PDF_RGB555, 0);\r
-       Pico.m.dirtyPal = 1;\r
-       PicoFrame();\r
-\r
-       PicoOpt = po_old;\r
-       currentConfig.EmuOpt = eo_old;\r
+       pemu_forced_frame(0, 1);\r
 }\r
 \r
 void plat_wait_till_us(unsigned int us_to)\r