Skip to content

Commit 5798c79

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate a batch of extended-row tables to single-source def files
The Ozone appearance, general input, and haptics and sensors groups, together with the canonical label rows their enum-driven tokens were missing. Each table individually performed and gated by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage; the batch is squashed for review convenience.
1 parent 81a263b commit 5798c79

10 files changed

Lines changed: 1329 additions & 658 deletions

‎configuration.c‎

Lines changed: 25 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,9 +1859,6 @@ static struct config_bool_setting *populate_settings_bool(
18591859
SETTING_BOOL("savefiles_in_content_dir", &settings->bools.savefiles_in_content_dir, true, DEFAULT_SAVEFILES_IN_CONTENT_DIR, false);
18601860
SETTING_BOOL("systemfiles_in_content_dir", &settings->bools.systemfiles_in_content_dir, true, DEFAULT_SYSTEMFILES_IN_CONTENT_DIR, false);
18611861
SETTING_BOOL("screenshots_in_content_dir", &settings->bools.screenshots_in_content_dir, true, DEFAULT_SCREENSHOTS_IN_CONTENT_DIR, false);
1862-
SETTING_BOOL("confirm_quit", &settings->bools.confirm_quit, true, DEFAULT_CONFIRM_QUIT, false);
1863-
SETTING_BOOL("confirm_close", &settings->bools.confirm_close, true, DEFAULT_CONFIRM_CLOSE, false);
1864-
SETTING_BOOL("confirm_reset", &settings->bools.confirm_reset, true, DEFAULT_CONFIRM_RESET, false);
18651862
SETTING_BOOL("config_save_on_exit", &settings->bools.config_save_on_exit, true, DEFAULT_CONFIG_SAVE_ON_EXIT, false);
18661863
SETTING_BOOL("config_save_minimal", &settings->bools.config_save_minimal, true, DEFAULT_CONFIG_SAVE_MINIMAL, false);
18671864
SETTING_BOOL("remap_save_on_exit", &settings->bools.remap_save_on_exit, true, DEFAULT_REMAP_SAVE_ON_EXIT, false);
@@ -1961,6 +1958,11 @@ static struct config_bool_setting *populate_settings_bool(
19611958
#include "settings/settings_def_video_fullscreen.h"
19621959
#define SETTINGS_DEF_CONFIG_PASS
19631960
#include "settings/settings_def_video_sync.h"
1961+
#include "settings/settings_def_input_haptics.h"
1962+
#include "settings/settings_def_input_general.h"
1963+
#ifdef HAVE_MENU
1964+
#include "settings/settings_def_ozone_appearance.h"
1965+
#endif
19641966
#ifdef HAVE_MENU
19651967
#ifdef HAVE_XMB
19661968
#include "settings/settings_def_rgui_appearance.h"
@@ -2376,21 +2378,6 @@ static struct config_bool_setting *populate_settings_bool(
23762378

23772379

23782380

2379-
SETTING_BOOL("content_show_favorites", &settings->bools.menu_content_show_favorites, true, DEFAULT_CONTENT_SHOW_FAVORITES, false);
2380-
SETTING_BOOL("content_show_favorites_first", &settings->bools.menu_content_show_favorites_first, true, DEFAULT_CONTENT_SHOW_FAVORITES_FIRST, false);
2381-
#ifdef HAVE_IMAGEVIEWER
2382-
SETTING_BOOL("content_show_images", &settings->bools.menu_content_show_images, true, DEFAULT_CONTENT_SHOW_IMAGES, false);
2383-
#endif
2384-
SETTING_BOOL("content_show_music", &settings->bools.menu_content_show_music, true, DEFAULT_CONTENT_SHOW_MUSIC, false);
2385-
#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
2386-
SETTING_BOOL("content_show_video", &settings->bools.menu_content_show_video, true, DEFAULT_CONTENT_SHOW_VIDEO, false);
2387-
#endif
2388-
SETTING_BOOL("content_show_history", &settings->bools.menu_content_show_history, true, DEFAULT_CONTENT_SHOW_HISTORY, false);
2389-
SETTING_BOOL("content_show_playlists", &settings->bools.menu_content_show_playlists, true, DEFAULT_CONTENT_SHOW_PLAYLISTS, false);
2390-
SETTING_BOOL("content_show_playlist_tabs", &settings->bools.menu_content_show_playlist_tabs, true, DEFAULT_CONTENT_SHOW_PLAYLIST_TABS, false);
2391-
#if defined(HAVE_LIBRETRODB)
2392-
SETTING_BOOL("content_show_explore", &settings->bools.menu_content_show_explore, true, DEFAULT_MENU_CONTENT_SHOW_EXPLORE, false);
2393-
#endif
23942381
#ifdef HAVE_CDROM
23952382
#endif /* HAVE_CDROM */
23962383

@@ -2462,23 +2449,13 @@ static struct config_bool_setting *populate_settings_bool(
24622449
SETTING_BOOL("small_keyboard_enable", &settings->bools.input_small_keyboard_enable, true, false, false);
24632450
#endif
24642451
SETTING_BOOL("keyboard_gamepad_enable", &settings->bools.input_keyboard_gamepad_enable, true, DEFAULT_INPUT_KEYBOARD_GAMEPAD_ENABLE, false);
2465-
SETTING_BOOL("input_autodetect_enable", &settings->bools.input_autodetect_enable, true, DEFAULT_INPUT_AUTODETECT_ENABLE, false);
24662452
SETTING_BOOL("input_turbo_enable", &settings->bools.input_turbo_enable, true, DEFAULT_TURBO_ENABLE, false);
24672453
SETTING_BOOL("input_turbo_allow_dpad", &settings->bools.input_turbo_allow_dpad, true, DEFAULT_TURBO_ALLOW_DPAD, false);
2468-
SETTING_BOOL("input_remap_binds_enable", &settings->bools.input_remap_binds_enable, true, true, false);
2469-
SETTING_BOOL("input_remap_sort_by_controller_enable", &settings->bools.input_remap_sort_by_controller_enable, true, false, false);
2470-
SETTING_BOOL("input_hotkey_device_merge", &settings->bools.input_hotkey_device_merge, true, DEFAULT_INPUT_HOTKEY_DEVICE_MERGE, false);
2471-
SETTING_BOOL("input_hotkey_follows_player1", &settings->bools.input_hotkey_follows_player1, true, DEFAULT_INPUT_HOTKEY_FOLLOWS_PLAYER1, false);
24722454
#ifdef HAVE_MENU
2473-
SETTING_BOOL("all_users_control_menu", &settings->bools.input_all_users_control_menu, true, DEFAULT_ALL_USERS_CONTROL_MENU, false);
24742455
SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->bools.input_menu_swap_ok_cancel_buttons, true, DEFAULT_MENU_SWAP_OK_CANCEL_BUTTONS, false);
24752456
SETTING_BOOL("menu_swap_scroll_buttons", &settings->bools.input_menu_swap_scroll_buttons, true, DEFAULT_MENU_SWAP_SCROLL_BUTTONS, false);
2476-
SETTING_BOOL("menu_singleclick_playlists", &settings->bools.input_menu_singleclick_playlists, true, DEFAULT_MENU_SINGLECLICK_PLAYLISTS, false);
2477-
SETTING_BOOL("menu_allow_tabs_back", &settings->bools.input_menu_allow_tabs_back, true, DEFAULT_MENU_ALLOW_TABS_BACK, false);
24782457
#endif
24792458
SETTING_BOOL("input_sensors_enable", &settings->bools.input_sensors_enable, true, DEFAULT_INPUT_SENSORS_ENABLE, false);
2480-
SETTING_BOOL("vibrate_on_keypress", &settings->bools.vibrate_on_keypress, true, DEFAULT_VIBRATE_ON_KEYPRESS, false);
2481-
SETTING_BOOL("enable_device_vibration", &settings->bools.enable_device_vibration, true, DEFAULT_ENABLE_DEVICE_VIBRATION, false);
24822459

24832460
SETTING_BOOL("content_runtime_log", &settings->bools.content_runtime_log, true, DEFAULT_CONTENT_RUNTIME_LOG, false);
24842461
SETTING_BOOL("content_runtime_log_aggregate", &settings->bools.content_runtime_log_aggregate, true, DEFAULT_CONTENT_RUNTIME_LOG_AGGREGATE, false);
@@ -2595,6 +2572,11 @@ static struct config_float_setting *populate_settings_float(
25952572
#include "settings/settings_def_video_fullscreen.h"
25962573
#define SETTINGS_DEF_CONFIG_PASS
25972574
#include "settings/settings_def_video_sync.h"
2575+
#include "settings/settings_def_input_haptics.h"
2576+
#include "settings/settings_def_input_general.h"
2577+
#ifdef HAVE_MENU
2578+
#include "settings/settings_def_ozone_appearance.h"
2579+
#endif
25982580
#ifdef HAVE_MENU
25992581
#ifdef HAVE_XMB
26002582
#include "settings/settings_def_rgui_appearance.h"
@@ -3063,11 +3045,6 @@ static struct config_uint_setting *populate_settings_uint(
30633045
SETTING_UINT("replay_checkpoint_interval", &settings->uints.replay_checkpoint_interval, true, DEFAULT_REPLAY_CHECKPOINT_INTERVAL, false);
30643046
SETTING_UINT("savestate_max_keep", &settings->uints.savestate_max_keep, true, DEFAULT_SAVESTATE_MAX_KEEP, false);
30653047
#ifdef HAVE_MENU
3066-
SETTING_UINT("content_show_add_entry", &settings->uints.menu_content_show_add_entry, true, DEFAULT_MENU_CONTENT_SHOW_ADD_ENTRY, false);
3067-
SETTING_UINT("content_show_contentless_cores",&settings->uints.menu_content_show_contentless_cores, true, DEFAULT_MENU_CONTENT_SHOW_CONTENTLESS_CORES, false);
3068-
#ifdef HAVE_NETWORKING
3069-
SETTING_UINT("content_show_netplay", &settings->uints.menu_content_show_netplay, true, DEFAULT_CONTENT_SHOW_NETPLAY, false);
3070-
#endif
30713048
SETTING_UINT("content_history_size", &settings->uints.content_history_size, true, DEFAULT_CONTENT_HISTORY_SIZE, false);
30723049
SETTING_UINT("playlist_entry_remove_enable", &settings->uints.playlist_entry_remove_enable, true, DEFAULT_PLAYLIST_ENTRY_REMOVE_ENABLE, false);
30733050
SETTING_UINT("menu_thumbnails", &settings->uints.gfx_thumbnails, true, DEFAULT_GFX_THUMBNAILS_DEFAULT, false);
@@ -3178,6 +3155,11 @@ static struct config_uint_setting *populate_settings_uint(
31783155
#include "settings/settings_def_video_fullscreen.h"
31793156
#define SETTINGS_DEF_CONFIG_PASS
31803157
#include "settings/settings_def_video_sync.h"
3158+
#include "settings/settings_def_input_haptics.h"
3159+
#include "settings/settings_def_input_general.h"
3160+
#ifdef HAVE_MENU
3161+
#include "settings/settings_def_ozone_appearance.h"
3162+
#endif
31813163
#ifdef HAVE_MENU
31823164
#ifdef HAVE_XMB
31833165
#include "settings/settings_def_rgui_appearance.h"
@@ -3563,12 +3545,6 @@ static struct config_uint_setting *populate_settings_uint(
35633545
SETTING_UINT("input_turbo_duty_cycle", &settings->uints.input_turbo_duty_cycle, true, DEFAULT_TURBO_DUTY_CYCLE, false);
35643546
SETTING_UINT("input_turbo_mode", &settings->uints.input_turbo_mode, true, DEFAULT_TURBO_MODE, false);
35653547
SETTING_UINT("input_turbo_button", &settings->uints.input_turbo_button, true, DEFAULT_TURBO_BUTTON, false);
3566-
SETTING_UINT("input_max_users", &settings->uints.input_max_users, true, DEFAULT_INPUT_MAX_USERS, false);
3567-
SETTING_UINT("input_menu_toggle_gamepad_combo", &settings->uints.input_menu_toggle_gamepad_combo, true, DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO, false);
3568-
SETTING_UINT("input_poll_type_behavior", &settings->uints.input_poll_type_behavior, true, DEFAULT_INPUT_POLL_TYPE_BEHAVIOR, false);
3569-
SETTING_UINT("input_quit_gamepad_combo", &settings->uints.input_quit_gamepad_combo, true, DEFAULT_QUIT_GAMEPAD_COMBO, false);
3570-
SETTING_UINT("input_hotkey_block_delay", &settings->uints.input_hotkey_block_delay, true, DEFAULT_INPUT_HOTKEY_BLOCK_DELAY, false);
3571-
SETTING_UINT("input_rumble_gain", &settings->uints.input_rumble_gain, true, DEFAULT_RUMBLE_GAIN, false);
35723548
#ifdef ANDROID
35733549
SETTING_UINT("input_sensor_orientation", &settings->uints.input_sensor_orientation, true, 0, false);
35743550
#else
@@ -3742,6 +3718,11 @@ static struct config_int_setting *populate_settings_int(
37423718
#include "settings/settings_def_video_fullscreen.h"
37433719
#define SETTINGS_DEF_CONFIG_PASS
37443720
#include "settings/settings_def_video_sync.h"
3721+
#include "settings/settings_def_input_haptics.h"
3722+
#include "settings/settings_def_input_general.h"
3723+
#ifdef HAVE_MENU
3724+
#include "settings/settings_def_ozone_appearance.h"
3725+
#endif
37453726
#ifdef HAVE_MENU
37463727
#ifdef HAVE_XMB
37473728
#include "settings/settings_def_rgui_appearance.h"
@@ -4145,6 +4126,11 @@ static struct config_int_setting *populate_settings_int(
41454126
#include "settings/settings_def_video_fullscreen.h"
41464127
#define SETTINGS_DEF_CONFIG_PASS
41474128
#include "settings/settings_def_video_sync.h"
4129+
#include "settings/settings_def_input_haptics.h"
4130+
#include "settings/settings_def_input_general.h"
4131+
#ifdef HAVE_MENU
4132+
#include "settings/settings_def_ozone_appearance.h"
4133+
#endif
41484134
#ifdef HAVE_MENU
41494135
#ifdef HAVE_XMB
41504136
#include "settings/settings_def_rgui_appearance.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,30 +1572,6 @@ MSG_HASH(
15721572
MENU_ENUM_LABEL_INFO_SCREEN,
15731573
MENU_ENUM_LABEL_INFO_SCREEN_STR
15741574
)
1575-
MSG_HASH(
1576-
MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU,
1577-
MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU_STR
1578-
)
1579-
MSG_HASH(
1580-
MENU_ENUM_LABEL_MENU_SINGLECLICK_PLAYLISTS,
1581-
MENU_ENUM_LABEL_MENU_SINGLECLICK_PLAYLISTS_STR
1582-
)
1583-
MSG_HASH(
1584-
MENU_ENUM_LABEL_MENU_ALLOW_TABS_BACK,
1585-
MENU_ENUM_LABEL_MENU_ALLOW_TABS_BACK_STR
1586-
)
1587-
MSG_HASH(
1588-
MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL,
1589-
MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL_STR
1590-
)
1591-
MSG_HASH(
1592-
MENU_ENUM_LABEL_MENU_INPUT_SWAP_SCROLL,
1593-
MENU_ENUM_LABEL_MENU_INPUT_SWAP_SCROLL_STR
1594-
)
1595-
MSG_HASH(
1596-
MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE,
1597-
MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE_STR
1598-
)
15991575
#ifdef ANDROID
16001576
MSG_HASH(
16011577
MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD,
@@ -1654,14 +1630,6 @@ MSG_HASH(
16541630
MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN,
16551631
MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN_STR
16561632
)
1657-
MSG_HASH(
1658-
MENU_ENUM_LABEL_INPUT_HOTKEY_BLOCK_DELAY,
1659-
MENU_ENUM_LABEL_INPUT_HOTKEY_BLOCK_DELAY_STR
1660-
)
1661-
MSG_HASH(
1662-
MENU_ENUM_LABEL_INPUT_HOTKEY_DEVICE_MERGE,
1663-
MENU_ENUM_LABEL_INPUT_HOTKEY_DEVICE_MERGE_STR
1664-
)
16651633
MSG_HASH(
16661634
MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE,
16671635
MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE_STR
@@ -1706,18 +1674,6 @@ MSG_HASH(
17061674
MENU_ENUM_LABEL_INPUT_REMAP_PORT,
17071675
MENU_ENUM_LABEL_INPUT_REMAP_PORT_STR
17081676
)
1709-
MSG_HASH(
1710-
MENU_ENUM_LABEL_INPUT_MAX_USERS,
1711-
MENU_ENUM_LABEL_INPUT_MAX_USERS_STR
1712-
)
1713-
MSG_HASH(
1714-
MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
1715-
MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO_STR
1716-
)
1717-
MSG_HASH(
1718-
MENU_ENUM_LABEL_INPUT_QUIT_GAMEPAD_COMBO,
1719-
MENU_ENUM_LABEL_INPUT_QUIT_GAMEPAD_COMBO_STR
1720-
)
17211677
MSG_HASH(
17221678
MENU_ENUM_LABEL_INPUT_OVERLAY,
17231679
MENU_ENUM_LABEL_INPUT_OVERLAY_STR
@@ -1830,18 +1786,6 @@ MSG_HASH(
18301786
MENU_ENUM_LABEL_INPUT_OVERLAY_ANALOG_RECENTER_ZONE,
18311787
MENU_ENUM_LABEL_INPUT_OVERLAY_ANALOG_RECENTER_ZONE_STR
18321788
)
1833-
MSG_HASH(
1834-
MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR,
1835-
MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR_STR
1836-
)
1837-
MSG_HASH(
1838-
MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE,
1839-
MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE_STR
1840-
)
1841-
MSG_HASH(
1842-
MENU_ENUM_LABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE,
1843-
MENU_ENUM_LABEL_INPUT_REMAP_SORT_BY_CONTROLLER_ENABLE_STR
1844-
)
18451789
MSG_HASH(
18461790
MENU_ENUM_LABEL_INPUT_SETTINGS,
18471791
MENU_ENUM_LABEL_INPUT_SETTINGS_STR
@@ -3715,50 +3659,6 @@ MSG_HASH(
37153659
MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS,
37163660
MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS_STR
37173661
)
3718-
MSG_HASH(
3719-
MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY,
3720-
MENU_ENUM_LABEL_CONTENT_SHOW_HISTORY_STR
3721-
)
3722-
MSG_HASH(
3723-
MENU_ENUM_LABEL_CONTENT_SHOW_ADD_ENTRY,
3724-
MENU_ENUM_LABEL_CONTENT_SHOW_ADD_ENTRY_STR
3725-
)
3726-
MSG_HASH(
3727-
MENU_ENUM_LABEL_CONTENT_SHOW_PLAYLISTS,
3728-
MENU_ENUM_LABEL_CONTENT_SHOW_PLAYLISTS_STR
3729-
)
3730-
MSG_HASH(
3731-
MENU_ENUM_LABEL_CONTENT_SHOW_EXPLORE,
3732-
MENU_ENUM_LABEL_CONTENT_SHOW_EXPLORE_STR
3733-
)
3734-
MSG_HASH(
3735-
MENU_ENUM_LABEL_CONTENT_SHOW_CONTENTLESS_CORES,
3736-
MENU_ENUM_LABEL_CONTENT_SHOW_CONTENTLESS_CORES_STR
3737-
)
3738-
MSG_HASH(
3739-
MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES,
3740-
MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES_STR
3741-
)
3742-
MSG_HASH(
3743-
MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES_FIRST,
3744-
MENU_ENUM_LABEL_CONTENT_SHOW_FAVORITES_FIRST_STR
3745-
)
3746-
MSG_HASH(
3747-
MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES,
3748-
MENU_ENUM_LABEL_CONTENT_SHOW_IMAGES_STR
3749-
)
3750-
MSG_HASH(
3751-
MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC,
3752-
MENU_ENUM_LABEL_CONTENT_SHOW_MUSIC_STR
3753-
)
3754-
MSG_HASH(
3755-
MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO,
3756-
MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO_STR
3757-
)
3758-
MSG_HASH(
3759-
MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY,
3760-
MENU_ENUM_LABEL_CONTENT_SHOW_NETPLAY_STR
3761-
)
37623662
MSG_HASH(
37633663
MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT,
37643664
MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT_STR
@@ -3833,26 +3733,6 @@ MSG_HASH(
38333733
MENU_ENUM_LABEL_SHADER_PIPELINE_SNOW,
38343734
MENU_ENUM_LABEL_SHADER_PIPELINE_SNOW_STR
38353735
)
3836-
MSG_HASH(
3837-
MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS,
3838-
MENU_ENUM_LABEL_INPUT_UNIFIED_MENU_CONTROLS_STR
3839-
)
3840-
MSG_HASH(
3841-
MENU_ENUM_LABEL_INPUT_DISABLE_INFO_BUTTON,
3842-
MENU_ENUM_LABEL_INPUT_DISABLE_INFO_BUTTON_STR
3843-
)
3844-
MSG_HASH(
3845-
MENU_ENUM_LABEL_INPUT_DISABLE_SEARCH_BUTTON,
3846-
MENU_ENUM_LABEL_INPUT_DISABLE_SEARCH_BUTTON_STR
3847-
)
3848-
MSG_HASH(
3849-
MENU_ENUM_LABEL_INPUT_DISABLE_LEFT_ANALOG_IN_MENU,
3850-
MENU_ENUM_LABEL_INPUT_DISABLE_LEFT_ANALOG_IN_MENU_STR
3851-
)
3852-
MSG_HASH(
3853-
MENU_ENUM_LABEL_INPUT_DISABLE_RIGHT_ANALOG_IN_MENU,
3854-
MENU_ENUM_LABEL_INPUT_DISABLE_RIGHT_ANALOG_IN_MENU_STR
3855-
)
38563736
MSG_HASH(
38573737
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
38583738
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR
@@ -4669,14 +4549,6 @@ MSG_HASH(
46694549
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS,
46704550
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS_STR
46714551
)
4672-
MSG_HASH(
4673-
MENU_ENUM_LABEL_VIBRATE_ON_KEYPRESS,
4674-
MENU_ENUM_LABEL_VIBRATE_ON_KEYPRESS_STR
4675-
)
4676-
MSG_HASH(
4677-
MENU_ENUM_LABEL_ENABLE_DEVICE_VIBRATION,
4678-
MENU_ENUM_LABEL_ENABLE_DEVICE_VIBRATION_STR
4679-
)
46804552
MSG_HASH(
46814553
MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE,
46824554
MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE_STR
@@ -4919,10 +4791,6 @@ MSG_HASH(
49194791
MENU_ENUM_LABEL_INPUT_SENSOR_SETTINGS,
49204792
MENU_ENUM_LABEL_INPUT_SENSOR_SETTINGS_STR
49214793
)
4922-
MSG_HASH(
4923-
MENU_ENUM_LABEL_INPUT_RUMBLE_GAIN,
4924-
MENU_ENUM_LABEL_INPUT_RUMBLE_GAIN_STR
4925-
)
49264794
MSG_HASH(
49274795
MENU_ENUM_LABEL_INPUT_TURBO_MODE,
49284796
MENU_ENUM_LABEL_INPUT_TURBO_MODE_STR

‎intl/msg_hash_us.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,9 @@ static const char *const msg_hash_us_lbl_strs[] = {
559559
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
560560
#include "../settings/settings_def_video_fullscreen.h"
561561
#include "../settings/settings_def_video_sync.h"
562+
#include "../settings/settings_def_input_haptics.h"
563+
#include "../settings/settings_def_input_general.h"
564+
#include "../settings/settings_def_ozone_appearance.h"
562565
#include "../settings/settings_def_rgui_appearance.h"
563566
#include "../settings/settings_def_playlist_display.h"
564567
#include "../settings/settings_def_cheevos_general.h"
@@ -801,6 +804,9 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
801804
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
802805
#include "../settings/settings_def_video_fullscreen.h"
803806
#include "../settings/settings_def_video_sync.h"
807+
#include "../settings/settings_def_input_haptics.h"
808+
#include "../settings/settings_def_input_general.h"
809+
#include "../settings/settings_def_ozone_appearance.h"
804810
#include "../settings/settings_def_rgui_appearance.h"
805811
#include "../settings/settings_def_playlist_display.h"
806812
#include "../settings/settings_def_cheevos_general.h"

0 commit comments

Comments
 (0)