occasional mp3 click noises fixed

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index b7c926f..a9b0825 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -432,8 +432,8 @@ rescan:
 // ------------ debug menu ------------\r
 \r
 char *debugString(void);\r
-void PicoDrawShowSpriteStats(unsigned short *screen);\r
-void PicoDrawShowPalette(unsigned short *screen);\r
+void PicoDrawShowSpriteStats(unsigned short *screen, int stride);\r
+void PicoDrawShowPalette(unsigned short *screen, int stride);\r
 \r
 static void draw_main_debug(void)\r
 {\r
@@ -463,7 +463,7 @@ static void draw_frame_debug(void)
        if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);\r
 \r
        memset(gp2x_screen, 0, 320*240*2);\r
-       emu_forcedFrame();\r
+       emu_forcedFrame(0);\r
        smalltext_out16(4, 232, layer_str, 0xffff);\r
 }\r
 \r
@@ -477,8 +477,10 @@ static void debug_menu_loop(void)
                {\r
                        case 0: draw_main_debug(); break;\r
                        case 1: draw_frame_debug(); break;\r
-                       case 2: PicoDrawShowSpriteStats(gp2x_screen); break;\r
-                       case 3: PicoDrawShowPalette(gp2x_screen); break;\r
+                       case 2: gp2x_pd_clone_buffer2();\r
+                               PicoDrawShowSpriteStats(gp2x_screen, 320); break;\r
+                       case 3: memset(gp2x_screen, 0, 320*240*2);\r
+                               PicoDrawShowPalette(gp2x_screen, 320); break;\r
                }\r
                menu_flip();\r
 \r
@@ -605,7 +607,7 @@ static void draw_savestate_bg(int slot)
                areaClose(file);\r
        }\r
 \r
-       emu_forcedFrame();\r
+       emu_forcedFrame(POPT_EN_SOFTSCALE);\r
        menu_prepare_bg(1);\r
 \r
        memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
@@ -1186,7 +1188,7 @@ menu_entry opt_entries[] =
 {\r
        { NULL,                        MB_NONE,  MA_OPT_RENDERER,      NULL, 0, 0, 0, 1, 1 },\r
        { NULL,                        MB_RANGE, MA_OPT_SCALING,       &currentConfig.scaling, 0, 0, 3, 1, 1 },\r
-       { "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES,   &PicoOpt, 0x080, 0, 0, 1, 1 },\r
+       { "Accurate sprites",          MB_ONOFF, MA_OPT_ACC_SPRITES,   &PicoOpt, 0x080, 0, 0, 0, 1 },\r
        { "Show FPS",                  MB_ONOFF, MA_OPT_SHOW_FPS,      &currentConfig.EmuOpt,  0x002, 0, 0, 1, 1 },\r
        { NULL,                        MB_RANGE, MA_OPT_FRAMESKIP,     &currentConfig.Frameskip, 0, -1, 16, 1, 1 },\r
        { "Enable sound",              MB_ONOFF, MA_OPT_ENABLE_SOUND,  &currentConfig.EmuOpt,  0x004, 0, 0, 1, 1 },\r