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

(Menu) Cleanup some code duplication

Browse Source
This commit is contained in:
Twinaphex 2015-06-06 15:59:40 +02:00
parent fc174357a8
commit ba7b87cde4
2 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/menu_entries_cbs.c
View File

@ -149,6 +149,22 @@ int menu_entries_common_is_settings_entry(const char *label)
case MENU_LABEL_ONSCREEN_DISPLAY_SETTINGS:
case MENU_LABEL_AUDIO_SETTINGS:
case MENU_LABEL_INPUT_SETTINGS:
case MENU_LABEL_INPUT_USER_1_BINDS:
case MENU_LABEL_INPUT_USER_2_BINDS:
case MENU_LABEL_INPUT_USER_3_BINDS:
case MENU_LABEL_INPUT_USER_4_BINDS:
case MENU_LABEL_INPUT_USER_5_BINDS:
case MENU_LABEL_INPUT_USER_6_BINDS:
case MENU_LABEL_INPUT_USER_7_BINDS:
case MENU_LABEL_INPUT_USER_8_BINDS:
case MENU_LABEL_INPUT_USER_9_BINDS:
case MENU_LABEL_INPUT_USER_10_BINDS:
case MENU_LABEL_INPUT_USER_11_BINDS:
case MENU_LABEL_INPUT_USER_12_BINDS:
case MENU_LABEL_INPUT_USER_13_BINDS:
case MENU_LABEL_INPUT_USER_14_BINDS:
case MENU_LABEL_INPUT_USER_15_BINDS:
case MENU_LABEL_INPUT_USER_16_BINDS:
case MENU_LABEL_INPUT_HOTKEY_SETTINGS:
case MENU_LABEL_OVERLAY_SETTINGS:
case MENU_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS:

44
menu/menu_entries_cbs_title.c
View File

@ -74,6 +74,17 @@ static int action_get_title_default(const char *path, const char *label,
RARCH_LOG("label %s, elem0 %s, elem1 %s\n", label, elem0, elem1);
#endif
if (menu_entries_common_is_settings_entry(label) == 1)
{
strlcpy(s, string_to_upper(elem0), len);
if (elem1[0] != '\0')
{
strlcat(s, " - ", len);
strlcat(s, string_to_upper(elem1), len);
}
return 0;
}
hash = djb2_calculate(label);
switch (hash)
@ -241,39 +252,6 @@ static int action_get_title_default(const char *path, const char *label,
case MENU_LABEL_JOYPAD_AUTOCONFIG_DIR:
snprintf(s, len, "AUTOCONFIG DIR %s", path);
break;
case MENU_LABEL_DRIVER_SETTINGS:
case MENU_LABEL_CORE_SETTINGS:
case MENU_LABEL_CONFIGURATION_SETTINGS:
case MENU_LABEL_LOGGING_SETTINGS:
case MENU_LABEL_SAVING_SETTINGS:
case MENU_LABEL_REWIND_SETTINGS:
case MENU_LABEL_VIDEO_SETTINGS:
case MENU_LABEL_RECORDING_SETTINGS:
case MENU_LABEL_FRAME_THROTTLE_SETTINGS:
case MENU_LABEL_SHADER_SETTINGS:
case MENU_LABEL_FONT_SETTINGS:
case MENU_LABEL_AUDIO_SETTINGS:
case MENU_LABEL_INPUT_SETTINGS:
case MENU_LABEL_INPUT_HOTKEY_SETTINGS:
case MENU_LABEL_OVERLAY_SETTINGS:
case MENU_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS:
case MENU_LABEL_MENU_SETTINGS:
case MENU_LABEL_UI_SETTINGS:
case MENU_LABEL_PATCH_SETTINGS:
case MENU_LABEL_PLAYLIST_SETTINGS:
case MENU_LABEL_CORE_UPDATER_SETTINGS:
case MENU_LABEL_NETWORK_SETTINGS:
case MENU_LABEL_ARCHIVE_SETTINGS:
case MENU_LABEL_USER_SETTINGS:
case MENU_LABEL_DIRECTORY_SETTINGS:
case MENU_LABEL_PRIVACY_SETTINGS:
strlcpy(s, string_to_upper(elem0), len);
if (elem1[0] != '\0')
{
strlcat(s, " - ", len);
strlcat(s, string_to_upper(elem1), len);
}
break;
default:
if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT ||
menu_type == MENU_SETTINGS)