mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_displaylist) Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-04-23 03:54:33 +02:00
parent 4dd95212ac
commit 15000edf11
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/menu_displaylist.c
View File

@ -5984,16 +5984,18 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE,
PARSE_ONLY_BOOL, false);
#if defined(GEKKO) || defined(__CELLOS_LV2__)
if (true)
if (true)
#else
if (!string_is_equal(video_display_server_get_ident(), "null"))
if (!string_is_equal(video_display_server_get_ident(), "null"))
#endif
{
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_SCREEN_RESOLUTION,
PARSE_ACTION, false);
}
{
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_SCREEN_RESOLUTION,
PARSE_ACTION, false);
}
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_PAL60_ENABLE,
PARSE_ONLY_BOOL, false);
@ -6387,12 +6389,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_RUN_AHEAD_HIDE_WARNINGS,
PARSE_ONLY_BOOL, false) == 0)
count++;
#ifdef ANDROID
if (menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_INPUT_BLOCK_TIMEOUT,
PARSE_ONLY_UINT, false) == 0)
count++;
#endif
if (count == 0)
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND),
@ -6880,7 +6881,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_QUIT_RETROARCH,
PARSE_ACTION, false);
#ifdef HAVE_LAKKA_SWITCH
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,
PARSE_ACTION, false);
@ -6888,7 +6889,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_SWITCH_BACKLIGHT_CONTROL,
PARSE_ACTION, false);
#endif
if (settings->bools.menu_show_reboot)
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_REBOOT,
@ -6996,7 +6997,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
PARSE_ACTION, false) == 0)
count++;
#ifdef HAVE_NETWORKING
if (menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_ACCOUNTS_YOUTUBE,
PARSE_ACTION, false) == 0)
@ -7006,7 +7006,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_ACCOUNTS_TWITCH,
PARSE_ACTION, false) == 0)
count++;
#endif
if (count == 0)
menu_entries_append_enum(info->list,

4
menu/menu_setting.c
View File

@ -7889,6 +7889,7 @@ static bool setting_append_list(
SD_FLAG_ADVANCED
);
#ifdef ANDROID
CONFIG_UINT(
list, list_info,
&settings->uints.input_block_timeout,
@ -7903,6 +7904,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
(*list)[list_info->index - 1].offset_by = 1;
menu_settings_list_current_add_range(list, list_info, 0, 4, 1, true, true);
#endif
CONFIG_BOOL(
list, list_info,
@ -11190,6 +11192,7 @@ static bool setting_append_list(
parent_group);
#endif
#ifdef HAVE_NETWORKING
CONFIG_ACTION(
list, list_info,
MENU_ENUM_LABEL_ACCOUNTS_YOUTUBE,
@ -11205,6 +11208,7 @@ static bool setting_append_list(
&group_info,
&subgroup_info,
parent_group);
#endif
END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group);

4
msg_hash.h
View File

@ -2288,7 +2288,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM,
MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
#ifdef HAVE_LAKKA_SWITCH
MENU_ENUM_LABEL_SWITCH_GPU_PROFILE,
MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
@ -2296,12 +2295,9 @@ enum msg_hash_enums
MENU_ENUM_LABEL_SWITCH_BACKLIGHT_CONTROL,
MENU_ENUM_LABEL_VALUE_SWITCH_BACKLIGHT_CONTROL,
MENU_ENUM_SUBLABEL_SWITCH_BACKLIGHT_CONTROL,
#endif
#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX)
MENU_ENUM_LABEL_SWITCH_CPU_PROFILE,
MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
MENU_ENUM_SUBLABEL_SWITCH_CPU_PROFILE,
#endif
MENU_ENUM_LABEL_VALUE_HOLD_START,
MENU_ENUM_LABEL_VALUE_DOWN_SELECT,