X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=frontend%2Fmenu.c;h=25c476dac703eee0c3cfef7dba3433b305281526;hb=30f6e5edd98efed9c1624205e5c40c383e0db966;hp=60cf0c4e07ffd6d2911234889e61ea8043866cdc;hpb=33400707ded1b72c10c7ed70f925066aeae86f45;p=pcsx_rearmed.git

diff --git a/frontend/menu.c b/frontend/menu.c
index 60cf0c4e..25c476da 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -28,6 +28,7 @@
 #include "linux/in_evdev.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cdrom.h"
+#include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/psemu_plugin_defs.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/main.h"
@@ -44,6 +45,7 @@ typedef enum
 	MA_MAIN_RESET_GAME,
 	MA_MAIN_LOAD_ROM,
 	MA_MAIN_SWAP_CD,
+	MA_MAIN_SWAP_CD_MULTI,
 	MA_MAIN_RUN_BIOS,
 	MA_MAIN_RUN_EXE,
 	MA_MAIN_CONTROLS,
@@ -79,7 +81,8 @@ static char last_selected_fname[MAXPATHLEN];
 static int warned_about_bios, region, in_type_sel1, in_type_sel2;
 static int psx_clock;
 static int memcard1_sel, memcard2_sel;
-int g_opts, analog_deadzone;
+int g_opts;
+int analog_deadzone; // for Caanoo
 
 #ifdef __ARM_ARCH_7A__
 #define DEFAULT_PSX_CLOCK 57
@@ -724,6 +727,10 @@ me_bind_action emuctrl_actions[] =
 	{ "Gun A button     ", 1 << SACTION_GUN_A },
 	{ "Gun B button     ", 1 << SACTION_GUN_B },
 	{ "Gun Offscreen Trigger", 1 << SACTION_GUN_TRIGGER2 },
+#ifndef __ARM_ARCH_7A__ /* XXX */
+	{ "Volume Up        ", 1 << SACTION_VOLUME_UP },
+	{ "Volume Down      ", 1 << SACTION_VOLUME_DOWN },
+#endif
 	{ NULL,                0 }
 };
 
@@ -801,7 +808,7 @@ static void keys_write_all(FILE *f)
 			}
 
 			kbinds = binds[IN_BIND_OFFS(k, IN_BINDTYPE_EMU)];
-			for (i = 0; kbinds && i < ARRAY_SIZE(emuctrl_actions) - 1; i++) {
+			for (i = 0; kbinds && emuctrl_actions[i].name != NULL; i++) {
 				mask = emuctrl_actions[i].mask;
 				if (mask & kbinds) {
 					strncpy(act, emuctrl_actions[i].name, 31);
@@ -1572,6 +1579,7 @@ static int reload_plugins(const char *cdimg)
 	}
 	plugin_call_rearmed_cbs();
 
+	cdrIsoMultidiskCount = 1;
 	CdromId[0] = '\0';
 	CdromLabel[0] = '\0';
 
@@ -1709,6 +1717,24 @@ static int swap_cd_image(void)
 	return 0;
 }
 
+static int swap_cd_multidisk(void)
+{
+	cdrIsoMultidiskSelect++;
+	CdromId[0] = '\0';
+	CdromLabel[0] = '\0';
+
+	CDR_close();
+	if (CDR_open() < 0) {
+		me_update_msg("failed to open cdr plugin");
+		return -1;
+	}
+
+	SetCdOpenCaseTime(time(NULL) + 2);
+	LidInterrupt();
+
+	return 0;
+}
+
 static int main_menu_handler(int id, int keys)
 {
 	switch (id)
@@ -1737,6 +1763,10 @@ static int main_menu_handler(int id, int keys)
 		if (swap_cd_image() == 0)
 			return 1;
 		break;
+	case MA_MAIN_SWAP_CD_MULTI:
+		if (swap_cd_multidisk() == 0)
+			return 1;
+		break;
 	case MA_MAIN_RUN_BIOS:
 		if (run_bios() == 0)
 			return 1;
@@ -1762,9 +1792,10 @@ static int main_menu_handler(int id, int keys)
 
 static menu_entry e_menu_main2[] =
 {
-	mee_handler_id("Change CD image",    MA_MAIN_SWAP_CD,     main_menu_handler),
-	mee_handler_id("Run BIOS",           MA_MAIN_RUN_BIOS,    main_menu_handler),
-	mee_handler_id("Run EXE",            MA_MAIN_RUN_EXE,     main_menu_handler),
+	mee_handler_id("Change CD image",    MA_MAIN_SWAP_CD,       main_menu_handler),
+	mee_handler_id("Next multidisk CD",  MA_MAIN_SWAP_CD_MULTI, main_menu_handler),
+	mee_handler_id("Run BIOS",           MA_MAIN_RUN_BIOS,      main_menu_handler),
+	mee_handler_id("Run EXE",            MA_MAIN_RUN_EXE,       main_menu_handler),
 	mee_handler   ("Memcard manager",    menu_loop_memcards),
 	mee_end,
 };
@@ -1774,6 +1805,7 @@ static int main_menu2_handler(int id, int keys)
 	static int sel = 0;
 
 	me_enable(e_menu_main2, MA_MAIN_SWAP_CD,  ready_to_go);
+	me_enable(e_menu_main2, MA_MAIN_SWAP_CD_MULTI, ready_to_go && cdrIsoMultidiskCount > 1);
 	me_enable(e_menu_main2, MA_MAIN_RUN_BIOS, bios_sel != 0);
 
 	return me_loop_d(e_menu_main2, &sel, NULL, draw_frame_main);