mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu) Add ADVANCED flags to some settings

Browse Source
This commit is contained in:
Higor Eurípedes 2015-03-06 13:09:48 -03:00
parent cfa531ab83
commit 5d1b6b4202
6 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.def.h
View File

@ -449,6 +449,7 @@ static const bool default_overlay_enable = false;
static bool default_block_config_read = true;
static bool collapse_subgroups_enable = true;
static bool show_advanced_settings = false;
#else
static bool default_block_config_read = false;
#endif

1
general.h
View File

@ -221,6 +221,7 @@ struct settings
} browser;
} navigation;
bool collapse_subgroups_enable;
bool show_advanced_settings;
} menu;
#endif

3
menu/menu_entries.c
View File

@ -101,7 +101,8 @@ int menu_entries_push_list(menu_handle_t *menu,
if (
setting->type == ST_GROUP ||
setting->type == ST_SUB_GROUP ||
setting->type == ST_END_SUB_GROUP
setting->type == ST_END_SUB_GROUP ||
(setting->flags & SD_FLAG_ADVANCED && !g_settings.menu.show_advanced_settings)
)
continue;

4
settings.c
View File

@ -494,6 +494,7 @@ static void config_set_defaults(void)
g_settings.menu.navigation.wraparound.vertical_enable = true;
g_settings.menu.navigation.browser.filter.supported_extensions_enable = true;
g_settings.menu.collapse_subgroups_enable = collapse_subgroups_enable;
g_settings.menu.show_advanced_settings = show_advanced_settings;
#endif
g_settings.ui.menubar_enable = true;
@ -1115,6 +1116,7 @@ static bool config_load_file(const char *path, bool set_defaults)
CONFIG_GET_BOOL(menu.navigation.wraparound.vertical_enable, "menu_navigation_wraparound_vertical_enable");
CONFIG_GET_BOOL(menu.navigation.browser.filter.supported_extensions_enable, "menu_navigation_browser_filter_supported_extensions_enable");
CONFIG_GET_BOOL(menu.collapse_subgroups_enable, "menu_collapse_subgroups_enable");
CONFIG_GET_BOOL(menu.show_advanced_settings, "menu_show_advanced_settings");
CONFIG_GET_PATH(menu.wallpaper, "menu_wallpaper");
CONFIG_GET_BOOL(menu.throttle, "menu_throttle");
if (!strcmp(g_settings.menu.wallpaper, "default"))
@ -1990,6 +1992,8 @@ bool config_save_file(const char *path)
g_settings.menu.navigation.browser.filter.supported_extensions_enable);
config_set_bool(conf, "menu_collapse_subgroups_enable",
g_settings.menu.collapse_subgroups_enable);
config_set_bool(conf, "menu_show_advanced_settings",
g_settings.menu.show_advanced_settings);
#endif
config_set_path(conf, "game_history_path", g_settings.content_history_path);

52
settings_data.c
View File

