random minor fixes

[libpicofe.git] / linux / emu.c

diff --git a/linux/emu.c b/linux/emu.c
index 7dc2c14..db5d6be 100644 (file)
--- a/linux/emu.c
+++ b/linux/emu.c
@@ -18,10 +18,8 @@
 \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
@@ -156,6 +154,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
@@ -179,6 +179,7 @@ void plat_video_menu_enter(int is_rom_loaded)
 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,7 +213,7 @@ 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 opts, int no_scale)\r
 {\r
        int po_old = PicoOpt;\r
        int eo_old = currentConfig.EmuOpt;\r
@@ -220,7 +221,9 @@ void pemu_forced_frame(int opts)
        PicoOpt &= ~POPT_ALT_RENDERER;\r
        PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\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
@@ -311,7 +314,9 @@ void pemu_loop_end(void)
        PicoOpt &= ~POPT_ALT_RENDERER;\r
        PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\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
        Pico.m.dirtyPal = 1;\r
        PicoFrame();\r
 \r