extracted OSS code to sndout_oss_*, BTN->PBTN, refactoring

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 1dc829a..ff8cd99 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -13,15 +13,15 @@
 #include "gp2x.h"\r
 #include "emu.h"\r
 #include "menu.h"\r
-#include "usbjoy.h"\r
+#include "../linux/usbjoy.h"\r
 #include "../common/emu.h"\r
 #include "../common/menu.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/readpng.h"\r
 #include "version.h"\r
 \r
-#include <Pico/PicoInt.h>\r
-#include <Pico/Patch.h>\r
+#include <pico/pico_int.h>\r
+#include <pico/patch.h>\r
 #include <zlib/zlib.h>\r
 \r
 #ifndef _DIRENT_HAVE_D_TYPE\r
@@ -90,9 +90,9 @@ static unsigned long input2_read(unsigned long interesting, int *joy)
        {\r
                *joy = 0;\r
                if ((ret = gp2x_joystick_read(0) & interesting)) break;\r
-               gp2x_usbjoy_update();\r
+               usbjoy_update();\r
                for (i = 0; i < num_of_joys; i++) {\r
-                       ret = gp2x_usbjoy_check2(i);\r
+                       ret = usbjoy_check2(i);\r
                        if (ret) { *joy = i + 1; break; }\r
                }\r
                if (ret) break;\r
@@ -901,7 +901,7 @@ menu_entry cdopt_entries[] =
        { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1, 0 },\r
        { NULL,                        MB_NONE,  MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1, 0 },\r
        { "CD LEDs",                   MB_ONOFF, MA_CDOPT_LEDS,         &currentConfig.EmuOpt, 0x0400, 0, 0, 1, 1 },\r
-       { "CDDA audio (using mp3s)",   MB_ONOFF, MA_CDOPT_CDDA,         &PicoOpt, 0x0800, 0, 0, 1, 1 },\r
+       { "CDDA audio",                MB_ONOFF, MA_CDOPT_CDDA,         &PicoOpt, 0x0800, 0, 0, 1, 1 },\r
        { "PCM audio",                 MB_ONOFF, MA_CDOPT_PCM,          &PicoOpt, 0x0400, 0, 0, 1, 1 },\r
        { NULL,                        MB_NONE,  MA_CDOPT_READAHEAD,    NULL, 0, 0, 0, 1, 1 },\r
        { "SaveRAM cart",              MB_ONOFF, MA_CDOPT_SAVERAM,      &PicoOpt, 0x8000, 0, 0, 1, 1 },\r
@@ -1551,10 +1551,10 @@ static void menu_loop_root(void)
                                {\r
                                        char curr_path[PATH_MAX], *selfname;\r
                                        FILE *tstf;\r
-                                       if ( (tstf = fopen(lastRomFile, "rb")) )\r
+                                       if ( (tstf = fopen(loadedRomFName, "rb")) )\r
                                        {\r
                                                fclose(tstf);\r
-                                               strcpy(curr_path, lastRomFile);\r
+                                               strcpy(curr_path, loadedRomFName);\r
                                        }\r
                                        else\r
                                                getcwd(curr_path, PATH_MAX);\r
@@ -1694,10 +1694,10 @@ int menu_loop_tray(void)
        gp2x_memset_all_buffers(0, 0, 320*240*2);\r
        menu_gfx_prepare();\r
 \r
-       if ( (tstf = fopen(lastRomFile, "rb")) )\r
+       if ( (tstf = fopen(loadedRomFName, "rb")) )\r
        {\r
                fclose(tstf);\r
-               strcpy(curr_path, lastRomFile);\r
+               strcpy(curr_path, loadedRomFName);\r
        }\r
        else\r
        {\r
@@ -1721,7 +1721,7 @@ int menu_loop_tray(void)
                                        if (selfname) {\r
                                                int ret = -1;\r
                                                cd_img_type cd_type;\r
-                                               cd_type = emu_cdCheck(NULL);\r
+                                               cd_type = emu_cdCheck(NULL, romFileName);\r
                                                if (cd_type != CIT_NOT_CD)\r
                                                        ret = Insert_CD(romFileName, cd_type);\r
                                                if (ret != 0) {\r