X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=ff8cd9947bb70a41604e0d154fabae8975281918;hb=34581c95f808322ecb29e0931ba8f5c879cc89b6;hp=1dc829a64759094551be4f69ecc3d346165fabbd;hpb=6589c840ca686751d15ebb127367af1378dd7de2;p=libpicofe.git

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