@ -3268,6 +3268,7 @@ static bool setting_data_append_list_main_menu_options(
"Performance Counters",
group_info.name,
subgroup_info.name);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
}
if (g_extern.main_is_init && !g_extern.libretro_dummy)
{
@ -3497,6 +3498,7 @@ static bool setting_data_append_list_general_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
g_settings.core_specific_config,
@ -3554,6 +3556,7 @@ static bool setting_data_append_list_general_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(g_settings.config_save_on_exit,
"config_save_on_exit",
@ -3604,6 +3607,7 @@ static bool setting_data_append_list_general_options(
general_write_handler,
general_read_handler);
settings_list_current_add_range(list, list_info, 1, 32768, 1, true, false);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
END_SUB_GROUP(list, list_info);
@ -3764,6 +3768,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
END_SUB_GROUP(list, list_info);
START_SUB_GROUP(list, list_info, "Monitor", group_info.name, subgroup_info);
@ -3781,6 +3786,7 @@ static bool setting_data_append_list_video_options(
settings_list_current_add_range(list, list_info, 0, 1, 1, true, false);
(*list)[list_info->index - 1].get_string_representation =
&setting_data_get_string_representation_uint_video_monitor_index;
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#if !defined(RARCH_CONSOLE) && !defined(RARCH_MOBILE)
CONFIG_BOOL(
@ -3818,6 +3824,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_UINT(
g_settings.video.fullscreen_y,
@ -3828,6 +3835,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_FLOAT(
g_settings.video.refresh_rate,
@ -3881,7 +3889,7 @@ static bool setting_data_append_list_video_options(
general_write_handler,
general_read_handler);
settings_list_current_add_cmd(list, list_info, RARCH_CMD_REINIT);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED);
END_SUB_GROUP(list, list_info);
@ -3985,6 +3993,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
NULL,
NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_INT(
g_extern.console.screen.viewports.custom_vp.y,
@ -3995,6 +4004,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
NULL,
NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_UINT(
g_extern.console.screen.viewports.custom_vp.width,
@ -4005,6 +4015,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
NULL,
NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_UINT(
g_extern.console.screen.viewports.custom_vp.height,
@ -4015,6 +4026,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
NULL,
NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#ifdef GEKKO
CONFIG_UINT(
@ -4079,6 +4091,7 @@ static bool setting_data_append_list_video_options(
settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
(*list)[list_info->index - 1].get_string_representation =
&setting_data_get_string_representation_uint_video_rotation;
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#if defined(HW_RVL) || defined(_XBOX360)
CONFIG_UINT(
@ -4102,7 +4115,8 @@ static bool setting_data_append_list_video_options(
1,
true,
true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED);
#endif
END_SUB_GROUP(list, list_info);
@ -4126,7 +4140,7 @@ static bool setting_data_append_list_video_options(
general_write_handler,
general_read_handler);
settings_list_current_add_cmd(list, list_info, RARCH_CMD_REINIT);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED);
#endif
CONFIG_BOOL(
@ -4152,7 +4166,7 @@ static bool setting_data_append_list_video_options(
general_read_handler);
settings_list_current_add_cmd(list, list_info, RARCH_CMD_VIDEO_SET_BLOCKING_STATE);
settings_list_current_add_range(list, list_info, 1, 4, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED);
CONFIG_BOOL(
g_settings.video.hard_sync,
@ -4176,6 +4190,7 @@ static bool setting_data_append_list_video_options(
general_write_handler,
general_read_handler);
settings_list_current_add_range(list, list_info, 0, 3, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_UINT(
g_settings.video.frame_delay,
@ -4187,6 +4202,8 @@ static bool setting_data_append_list_video_options(
general_write_handler,
general_read_handler);
settings_list_current_add_range(list, list_info, 0, 15, 1, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#if !defined(RARCH_MOBILE)
CONFIG_BOOL(
g_settings.video.black_frame_insertion,
@ -4220,6 +4237,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
g_settings.video.gpu_record,
@ -4232,6 +4250,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
g_settings.video.gpu_screenshot,
@ -4244,6 +4263,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
g_settings.video.allow_rotate,
@ -4256,6 +4276,7 @@ static bool setting_data_append_list_video_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
g_settings.video.crop_overscan,
@ -4462,6 +4483,7 @@ static bool setting_data_append_list_audio_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_UINT(
g_settings.audio.latency,
@ -4474,7 +4496,7 @@ static bool setting_data_append_list_audio_options(
general_write_handler,
general_read_handler);
settings_list_current_add_range(list, list_info, 1, 256, 1.0, true, true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DEFERRED);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DEFERRED|SD_FLAG_ADVANCED);
CONFIG_FLOAT(
g_settings.audio.rate_control_delta,
@ -4494,6 +4516,7 @@ static bool setting_data_append_list_audio_options(
0.001,
true,
false);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_FLOAT(
g_settings.audio.max_timing_skew,
@ -4513,6 +4536,7 @@ static bool setting_data_append_list_audio_options(
0.01,
true,
true);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_UINT(
g_settings.audio.block_frames,
@ -4523,6 +4547,7 @@ static bool setting_data_append_list_audio_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
END_SUB_GROUP(list, list_info);
@ -5161,6 +5186,19 @@ static bool setting_data_append_list_menu_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_BOOL(
g_settings.menu.show_advanced_settings,
"menu_show_advanced_settings",
"Show advanced settings",
show_advanced_settings,
"OFF",
"ON",
group_info.name,
subgroup_info.name,
general_write_handler,
general_read_handler);
END_SUB_GROUP(list, list_info);
@ -5442,6 +5480,7 @@ static bool setting_data_append_list_netplay_options(
general_write_handler,
general_read_handler);
settings_list_current_add_range(list, list_info, 0, 10, 1, true, false);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
CONFIG_UINT(
g_extern.netplay_port,
@ -5476,6 +5515,7 @@ static bool setting_data_append_list_netplay_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#if 0
CONFIG_INT(
g_settings.network_cmd_port,
@ -5485,6 +5525,7 @@ static bool setting_data_append_list_netplay_options(
group_info.name,
subgroup_info.name,
NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#endif
CONFIG_BOOL(
g_settings.stdin_cmd_enable,
@ -5497,6 +5538,7 @@ static bool setting_data_append_list_netplay_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
#endif
END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info);

1
settings_list.h
View File

@ -57,6 +57,7 @@ enum setting_flags
SD_FLAG_CMD_APPLY_AUTO = (1 << 8),
SD_FLAG_IS_DEFERRED = (1 << 9),
SD_FLAG_BROWSER_ACTION = (1 << 10),
SD_FLAG_ADVANCED = (1 << 11)
};
enum setting_list_flags