further unification and refactoring

[libpicofe.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index b5c3495..412dbc2 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -16,6 +16,7 @@
 #include "emu.h"\r
 #include "plat.h"\r
 #include "posix.h"\r
+#include <version.h>\r
 \r
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
@@ -996,7 +997,7 @@ static void draw_savestate_bg(int slot)
        }\r
 \r
        /* do a frame and fetch menu bg */\r
-       emu_forcedFrame(POPT_EN_SOFTSCALE);\r
+       pemu_forced_frame(POPT_EN_SOFTSCALE);\r
        plat_video_menu_enter(1);\r
 \r
        memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
@@ -1285,19 +1286,19 @@ me_bind_action me_ctrl_actions[15] =
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
 me_bind_action emuctrl_actions[] =\r
 {\r
-       { "Load State       ", 1<<28 },\r
-       { "Save State       ", 1<<27 },\r
-       { "Prev Save Slot   ", 1<<25 },\r
-       { "Next Save Slot   ", 1<<24 },\r
-       { "Switch Renderer  ", 1<<26 },\r
-       { "Volume Down      ", 1<<30 },\r
-       { "Volume Up        ", 1<<29 },\r
-       { "Fast forward     ", 1<<22 },\r
-       { "Enter Menu       ", 1<<23 },\r
-       { "Pico Next page   ", 1<<21 },\r
-       { "Pico Prev page   ", 1<<20 },\r
-       { "Pico Switch input", 1<<19 },\r
-       { NULL,                0     }\r
+       { "Load State       ", PEV_STATE_LOAD },\r
+       { "Save State       ", PEV_STATE_SAVE },\r
+       { "Prev Save Slot   ", PEV_SSLOT_PREV },\r
+       { "Next Save Slot   ", PEV_SSLOT_NEXT },\r
+       { "Switch Renderer  ", PEV_SWITCH_RND },\r
+       { "Volume Down      ", PEV_VOL_DOWN },\r
+       { "Volume Up        ", PEV_VOL_UP },\r
+       { "Fast forward     ", PEV_FF },\r
+       { "Enter Menu       ", PEV_MENU },\r
+       { "Pico Next page   ", PEV_PICO_PNEXT },\r
+       { "Pico Prev page   ", PEV_PICO_PPREV },\r
+       { "Pico Switch input", PEV_PICO_SWINP },\r
+       { NULL,                0 }\r
 };\r
 \r
 static int key_config_loop_wrap(menu_id id, int keys)\r
@@ -1726,17 +1727,17 @@ extern void SekStepM68k(void);
 \r
 static void mplayer_loop(void)\r
 {\r
-       emu_startSound();\r
+       pemu_sound_start();\r
 \r
        while (1)\r
        {\r
                PDebugZ80Frame();\r
                if (in_menu_wait_any(0) & PBTN_MA3)\r
                        break;\r
-               emu_waitSound();\r
+               pemu_sound_wait();\r
        }\r
 \r
-       emu_endSound();\r
+       pemu_sound_stop();\r
 }\r
 \r
 static void draw_text_debug(const char *str, int skip, int from)\r
@@ -1775,7 +1776,7 @@ static void draw_frame_debug(void)
        if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);\r
 \r
        memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
-       emu_forcedFrame(0);\r
+       pemu_forced_frame(0);\r
        smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);\r
        smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
 }\r
@@ -1792,7 +1793,7 @@ static void debug_menu_loop(void)
                {\r
                        case 0: plat_video_menu_begin();\r
                                tmp = PDebugMain();\r
-                               emu_platformDebugCat(tmp);\r
+                               plat_debug_cat(tmp);\r
                                draw_text_debug(tmp, 0, 0);\r
                                if (dumped) {\r
                                        smalltext_out16(g_screen_width - 6 * me_sfont_h,\r
@@ -1802,7 +1803,7 @@ static void debug_menu_loop(void)
                                break;\r
                        case 1: draw_frame_debug(); break;\r
                        case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
-                               emu_forcedFrame(0);\r
+                               pemu_forced_frame(0);\r
                                menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
                                PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +\r
                                        g_screen_width/2 - 320/2, g_screen_width); break;\r
@@ -1895,7 +1896,7 @@ static int main_menu_handler(menu_id id, int keys)
                break;\r
        case MA_MAIN_RESET_GAME:\r
                if (rom_loaded) {\r
-                       emu_ResetGame();\r
+                       emu_reset_game();\r
                        return 1;\r
                }\r
                break;\r