X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu.c;h=5fc2a5768defa9f9951d952ad5a7f334f4d0479e;hb=54646a396bc0330c581be41863640f00680fbf9a;hp=80fdff81d33376d4ac69916c93abf8370754eeaa;hpb=61753a672400a712390fb7a0cfb325c640bce479;p=picodrive.git

diff --git a/platform/common/menu.c b/platform/common/menu.c
index 80fdff8..5fc2a57 100644
--- a/platform/common/menu.c
+++ b/platform/common/menu.c
@@ -455,8 +455,9 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 	plat_video_menu_end();
 }
 
-static int me_process(menu_entry *entry, int is_next)
+static int me_process(menu_entry *entry, int is_next, int is_lr)
 {
+	int c;
 	switch (entry->beh)
 	{
 		case MB_OPT_ONOFF:
@@ -465,7 +466,8 @@ static int me_process(menu_entry *entry, int is_next)
 			return 1;
 		case MB_OPT_RANGE:
 		case MB_OPT_CUSTRANGE:
-			*(int *)entry->var += is_next ? 1 : -1;
+			c = is_lr ? 10 : 1;
+			*(int *)entry->var += is_next ? c : -c;
 			if (*(int *)entry->var < (int)entry->min)
 				*(int *)entry->var = (int)entry->max;
 			if (*(int *)entry->var > (int)entry->max)
@@ -524,8 +526,9 @@ static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
 		if ((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R))
 			debug_menu_loop();
 
-		if (inp & (PBTN_LEFT|PBTN_RIGHT)) { /* multi choice */
-			if (me_process(&menu[sel], (inp & PBTN_RIGHT) ? 1 : 0))
+		if (inp & (PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R)) { /* multi choice */
+			if (me_process(&menu[sel], (inp & (PBTN_RIGHT|PBTN_R)) ? 1 : 0,
+						inp & (PBTN_L|PBTN_R)))
 				continue;
 		}
 
@@ -1418,7 +1421,7 @@ static int mh_cdopt_ra(menu_id id, int keys)
 
 static menu_entry e_menu_cd_options[] =
 {
-	mee_onoff("CD LEDs",              MA_CDOPT_LEDS,          currentConfig.EmuOpt, 0x0400),
+	mee_onoff("CD LEDs",              MA_CDOPT_LEDS,          currentConfig.EmuOpt, EOPT_EN_CD_LEDS),
 	mee_onoff("CDDA audio",           MA_CDOPT_CDDA,          PicoOpt, POPT_EN_MCD_CDDA),
 	mee_onoff("PCM audio",            MA_CDOPT_PCM,           PicoOpt, POPT_EN_MCD_PCM),
 	mee_cust ("ReadAhead buffer",     MA_CDOPT_READAHEAD,     mh_cdopt_ra, mgn_cdopt_ra),
@@ -1447,6 +1450,7 @@ static menu_entry e_menu_adv_options[] =
 	mee_onoff     ("gzip savestates",          MA_OPT2_GZIP_STATES,   currentConfig.EmuOpt, EOPT_GZIP_SAVES),
 	mee_onoff     ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM,   currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),
 	mee_onoff     ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),
+	mee_onoff     ("Disable frame limiter",    MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT),
 	MENU_GP2X_OPTIONS_ADV
 	mee_end,
 };
@@ -2039,6 +2043,8 @@ void menu_plat_setup(int is_wiz)
 
 	if (!is_wiz) {
 		me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
+		i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);
+		e_menu_gfx_options[i].need_to_save = 0;
 		return;
 	}
 
@@ -2048,6 +2054,8 @@ void menu_plat_setup(int is_wiz)
 
 	i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);
 	e_menu_gfx_options[i].max = 1;	/* only off and sw */
+	i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);
+	e_menu_gfx_options[i].need_to_save = 0;
 }
 
 /* TODO: rename */