From c2bc2c348831e3ade1d7712316ce3dcd66dd9a54 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 22 Nov 2016 11:14:29 +0100 Subject: [PATCH] Cleanups --- intl/msg_hash_de.c | 2 - intl/msg_hash_fr.c | 2 - msg_hash.h | 413 +++++++++++++++------------------------------ 3 files changed, 137 insertions(+), 280 deletions(-) diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c index f0cd0b9dc8..595a500dc3 100644 --- a/intl/msg_hash_de.c +++ b/intl/msg_hash_de.c @@ -506,8 +506,6 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg) return "Cheat-Durchgänge"; case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: return "Schließe"; - case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE: - return "Untergruppen einklappen"; case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Lade Konfigurationsdatei"; /* FIXME/UPDATE */ case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: diff --git a/intl/msg_hash_fr.c b/intl/msg_hash_fr.c index 6d7b370e27..833a5cad97 100644 --- a/intl/msg_hash_fr.c +++ b/intl/msg_hash_fr.c @@ -128,8 +128,6 @@ const char *msg_hash_to_str_fr(enum msg_hash_enums msg) return "Nombre de passages"; case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT: return "Quitter"; - case MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE: - return "Fusionner les sous-groupes"; case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS: return "Charger une configuration"; case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS: diff --git a/msg_hash.h b/msg_hash.h index 7b1ea59d72..e0c1124fe7 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -342,7 +342,6 @@ enum msg_hash_enums MSG_EXTRACTING_FILE, MSG_NO_CONTENT_STARTING_DUMMY_CORE, - MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE, MENU_ENUM_LABEL_MENU_TOGGLE, MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE, MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE, @@ -420,9 +419,7 @@ enum msg_hash_enums /* System information */ MENU_LABEL(CPU_CORES), - - MENU_ENUM_LABEL_CPU_ARCHITECTURE, - MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE, + MENU_LABEL(CPU_ARCHITECTURE), /* Input */ @@ -591,66 +588,44 @@ enum msg_hash_enums MENU_LABEL(VIDEO_FONT_SIZE), MENU_LABEL(VIDEO_MESSAGE_POS_X), MENU_LABEL(VIDEO_MESSAGE_POS_Y), - MENU_LABEL(VIDEO_FILTER_FLICKER), MENU_LABEL(VIDEO_SOFT_FILTER), MENU_LABEL(VIDEO_MAX_SWAPCHAIN_IMAGES), MENU_LABEL(VIDEO_GPU_SCREENSHOT), - - MENU_LABEL(VIDEO_BLACK_FRAME_INSERTION), MENU_LABEL(VIDEO_FRAME_DELAY), MENU_LABEL(VIDEO_VSYNC), MENU_LABEL(VIDEO_HARD_SYNC), MENU_LABEL(VIDEO_HARD_SYNC_FRAMES), + MENU_LABEL(VIDEO_WINDOWED_FULLSCREEN), + MENU_LABEL(VIDEO_FORCE_SRGB_DISABLE), + MENU_LABEL(VIDEO_ROTATION), + MENU_LABEL(VIDEO_SCALE), + MENU_LABEL(VIDEO_SMOOTH), - MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN, - MENU_ENUM_LABEL_VIDEO_FORCE_SRGB_DISABLE, - MENU_ENUM_LABEL_VIDEO_ROTATION, - MENU_ENUM_LABEL_VIDEO_SCALE, - MENU_ENUM_LABEL_VIDEO_SMOOTH, - MENU_ENUM_LABEL_VIDEO_CROP_OVERSCAN, - MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_X, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH, - MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT, + MENU_LABEL(VIDEO_CROP_OVERSCAN), + MENU_LABEL(VIDEO_SCALE_INTEGER), + MENU_LABEL(VIDEO_VIEWPORT_CUSTOM_X), + MENU_LABEL(VIDEO_VIEWPORT_CUSTOM_Y), + MENU_LABEL(VIDEO_VIEWPORT_CUSTOM_WIDTH), + MENU_LABEL(VIDEO_VIEWPORT_CUSTOM_HEIGHT), MENU_LABEL(VIDEO_GAMMA), MENU_LABEL(VIDEO_ALLOW_ROTATE), MENU_LABEL(VIDEO_SHARED_CONTEXT), MENU_LABEL(VIDEO_THREADED), MENU_ENUM_LABEL_VALUE_VIDEO_FILTER, - MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION, MENU_LABEL(VIDEO_SWAP_INTERVAL), - MENU_LABEL(VIDEO_FULLSCREEN), - - MENU_LABEL(VIDEO_MONITOR_INDEX), - - MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN, - MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE, - MENU_ENUM_LABEL_VALUE_VIDEO_SCALE, - MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH, - MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN, - MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER, - MENU_LABEL(VIDEO_REFRESH_RATE), MENU_LABEL(VIDEO_REFRESH_RATE_AUTO), - MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X, - MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y, - MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH, - MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_HEIGHT, - MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION, - MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE, - MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY, - MENU_ENUM_LABEL_PARENT_DIRECTORY, + MENU_LABEL(PARENT_DIRECTORY), MENU_ENUM_LABEL_CONTENT_ACTIONS, @@ -677,44 +652,58 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE, MENU_ENUM_LABEL_ENTRY_NORMAL_COLOR, - MENU_ENUM_LABEL_ENTRY_HOVER_COLOR, - MENU_ENUM_LABEL_XMB_ALPHA_FACTOR, - MENU_ENUM_LABEL_XMB_FONT, - MENU_ENUM_LABEL_XMB_THEME, - MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME, - MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE, - MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, - MENU_ENUM_LABEL_XMB_SHOW_IMAGES, - MENU_ENUM_LABEL_XMB_SHOW_MUSIC, - MENU_ENUM_LABEL_XMB_SHOW_VIDEO, - MENU_ENUM_LABEL_XMB_SHOW_HISTORY, - MENU_ENUM_LABEL_XMB_RIBBON_ENABLE, - MENU_ENUM_LABEL_THUMBNAILS, - MENU_ENUM_LABEL_TIMEDATE_ENABLE, - MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME, - MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR, + + MENU_ENUM_LABEL_ENTRY_HOVER_COLOR, MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR, - MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, + + MENU_ENUM_LABEL_XMB_ALPHA_FACTOR, MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR, + + MENU_ENUM_LABEL_XMB_SCALE_FACTOR, + MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR, + + MENU_ENUM_LABEL_XMB_FONT, MENU_ENUM_LABEL_VALUE_XMB_FONT, + + MENU_ENUM_LABEL_XMB_THEME, MENU_ENUM_LABEL_VALUE_XMB_THEME, + + MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME, MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME, + + MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE, MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE, + + MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS, + + MENU_ENUM_LABEL_XMB_SHOW_IMAGES, MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES, + + MENU_ENUM_LABEL_XMB_SHOW_MUSIC, MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC, + + MENU_ENUM_LABEL_XMB_SHOW_VIDEO, MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO, + + MENU_ENUM_LABEL_XMB_SHOW_HISTORY, MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY, + + MENU_ENUM_LABEL_XMB_RIBBON_ENABLE, MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE, + + MENU_ENUM_LABEL_THUMBNAILS, MENU_ENUM_LABEL_VALUE_THUMBNAILS, + + MENU_ENUM_LABEL_TIMEDATE_ENABLE, MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE, + MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME, /* UI settings */ - MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION, - + MENU_LABEL(VIDEO_DISABLE_COMPOSITION), MENU_LABEL(UI_COMPANION_ENABLE), MENU_LABEL(UI_COMPANION_START_ON_BOOT), MENU_LABEL(UI_MENUBAR_ENABLE), @@ -742,23 +731,15 @@ enum msg_hash_enums MENU_ENUM_LABEL_FILE_BROWSER_MUSIC_OPEN, /* Menu file browser */ - MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS, MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, /* Playlists */ - MENU_ENUM_LABEL_HISTORY_LIST_ENABLE, - MENU_ENUM_LABEL_CONTENT_HISTORY_SIZE, - - MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE, - - MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE, - - MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY, - MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY, - - MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, - MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY, + MENU_LABEL(HISTORY_LIST_ENABLE), + MENU_LABEL(CONTENT_HISTORY_SIZE), + MENU_LABEL(MENU_THROTTLE_FRAMERATE), + MENU_LABEL(NO_ACHIEVEMENTS_TO_DISPLAY), + MENU_LABEL(NO_ENTRIES_TO_DISPLAY), /* Help */ @@ -783,19 +764,11 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD, MENU_LABEL(MENU_SETTINGS), - - MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, - MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST, - + MENU_LABEL(THUMBNAILS_UPDATER_LIST), MENU_LABEL(USER_INTERFACE_SETTINGS), - - MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, - MENU_LABEL(RETRO_ACHIEVEMENTS_SETTINGS), - - MENU_ENUM_LABEL_UPDATER_SETTINGS, - MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS, - + MENU_LABEL(MENU_FILE_BROWSER_SETTINGS), + MENU_LABEL(UPDATER_SETTINGS), MENU_LABEL(WIFI_SETTINGS), MENU_LABEL(USER_SETTINGS), MENU_LABEL(DIRECTORY_SETTINGS), @@ -926,9 +899,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_LIST, - MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST, - MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST, - + MENU_LABEL(DOWNLOADED_FILE_DETECT_CORE_LIST), MENU_ENUM_LABEL_VALUE_SEARCH, @@ -955,27 +926,16 @@ enum msg_hash_enums /* Online Updater */ - MENU_ENUM_LABEL_UPDATE_ASSETS, - MENU_ENUM_LABEL_UPDATE_LAKKA, - MENU_ENUM_LABEL_UPDATE_CHEATS, - MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES, - MENU_ENUM_LABEL_UPDATE_DATABASES, - MENU_ENUM_LABEL_UPDATE_CG_SHADERS, - MENU_ENUM_LABEL_UPDATE_OVERLAYS, - MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS, - MENU_ENUM_LABEL_UPDATE_SLANG_SHADERS, - MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES, - - MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES, - MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS, - MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA, - MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS, - MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES, - MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES, - MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS, - MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS, - MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS, - MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS, + MENU_LABEL(UPDATE_ASSETS), + MENU_LABEL(UPDATE_LAKKA), + MENU_LABEL(UPDATE_CHEATS), + MENU_LABEL(UPDATE_AUTOCONFIG_PROFILES), + MENU_LABEL(UPDATE_DATABASES), + MENU_LABEL(UPDATE_CG_SHADERS), + MENU_LABEL(UPDATE_OVERLAYS), + MENU_LABEL(UPDATE_GLSL_SHADERS), + MENU_LABEL(UPDATE_SLANG_SHADERS), + MENU_LABEL(UPDATE_CORE_INFO_FILES), MENU_LABEL(INFORMATION), MENU_LABEL(INFORMATION_LIST), @@ -989,18 +949,10 @@ enum msg_hash_enums MENU_LABEL(CORE_ENABLE), /* Netplay */ - - MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST, - MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST, - MENU_ENUM_LABEL_NETPLAY_ENABLE_CLIENT, - MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT, - MENU_ENUM_LABEL_NETPLAY_DISCONNECT, - MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, - MENU_ENUM_LABEL_NETPLAY_SETTINGS, - MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS, - - MENU_ENUM_LABEL_COLLAPSE_SUBGROUPS_ENABLE, - MENU_ENUM_LABEL_VALUE_COLLAPSE_SUBGROUPS_ENABLE, + MENU_LABEL(NETPLAY_ENABLE_HOST), + MENU_LABEL(NETPLAY_ENABLE_CLIENT), + MENU_LABEL(NETPLAY_DISCONNECT), + MENU_LABEL(NETPLAY_SETTINGS), MENU_ENUM_LABEL_RESET, MENU_ENUM_LABEL_SLOWMOTION, @@ -1008,18 +960,12 @@ enum msg_hash_enums MENU_ENUM_LABEL_CHEAT_TOGGLE, MENU_ENUM_LABEL_PAUSE_TOGGLE, - MENU_ENUM_LABEL_PAUSE_LIBRETRO, - MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO, + MENU_LABEL(PAUSE_LIBRETRO), MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND, - MENU_ENUM_LABEL_NO_ITEMS, - MENU_ENUM_LABEL_VALUE_NO_ITEMS, - - MENU_ENUM_LABEL_NO_PLAYLISTS, - MENU_ENUM_LABEL_VALUE_NO_PLAYLISTS, - - MENU_ENUM_LABEL_NO_SHADER_PARAMETERS, + MENU_LABEL(NO_ITEMS), + MENU_LABEL(NO_PLAYLISTS), MSG_INTERFACE, MSG_MEMORY, @@ -1034,31 +980,17 @@ enum msg_hash_enums MENU_LABEL(SHADER_OPTIONS), MENU_LABEL(USE_THIS_DIRECTORY), MENU_LABEL(CORE_OPTIONS), - - MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS, - - MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE, - MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE, - - MENU_ENUM_LABEL_NO_CORES_AVAILABLE, - MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE, + MENU_LABEL(NO_SHADER_PARAMETERS), + MENU_LABEL(NO_CORE_INFORMATION_AVAILABLE), + MENU_LABEL(NO_CORES_AVAILABLE), /* Audio */ MENU_LABEL(AUDIO_ENABLE), MENU_LABEL(AUDIO_MAX_TIMING_SKEW), - - MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE, - MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE, - - MENU_ENUM_LABEL_AUDIO_DEVICE, - MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE, - - MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES, - MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES, - - MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN, - MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN, - + MENU_LABEL(AUDIO_OUTPUT_RATE), + MENU_LABEL(AUDIO_DEVICE), + MENU_LABEL(AUDIO_BLOCK_FRAMES), + MENU_LABEL(AUDIO_DSP_PLUGIN), MENU_LABEL(AUDIO_MUTE), MENU_LABEL(AUDIO_SYNC), MENU_LABEL(AUDIO_VOLUME), @@ -1117,14 +1049,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_SCREEN_RESOLUTION, MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, - MENU_ENUM_LABEL_TITLE_COLOR, - MENU_ENUM_LABEL_VALUE_TITLE_COLOR, - MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE, - MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD, - MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX, - MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX, - MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE, - MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD, + MENU_LABEL(TITLE_COLOR), + MENU_LABEL(SAVESTATE_AUTO_INDEX), + MENU_LABEL(SAVESTATE_AUTO_SAVE), + MENU_LABEL(SAVESTATE_AUTO_LOAD), MENU_LABEL(SUSPEND_SCREENSAVER_ENABLE), @@ -1132,7 +1060,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE, MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE, MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE, - MENU_ENUM_LABEL_XMB_SCALE_FACTOR, MENU_ENUM_LABEL_VOLUME_UP, MENU_ENUM_LABEL_VOLUME_DOWN, @@ -1162,72 +1089,41 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE, MENU_ENUM_LABEL_NETPLAY_IP_ADDRESS, MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS, - MENU_ENUM_LABEL_NETPLAY_MODE, - MENU_ENUM_LABEL_VALUE_NETPLAY_MODE, - MENU_ENUM_LABEL_PERFCNT_ENABLE, - MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE, - MENU_ENUM_LABEL_OVERLAY_SCALE, - MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE, - MENU_ENUM_LABEL_KEYBOARD_OVERLAY_PRESET, - MENU_ENUM_LABEL_VALUE_KEYBOARD_OVERLAY_PRESET, - MENU_ENUM_LABEL_OVERLAY_PRESET, - MENU_ENUM_LABEL_VALUE_OVERLAY_PRESET, - MENU_ENUM_LABEL_OVERLAY_OPACITY, - MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY, + MENU_LABEL(NETPLAY_MODE), + MENU_LABEL(PERFCNT_ENABLE), + MENU_LABEL(OVERLAY_SCALE), + MENU_LABEL(KEYBOARD_OVERLAY_PRESET), + MENU_LABEL(OVERLAY_PRESET), + MENU_LABEL(OVERLAY_OPACITY), - MENU_ENUM_LABEL_MENU_ENUM_WALLPAPER, - MENU_ENUM_LABEL_VALUE_MENU_ENUM_WALLPAPER, + MENU_LABEL(FASTFORWARD_RATIO), + MENU_LABEL(REWIND_ENABLE), - MENU_ENUM_LABEL_FASTFORWARD_RATIO, - MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO, - - - MENU_ENUM_LABEL_REWIND_ENABLE, - MENU_ENUM_LABEL_VALUE_REWIND_ENABLE, MENU_ENUM_LABEL_ENABLE_HOTKEY, MENU_ENUM_LABEL_DISK_EJECT_TOGGLE, MENU_ENUM_LABEL_DISK_NEXT, MENU_ENUM_LABEL_GRAB_MOUSE_TOGGLE, - MENU_ENUM_LABEL_MENU_ENUM_TOGGLE, - MENU_ENUM_LABEL_STATE_SLOT_DECREASE, - MENU_ENUM_LABEL_STATE_SLOT_INCREASE, - - MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL, - MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL, - - MENU_ENUM_LABEL_AUTOSAVE_INTERVAL, - MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL, + MENU_LABEL(STATE_SLOT_DECREASE), + MENU_LABEL(STATE_SLOT_INCREASE), + MENU_LABEL(LIBRETRO_LOG_LEVEL), + MENU_LABEL(AUTOSAVE_INTERVAL), MENU_LABEL(CONFIG_SAVE_ON_EXIT), - - MENU_ENUM_LABEL_CONFIRM_ON_EXIT, - MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - + MENU_LABEL(CONFIRM_ON_EXIT), MENU_LABEL(SHOW_HIDDEN_FILES), /* Driver settings */ - MENU_ENUM_LABEL_AUDIO_DRIVER, - MENU_ENUM_LABEL_JOYPAD_DRIVER, - MENU_ENUM_LABEL_MENU_DRIVER, - MENU_ENUM_LABEL_LOCATION_DRIVER, - MENU_ENUM_LABEL_CAMERA_DRIVER, - MENU_ENUM_LABEL_WIFI_DRIVER, - MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER, - MENU_ENUM_LABEL_RECORD_DRIVER, - MENU_ENUM_LABEL_VIDEO_DRIVER, - MENU_ENUM_LABEL_INPUT_DRIVER, - - MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER, - MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER, - MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER, - MENU_ENUM_LABEL_VALUE_INPUT_DRIVER, - MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER, - MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER, - MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER, - MENU_ENUM_LABEL_VALUE_WIFI_DRIVER, - MENU_ENUM_LABEL_VALUE_RECORD_DRIVER, - MENU_ENUM_LABEL_VALUE_MENU_DRIVER, + MENU_LABEL(AUDIO_DRIVER), + MENU_LABEL(JOYPAD_DRIVER), + MENU_LABEL(MENU_DRIVER), + MENU_LABEL(LOCATION_DRIVER), + MENU_LABEL(CAMERA_DRIVER), + MENU_LABEL(WIFI_DRIVER), + MENU_LABEL(AUDIO_RESAMPLER_DRIVER), + MENU_LABEL(RECORD_DRIVER), + MENU_LABEL(VIDEO_DRIVER), + MENU_LABEL(INPUT_DRIVER), MENU_ENUM_LABEL_VIDEO_DRIVER_GL, MENU_ENUM_LABEL_VIDEO_DRIVER_SDL2, @@ -1237,23 +1133,17 @@ enum msg_hash_enums MENU_ENUM_LABEL_VIDEO_DRIVER_SUNXI, MENU_ENUM_LABEL_VIDEO_DRIVER_DRM, - MENU_ENUM_LABEL_MENU_ENUM_DRIVER, - MENU_ENUM_LABEL_VALUE_MENU_ENUM_DRIVER, + MENU_LABEL(MENU_ENUM_DRIVER), MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC, MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC, - MENU_ENUM_LABEL_SAVEFILE_DIRECTORY, - MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY, - MENU_ENUM_LABEL_SAVESTATE_DIRECTORY, - MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY, - MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY, - MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY, - MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY, - MENU_ENUM_LABEL_VALUE_THUMBNAILS_DIRECTORY, + MENU_LABEL(SAVEFILE_DIRECTORY), + MENU_LABEL(SAVESTATE_DIRECTORY), + MENU_LABEL(DYNAMIC_WALLPAPERS_DIRECTORY), + MENU_LABEL(THUMBNAILS_DIRECTORY), - MENU_ENUM_LABEL_SLOWMOTION_RATIO, - MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO, + MENU_LABEL(SLOWMOTION_RATIO), MENU_ENUM_LABEL_TURBO, @@ -1328,8 +1218,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MD5, MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CRC32, - MENU_ENUM_LABEL_NO_PLAYLIST_ENTRIES_AVAILABLE, - MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE, + MENU_LABEL(NO_PLAYLIST_ENTRIES_AVAILABLE), MENU_ENUM_LABEL_VIDEO_SHADER_DEFAULT_FILTER, MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS, @@ -1387,17 +1276,13 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_RETROPAD_WITH_ANALOG, MENU_ENUM_LABEL_VALUE_RETROKEYBOARD, - MENU_ENUM_LABEL_SYSTEM_BGM_ENABLE, - MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE, + MENU_LABEL(SYSTEM_BGM_ENABLE), - MENU_ENUM_LABEL_NETWORK_CMD_ENABLE, - MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE, - MENU_ENUM_LABEL_NETWORK_CMD_PORT, - MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT, - MENU_ENUM_LABEL_STDIN_CMD_ENABLE, - MENU_ENUM_LABEL_NETWORK_REMOTE_ENABLE, - MENU_ENUM_LABEL_NETWORK_REMOTE_PORT, - MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT, + MENU_LABEL(NETWORK_CMD_ENABLE), + MENU_LABEL(NETWORK_CMD_PORT), + MENU_LABEL(STDIN_CMD_ENABLE), + MENU_LABEL(NETWORK_REMOTE_ENABLE), + MENU_LABEL(NETWORK_REMOTE_PORT), MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE, @@ -1405,34 +1290,20 @@ enum msg_hash_enums MENU_LABEL(DUMMY_ON_CORE_SHUTDOWN), - MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE, - MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE, - MENU_ENUM_LABEL_DETECT_CORE_LIST, - MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST, MENU_ENUM_LABEL_DETECT_CORE_LIST_OK, - MENU_ENUM_LABEL_START_CORE, - MENU_ENUM_LABEL_VALUE_START_CORE, - MENU_ENUM_LABEL_LOAD_CONTENT, - MENU_ENUM_LABEL_VALUE_LOAD_CONTENT, - MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST, - MENU_ENUM_LABEL_CORE_UPDATER_LIST, - MENU_ENUM_LABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE, - MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE, - MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL, - MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL, - MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL, - MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL, - MENU_ENUM_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE, - MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE, - MENU_ENUM_LABEL_CLOSE_CONTENT, - MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT, - MENU_ENUM_LABEL_QUIT_RETROARCH, - MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH, - MENU_ENUM_LABEL_SHUTDOWN, - MENU_ENUM_LABEL_VALUE_SHUTDOWN, - MENU_ENUM_LABEL_REBOOT, - MENU_ENUM_LABEL_VALUE_REBOOT, - MENU_ENUM_LABEL_DISK_IMAGE_APPEND, + MENU_LABEL(DETECT_CORE_LIST), + MENU_LABEL(START_CORE), + MENU_LABEL(LOAD_CONTENT), + MENU_LABEL(CORE_UPDATER_LIST), + MENU_LABEL(CORE_UPDATER_AUTO_EXTRACT_ARCHIVE), + MENU_LABEL(CORE_UPDATER_BUILDBOT_URL), + MENU_LABEL(BUILDBOT_ASSETS_URL), + MENU_LABEL(CORE_SET_SUPPORTS_NO_CONTENT_ENABLE), + MENU_LABEL(CLOSE_CONTENT), + MENU_LABEL(QUIT_RETROARCH), + MENU_LABEL(SHUTDOWN), + MENU_LABEL(REBOOT), + MENU_LABEL(DISK_IMAGE_APPEND), MENU_LABEL(CORE_LIST), MENU_LABEL(MANAGEMENT), MENU_LABEL(ONLINE), @@ -1461,7 +1332,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE, MENU_ENUM_LABEL_VALUE_DISK_INDEX, - MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, MENU_ENUM_LABEL_DISK_INDEX, MENU_LABEL(CORE_CHEAT_OPTIONS), @@ -1536,21 +1406,12 @@ enum msg_hash_enums MENU_LABEL(PLAYLIST_SETTINGS), - MENU_ENUM_LABEL_CORE_UPDATER_SETTINGS, - MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS, - MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, - MENU_ENUM_LABEL_LAKKA_SERVICES, - MENU_ENUM_LABEL_ARCHIVE_SETTINGS, - MENU_ENUM_LABEL_SHADER_APPLY_CHANGES, - MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES, - MENU_ENUM_LABEL_SAVE_NEW_CONFIG, - MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG, - + MENU_LABEL(CORE_UPDATER_SETTINGS), + MENU_LABEL(LAKKA_SERVICES), + MENU_LABEL(SHADER_APPLY_CHANGES), + MENU_LABEL(SAVE_NEW_CONFIG), MENU_LABEL(ONSCREEN_DISPLAY_SETTINGS), - - MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS, - MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS, - + MENU_LABEL(ONSCREEN_OVERLAY_SETTINGS), MENU_LABEL(CHEAT_APPLY_CHANGES), MENU_ENUM_LABEL_COLLECTION,