This commit is contained in:
twinaphex 2016-11-22 13:29:27 +01:00
parent b2ce67421b
commit c2f2695666
1 changed files with 60 additions and 141 deletions

View File

@ -343,16 +343,15 @@ enum msg_hash_enums
MSG_NO_CONTENT_STARTING_DUMMY_CORE,
MENU_ENUM_LABEL_MENU_TOGGLE,
MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE,
MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE,
MENU_LABEL(NO_HISTORY_AVAILABLE),
MENU_ENUM_LABEL_VALUE_REMAP_FILE,
MENU_ENUM_LABEL_VALUE_CHEAT_FILE,
MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN,
MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END = MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN + RARCH_BIND_LIST_END,
MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY,
MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY,
MENU_LABEL(MENU_WALLPAPER_OPACITY),
MENU_ENUM_LABEL_VALUE_CONFIG,
MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET,
@ -382,10 +381,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON,
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOW,
MENU_ENUM_LABEL_MATERIALUI_MENU_HEADER_OPACITY,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_HEADER_OPACITY,
MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_FOOTER_OPACITY,
MENU_LABEL(MATERIALUI_MENU_HEADER_OPACITY),
MENU_LABEL(MATERIALUI_MENU_FOOTER_OPACITY),
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE_GREY,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED,
@ -398,10 +395,10 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,
MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY,
MENU_ENUM_LABEL_PLAYLIST_COLLECTION_ENTRY,
MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY,
MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY,
MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
MENU_LABEL(CHEEVOS_UNLOCKED_ENTRY),
MENU_LABEL(CHEEVOS_LOCKED_ENTRY),
MENU_ENUM_LABEL_SHADER_PARAMETERS_ENTRY,
MENU_ENUM_LABEL_RDB_ENTRY,
MENU_ENUM_LABEL_URL_ENTRY,
@ -410,10 +407,9 @@ enum msg_hash_enums
MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY,
MENU_ENUM_LABEL_CORE_INFO_ENTRY,
MENU_ENUM_LABEL_PLAYLIST_ENTRY,
MENU_ENUM_LABEL_START_VIDEO_PROCESSOR,
MENU_ENUM_LABEL_VALUE_START_VIDEO_PROCESSOR,
MENU_ENUM_LABEL_START_NET_RETROPAD,
MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
MENU_LABEL(START_VIDEO_PROCESSOR),
MENU_LABEL(START_NET_RETROPAD),
MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
@ -427,9 +423,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE_LAST = MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE + MAX_USERS,
MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE,
MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE_LAST = MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + MAX_USERS,
MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
MENU_ENUM_LABEL_INPUT_SETTINGS_BEGIN,
MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU,
MENU_LABEL(INPUT_HOTKEY_BINDS),
@ -437,8 +431,6 @@ enum msg_hash_enums
MENU_LABEL(INPUT_TURBO_PERIOD),
MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE,
MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE,
MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX,
MENU_ENUM_LABEL_INPUT_PLAYER2_JOYPAD_INDEX,
MENU_ENUM_LABEL_INPUT_PLAYER3_JOYPAD_INDEX,
@ -447,12 +439,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_INPUT_BIND_DEVICE_TYPE,
MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW,
MENU_ENUM_LABEL_INPUT_DRIVER_UDEV,
MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,
MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL,
MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE,
MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE,
MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH,
MENU_ENUM_LABEL_INPUT_ICADE_ENABLE,
MENU_ENUM_LABEL_INPUT_USER_1_BINDS,
MENU_ENUM_LABEL_INPUT_USER_2_BINDS,
MENU_ENUM_LABEL_INPUT_USER_3_BINDS,
@ -470,14 +456,10 @@ enum msg_hash_enums
MENU_ENUM_LABEL_INPUT_USER_15_BINDS,
MENU_ENUM_LABEL_INPUT_USER_16_BINDS,
MENU_ENUM_LABEL_INPUT_HOTKEY_SETTINGS,
MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE,
MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY,
MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY,
MENU_LABEL(INPUT_REMAPPING_DIRECTORY),
MENU_ENUM_LABEL_INPUT_BIND_MODE,
MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND,
MENU_ENUM_LABEL_INPUT_DESCRIPTOR_LABEL_SHOW,
MENU_ENUM_LABEL_INPUT_OVERLAY,
MENU_ENUM_LABEL_INPUT_OSK_OVERLAY,
@ -553,32 +535,24 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG,
MENU_LABEL(INPUT_MAX_USERS),
MENU_LABEL(INPUT_USER_BINDS),
MENU_LABEL(INPUT_DUTY_CYCLE),
MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE,
MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW,
MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND,
MENU_LABEL(INPUT_AUTODETECT_ENABLE),
MENU_LABEL(INPUT_DESCRIPTOR_LABEL_SHOW),
MENU_LABEL(INPUT_DESCRIPTOR_HIDE_UNBOUND),
MENU_LABEL(INPUT_AXIS_THRESHOLD),
MENU_LABEL(INPUT_BIND_TIMEOUT),
MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE,
MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL,
MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE,
MENU_LABEL(INPUT_REMAP_BINDS_ENABLE),
MENU_LABEL(MENU_INPUT_SWAP_OK_CANCEL),
MENU_LABEL(INPUT_OVERLAY_ENABLE),
MENU_LABEL(INPUT_OSK_OVERLAY_ENABLE),
MENU_LABEL(INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO),
MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE,
MENU_ENUM_LABEL_VALUE_INPUT_PREFER_FRONT_TOUCH,
MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE,
MENU_LABEL(INPUT_OVERLAY_HIDE_IN_MENU),
MENU_LABEL(INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE),
MENU_LABEL(INPUT_SMALL_KEYBOARD_ENABLE),
MENU_LABEL(INPUT_TOUCH_ENABLE),
MENU_LABEL(INPUT_PREFER_FRONT_TOUCH),
MENU_LABEL(INPUT_ICADE_ENABLE),
MENU_LABEL(INPUT_ALL_USERS_CONTROL_MENU),
MENU_LABEL(INPUT_POLL_TYPE_BEHAVIOR),
@ -615,7 +589,6 @@ enum msg_hash_enums
MENU_LABEL(VIDEO_SHARED_CONTEXT),
MENU_LABEL(VIDEO_THREADED),
MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
MENU_LABEL(VIDEO_SWAP_INTERVAL),
MENU_LABEL(VIDEO_FULLSCREEN),
@ -638,39 +611,17 @@ enum msg_hash_enums
MENU_LABEL(PAUSE_NONACTIVE),
MENU_LABEL(MOUSE_ENABLE),
MENU_LABEL(POINTER_ENABLE),
MENU_ENUM_LABEL_MENU_LINEAR_FILTER,
MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER,
MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND,
MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS,
MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
MENU_ENUM_LABEL_THREADED_DATA_RUNLOOP_ENABLE,
MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
MENU_ENUM_LABEL_ENTRY_NORMAL_COLOR,
MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
MENU_ENUM_LABEL_ENTRY_HOVER_COLOR,
MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
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_LABEL(MENU_LINEAR_FILTER),
MENU_LABEL(NAVIGATION_WRAPAROUND),
MENU_LABEL(SHOW_ADVANCED_SETTINGS),
MENU_LABEL(THREADED_DATA_RUNLOOP_ENABLE),
MENU_LABEL(ENTRY_NORMAL_COLOR),
MENU_LABEL(ENTRY_HOVER_COLOR),
MENU_LABEL(XMB_ALPHA_FACTOR),
MENU_LABEL(XMB_SCALE_FACTOR),
MENU_LABEL(XMB_FONT),
MENU_LABEL(XMB_THEME),
MENU_LABEL(XMB_MENU_COLOR_THEME),
MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE,
MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
@ -731,8 +682,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_FILE_BROWSER_MUSIC_OPEN,
/* Menu file browser */
MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
MENU_LABEL(NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE),
/* Playlists */
MENU_LABEL(HISTORY_LIST_ENABLE),
@ -796,28 +746,14 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS,
MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD,
MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME,
MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME,
MENU_LABEL(ACCOUNTS_CHEEVOS_USERNAME),
MENU_LABEL(CHEEVOS_HARDCORE_MODE_ENABLE),
MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL,
MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
MENU_ENUM_LABEL_CHEEVOS_ENABLE,
MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION,
MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION,
MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
MENU_ENUM_LABEL_CHEEVOS_LOCKED_ACHIEVEMENTS,
MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS,
MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS,
MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS,
MENU_LABEL(CHEEVOS_TEST_UNOFFICIAL),
MENU_LABEL(CHEEVOS_ENABLE),
MENU_LABEL(CHEEVOS_DESCRIPTION),
MENU_LABEL(CHEEVOS_UNLOCKED_ACHIEVEMENTS),
MENU_LABEL(CHEEVOS_LOCKED_ACHIEVEMENTS),
MENU_LABEL(ACCOUNTS_RETRO_ACHIEVEMENTS),
MENU_ENUM_LABEL_ACCOUNTS_LIST,
MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST,
@ -996,15 +932,11 @@ enum msg_hash_enums
MENU_LABEL(AUDIO_VOLUME),
MENU_LABEL(AUDIO_RATE_CONTROL_DELTA),
MENU_LABEL(AUDIO_LATENCY),
MENU_LABEL(SAVE_STATE),
MENU_LABEL(LOAD_STATE),
MENU_LABEL(UNDO_LOAD_STATE),
MENU_LABEL(UNDO_SAVE_STATE),
MENU_ENUM_LABEL_SAVE_STATE,
MENU_ENUM_LABEL_VALUE_LOAD_STATE,
MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE,
MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE,
MENU_ENUM_LABEL_VALUE_SAVE_STATE,
MENU_ENUM_LABEL_LOAD_STATE,
MENU_ENUM_LABEL_UNDO_LOAD_STATE,
MENU_ENUM_LABEL_UNDO_SAVE_STATE,
MENU_ENUM_LABEL_REWIND,
MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS,
MENU_ENUM_LABEL_CHEAT_INDEX_MINUS,
@ -1319,21 +1251,12 @@ enum msg_hash_enums
MENU_LABEL(ACHIEVEMENT_LIST_HARDCORE),
MENU_LABEL(CORE_INFORMATION),
MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS,
MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS,
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS,
MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS,
MENU_ENUM_LABEL_DISK_OPTIONS,
MENU_ENUM_LABEL_VALUE_DISK_OPTIONS,
MENU_ENUM_LABEL_DISK_CYCLE_TRAY_STATUS,
MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS,
MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE,
MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE,
MENU_ENUM_LABEL_VALUE_DISK_INDEX,
MENU_ENUM_LABEL_DISK_INDEX,
MENU_LABEL(VIDEO_SHADER_PARAMETERS),
MENU_LABEL(VIDEO_SHADER_PRESET_PARAMETERS),
MENU_LABEL(DISK_OPTIONS),
MENU_LABEL(DISK_CYCLE_TRAY_STATUS),
MENU_LABEL(NO_CORE_OPTIONS_AVAILABLE),
MENU_LABEL(DISK_INDEX),
MENU_LABEL(CORE_CHEAT_OPTIONS),
MENU_LABEL(CORE_INPUT_REMAPPING_OPTIONS),
@ -1351,21 +1274,17 @@ enum msg_hash_enums
MENU_ENUM_LABEL_MESSAGE,
MENU_ENUM_LABEL_INFO_SCREEN,
MENU_ENUM_LABEL_CUSTOM_RATIO,
MENU_ENUM_LABEL_VALUE_CUSTOM_RATIO,
MENU_ENUM_LABEL_HELP,
MENU_ENUM_LABEL_VALUE_HELP,
MENU_ENUM_LABEL_CHEAT_DATABASE_PATH,
MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
MENU_LABEL(CUSTOM_RATIO),
MENU_LABEL(HELP),
MENU_LABEL(CHEAT_DATABASE_PATH),
MENU_LABEL(CURSOR_DIRECTORY),
MENU_LABEL(OSK_OVERLAY_DIRECTORY),
MENU_LABEL(RECORDING_OUTPUT_DIRECTORY),
MENU_LABEL(RECORDING_CONFIG_DIRECTORY),
MENU_LABEL(VIDEO_FILTER),
MENU_LABEL(PAL60_ENABLE),
MENU_ENUM_LABEL_VIDEO_FILTER,
MENU_ENUM_LABEL_PAL60_ENABLE,
MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
MENU_ENUM_LABEL_CONTENT_HISTORY_PATH,
MENU_LABEL(RGUI_BROWSER_DIRECTORY),