supporting caanoo, line doublers, refactoring

[libpicofe.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index 35ab449..4ee5c19 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -1606,7 +1606,7 @@ static int menu_loop_32x_options(menu_id id, int keys)
 {\r
        static int sel = 0;\r
 \r
-       me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x != NULL);\r
+       me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x[0] != NULL);\r
        me_loop(e_menu_32x_options, &sel, NULL);\r
 \r
        return 0;\r
@@ -1834,7 +1834,7 @@ static menu_entry e_menu_options[] =
        mee_onoff     ("Enable sound",             MA_OPT_ENABLE_SOUND,  currentConfig.EmuOpt, EOPT_EN_SOUND),\r
        mee_cust      ("Sound Quality",            MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),\r
        mee_enum_h    ("Confirm savestate",        MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save),\r
-       mee_range     (cpu_clk_name,               MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),\r
+       mee_range     ("",                         MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),\r
        mee_handler   ("[Display options]",        menu_loop_gfx_options),\r
        mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),\r
 #ifndef NO_32X\r
@@ -1851,7 +1851,10 @@ static menu_entry e_menu_options[] =
 static int menu_loop_options(menu_id id, int keys)\r
 {\r
        static int sel = 0;\r
+       int i;\r
 \r
+       i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);\r
+       e_menu_options[i].enabled = e_menu_options[i].name ? 1 : 0;\r
        me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded);\r
        me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
 \r
@@ -2191,28 +2194,6 @@ void me_update_msg(const char *msg)
 \r
 // ------------ util ------------\r
 \r
-/* GP2X/wiz for now, probably extend later */\r
-void menu_plat_setup(int is_wiz)\r
-{\r
-       int i;\r
-\r
-       if (!is_wiz) {\r
-               me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);\r
-               i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);\r
-               e_menu_gfx_options[i].need_to_save = 0;\r
-               return;\r
-       }\r
-\r
-       me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);\r
-       me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);\r
-       me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);\r
-\r
-       i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);\r
-       e_menu_gfx_options[i].max = 1;  /* only off and sw */\r
-       i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);\r
-       e_menu_gfx_options[i].need_to_save = 0;\r
-}\r
-\r
 /* hidden options for config engine only */\r
 static menu_entry e_menu_hidden[] =\r
 {\r