diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 4275de0006..dbb4171e2c 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -94,6 +94,28 @@ enum menu_hash_enums MENU_ENUM_LABEL_INPUT_OVERLAY, MENU_ENUM_LABEL_INPUT_OSK_OVERLAY, + MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS, + MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, + MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE, + MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW, + MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND, + MENU_ENUM_LABEL_VALUE_INPUT_BIND_MODE, + MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS, + MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE, + MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD, + MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD, + MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE, + MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE, + MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS, + MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE, + MENU_ENUM_LABEL_VALUE_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_POLL_TYPE_BEHAVIOR, + MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_TOGGLE_ENABLE, + MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE, + MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE, + /* Video */ MENU_ENUM_LABEL_VIDEO_FONT_ENABLE, MENU_ENUM_LABEL_VIDEO_FONT_PATH, @@ -129,6 +151,31 @@ enum menu_hash_enums MENU_ENUM_LABEL_VIDEO_GAMMA, MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE, + MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH, + MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS, + MENU_ENUM_LABEL_VALUE_VIDEO_FILTER, + MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE, + MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH, + MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE, + MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X, + MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y, + MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER, + MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, + MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION, + MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES, + MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY, + MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION, + MENU_ENUM_LABEL_VALUE_VIDEO_THREADED, + MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC, + MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC, + MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL, + MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT, + MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN, + MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT, + MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO, + MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX, + MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER, + MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD, MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA, MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE, MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT, @@ -145,6 +192,7 @@ enum menu_hash_enums 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, @@ -155,7 +203,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_RUN, - MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD, /* Menu settings */ MENU_ENUM_LABEL_MENU_WALLPAPER, @@ -205,7 +252,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT, MENU_ENUM_LABEL_UI_MENUBAR_ENABLE, - MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION, MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE, MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT, MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE, @@ -252,7 +298,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT, MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD, - MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_TOGGLE_ENABLE, MENU_ENUM_LABEL_MENU_SETTINGS, MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, @@ -267,7 +312,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_MENU_ENUM_THROTTLE_FRAMERATE, MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE, - MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR, MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT, @@ -284,7 +328,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_CHEEVOS_ENABLE, - MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE, MENU_ENUM_LABEL_CHEEVOS_DESCRIPTION, @@ -384,11 +427,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST, MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_LIST, - MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE, - - MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, - - MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU, MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST, MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST, @@ -467,23 +505,12 @@ enum menu_hash_enums MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS, MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS, - MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE, - MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH, - MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE, - MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X, - MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y, - - MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS, MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, MENU_ENUM_LABEL_FRAME_THROTTLE_ENABLE, MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE, - MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER, - - MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, - MENU_ENUM_LABEL_CORE_ENABLE, MENU_ENUM_LABEL_VALUE_CORE_ENABLE, @@ -575,11 +602,8 @@ enum menu_hash_enums MENU_ENUM_LABEL_R_X_MINUS, MENU_ENUM_LABEL_R_Y_MINUS, MENU_ENUM_LABEL_R_Y_PLUS, - MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL, - MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT, MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE, MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE, - MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN, MENU_ENUM_LABEL_CORE_SPECIFIC_CONFIG, MENU_ENUM_LABEL_VALUE_CORE_SPECIFIC_CONFIG, MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS, @@ -592,22 +616,15 @@ enum menu_hash_enums MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE, MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN, MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN, - MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION, - MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES, - MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY, MENU_ENUM_LABEL_SCREENSHOT, MENU_ENUM_LABEL_REWIND_GRANULARITY, MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY, - MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION, - MENU_ENUM_LABEL_VALUE_VIDEO_THREADED, MENU_ENUM_LABEL_VALUE_RUN, 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_VALUE_VIDEO_VSYNC, - MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC, MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE, MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD, MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX, @@ -667,8 +684,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_FASTFORWARD_RATIO, MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO, - MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE, - MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE, MENU_ENUM_LABEL_REWIND_ENABLE, @@ -736,10 +751,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_SLOWMOTION_RATIO, MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO, - MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS, - MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE, - MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD, - MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD, MENU_ENUM_LABEL_TURBO, @@ -875,11 +886,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE, - MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW, - - MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND, - - MENU_ENUM_LABEL_VALUE_INPUT_BIND_MODE, MENU_ENUM_LABEL_NETWORK_CMD_ENABLE, MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE, @@ -951,7 +957,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_VALUE_DISK_OPTIONS, MENU_ENUM_LABEL_CORE_OPTIONS, MENU_ENUM_LABEL_DISK_CYCLE_TRAY_STATUS, - MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE, MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, MENU_ENUM_LABEL_NO_CORE_OPTIONS_AVAILABLE, @@ -994,7 +999,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY, MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY, MENU_ENUM_LABEL_VIDEO_FILTER, - MENU_ENUM_LABEL_VALUE_VIDEO_FILTER, MENU_ENUM_LABEL_PAL60_ENABLE, MENU_ENUM_LABEL_VALUE_PAL60_ENABLE, MENU_ENUM_LABEL_CONTENT_HISTORY_PATH, @@ -1030,13 +1034,11 @@ enum menu_hash_enums MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY, MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR, MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, - MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, MENU_ENUM_LABEL_DRIVER_SETTINGS, MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS, MENU_ENUM_LABEL_VIDEO_SETTINGS, - MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS, MENU_ENUM_LABEL_AUDIO_SETTINGS, MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS, @@ -1114,22 +1116,16 @@ enum menu_hash_enums MENU_ENUM_LABEL_NETPLAY_NICKNAME, MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME, MENU_ENUM_LABEL_VIDEO_VI_WIDTH, - MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH, MENU_ENUM_LABEL_VIDEO_FORCE_ASPECT, - MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT, MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_AUTO, - MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO, MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX, - MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX, MENU_ENUM_LABEL_VIDEO_VFILTER, - MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER, MENU_ENUM_LABEL_VIDEO_GPU_RECORD, - MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD, MENU_ENUM_LABEL_RECORD_USE_OUTPUT_DIRECTORY, MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY, @@ -1256,7 +1252,6 @@ enum menu_hash_enums MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE, - MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS, MENU_ENUM_LABEL_USE_BUILTIN_IMAGE_VIEWER, MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER, @@ -1289,10 +1284,9 @@ enum menu_hash_enums MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG, MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG, - MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE, - - MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE, + /* Callback strings */ + MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD, MENU_ENUM_LABEL_CB_CORE_THUMBNAILS_DOWNLOAD };