debug bgm player, sound code refactoring

[picodrive.git] / platform / gizmondo / menu.c

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index 9643a16..edd7ef0 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -26,8 +26,8 @@
 #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
 \r
@@ -813,7 +813,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
@@ -1438,10 +1438,10 @@ static void menu_loop_root(void)
                                {\r
                                        char curr_path[MAX_PATH], *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, MAX_PATH);\r
@@ -1586,10 +1586,10 @@ int menu_loop_tray(void)
 \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
@@ -1613,7 +1613,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