X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=9dbabe463399e86f8d6701998a7bbef7c4d7a460;hb=0c9ae59222a6fa9af18dcc072fdfb06cfca124d6;hp=e8908d2ef1e4e8b59a54e4fd83b02af59a7ccf21;hpb=f71361b521c9c64351ea99ed97627a606c642008;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index e8908d2..9dbabe4 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -1,5 +1,3 @@
-#ifdef __GP2X__
-
 #include <time.h>
 #include "soc.h"
 
@@ -55,54 +53,26 @@ static void menu_main_plat_draw(void)
 
 // ------------ gfx options menu ------------
 
-static const char *mgn_opt_renderer(menu_id id, int *offs)
-{
-	*offs = -11;
-	if (PicoOpt & POPT_ALT_RENDERER)
-		return "     8bit fast";
-	else if (currentConfig.EmuOpt & EOPT_16BPP)
-		return "16bit accurate";
-	else
-		return " 8bit accurate";
-}
-
-static const char *mgn_opt_scaling(menu_id id, int *offs)
-{
-	*offs = -13;
-	switch (currentConfig.scaling) {
-		default:               return "             OFF";
-		case EOPT_SCALE_HW_H:  return "   hw horizontal";
-		case EOPT_SCALE_HW_HV: return "hw horiz. + vert";
-		case EOPT_SCALE_SW_H:  return "   sw horizontal";
-	}
-}
-
 static const char *mgn_aopt_gamma(menu_id id, int *offs)
 {
-	sprintf(static_buff, "%i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100);
+	sprintf(static_buff, "%i.%02i", currentConfig.gamma / 100, currentConfig.gamma % 100);
 	return static_buff;
 }
 
 
-#define MENU_GP2X_OPTIONS_GFX \
-	mee_range_cust("Scaling",                  MA_OPT_SCALING,        currentConfig.scaling, 0, 3, mgn_opt_scaling), \
+const char *men_scaling_opts[] = { "OFF", "sw horizontal", "hw horizontal", "hw horiz. + vert", NULL };
+
+#define MENU_OPTIONS_GFX \
+	mee_enum      ("Scaling",                  MA_OPT_SCALING,        currentConfig.scaling, men_scaling_opts), \
 	mee_onoff     ("Tearing Fix",              MA_OPT_TEARING_FIX,    currentConfig.EmuOpt, EOPT_WIZ_TEAR_FIX), \
 	mee_range_cust("Gamma correction",         MA_OPT2_GAMMA,         currentConfig.gamma, 1, 300, mgn_aopt_gamma), \
 	mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, EOPT_A_SN_GAMMA), \
 	mee_onoff     ("Vsync",                    MA_OPT2_VSYNC,         currentConfig.EmuOpt, EOPT_VSYNC),
 
-#define MENU_GP2X_OPTIONS_ADV \
+#define MENU_OPTIONS_ADV \
 	mee_onoff     ("Use second CPU for sound", MA_OPT_ARM940_SOUND,   PicoOpt, POPT_EXT_FM), \
 	mee_onoff     ("RAM overclock",            MA_OPT2_RAMTIMINGS,    currentConfig.EmuOpt, EOPT_RAM_TIMINGS), \
 	mee_onoff     ("MMU hack",                 MA_OPT2_SQUIDGEHACK,   currentConfig.EmuOpt, EOPT_MMUHACK), \
 	mee_onoff     ("SVP dynarec",              MA_OPT2_SVP_DYNAREC,   PicoOpt, POPT_EN_SVP_DRC), \
-	mee_onoff     ("Status line in main menu", MA_OPT2_STATUS_LINE,   currentConfig.EmuOpt, EOPT_SHOW_RTC ),
-
-#else
-
-#define MENU_GP2X_OPTIONS_GFX
-#define MENU_GP2X_OPTIONS_ADV
-#define mgn_opt_renderer NULL /* TODO */
-#define menu_main_plat_draw NULL
+	mee_onoff     ("Status line in main menu", MA_OPT2_STATUS_LINE,   currentConfig.EmuOpt, EOPT_SHOW_RTC),
 
-#endif