Skip to content

Commit a961f06

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate a batch of extended-row tables to single-source def files
Cloud sync general, landscape layout, menu privacy, playlist management, main menu state, netplay advanced, and the sensor and hotkey extras groups. 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 cc9d668 commit a961f06

14 files changed

Lines changed: 3297 additions & 1063 deletions

‎configuration.c‎

Lines changed: 75 additions & 47 deletions
Large diffs are not rendered by default.

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 200 deletions
Original file line numberDiff line numberDiff line change
@@ -480,18 +480,6 @@ MSG_HASH(
480480
MENU_ENUM_LABEL_BROWSE_URL_LIST,
481481
MENU_ENUM_LABEL_BROWSE_URL_LIST_STR
482482
)
483-
MSG_HASH(
484-
MENU_ENUM_LABEL_CONTENT_FAVORITES_SIZE,
485-
MENU_ENUM_LABEL_CONTENT_FAVORITES_SIZE_STR
486-
)
487-
MSG_HASH(
488-
MENU_ENUM_LABEL_PLAYLIST_ENTRY_REMOVE,
489-
MENU_ENUM_LABEL_PLAYLIST_ENTRY_REMOVE_STR
490-
)
491-
MSG_HASH(
492-
MENU_ENUM_LABEL_CONTENT_SETTINGS,
493-
MENU_ENUM_LABEL_CONTENT_SETTINGS_STR
494-
)
495483
MSG_HASH(
496484
MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS,
497485
MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS_STR
@@ -500,10 +488,6 @@ MSG_HASH(
500488
MENU_ENUM_LABEL_CORE_COUNTERS,
501489
MENU_ENUM_LABEL_CORE_COUNTERS_STR
502490
)
503-
MSG_HASH(
504-
MENU_ENUM_LABEL_CORE_ENABLE,
505-
MENU_ENUM_LABEL_CORE_ENABLE_STR
506-
)
507491
MSG_HASH(
508492
MENU_ENUM_LABEL_CORE_INFORMATION,
509493
MENU_ENUM_LABEL_CORE_INFORMATION_STR
@@ -1420,26 +1404,10 @@ MSG_HASH(
14201404
MENU_ENUM_LABEL_INPUT_SELECT_PHYSICAL_KEYBOARD_STR
14211405
)
14221406
#endif
1423-
MSG_HASH(
1424-
MENU_ENUM_LABEL_INPUT_SENSOR_ACCELEROMETER_SENSITIVITY,
1425-
MENU_ENUM_LABEL_INPUT_SENSOR_ACCELEROMETER_SENSITIVITY_STR
1426-
)
14271407
MSG_HASH(
14281408
MENU_ENUM_LABEL_INPUT_SENSOR_ORIENTATION,
14291409
MENU_ENUM_LABEL_INPUT_SENSOR_ORIENTATION_STR
14301410
)
1431-
MSG_HASH(
1432-
MENU_ENUM_LABEL_INPUT_SENSOR_GYROSCOPE_SENSITIVITY,
1433-
MENU_ENUM_LABEL_INPUT_SENSOR_GYROSCOPE_SENSITIVITY_STR
1434-
)
1435-
MSG_HASH(
1436-
MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT,
1437-
MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT_STR
1438-
)
1439-
MSG_HASH(
1440-
MENU_ENUM_LABEL_INPUT_BIND_HOLD,
1441-
MENU_ENUM_LABEL_INPUT_BIND_HOLD_STR
1442-
)
14431411
MSG_HASH(
14441412
MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND,
14451413
MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND_STR
@@ -1684,10 +1652,6 @@ MSG_HASH(
16841652
MENU_ENUM_LABEL_MUSIC_TAB,
16851653
MENU_ENUM_LABEL_MUSIC_TAB_STR
16861654
)
1687-
MSG_HASH(
1688-
MENU_ENUM_LABEL_NETPLAY_CHECK_FRAMES,
1689-
MENU_ENUM_LABEL_NETPLAY_CHECK_FRAMES_STR
1690-
)
16911655
MSG_HASH(
16921656
MENU_ENUM_LABEL_NETPLAY_REQUEST_DEVICE_I,
16931657
MENU_ENUM_LABEL_NETPLAY_REQUEST_DEVICE_I_STR
@@ -1720,34 +1684,6 @@ MSG_HASH(
17201684
MENU_ENUM_LABEL_NETPLAY_BAN,
17211685
MENU_ENUM_LABEL_NETPLAY_BAN_STR
17221686
)
1723-
MSG_HASH(
1724-
MENU_ENUM_LABEL_NETPLAY_ALLOW_SLAVES,
1725-
MENU_ENUM_LABEL_NETPLAY_ALLOW_SLAVES_STR
1726-
)
1727-
MSG_HASH(
1728-
MENU_ENUM_LABEL_NETPLAY_REQUIRE_SLAVES,
1729-
MENU_ENUM_LABEL_NETPLAY_REQUIRE_SLAVES_STR
1730-
)
1731-
MSG_HASH(
1732-
MENU_ENUM_LABEL_NETPLAY_START_AS_SPECTATOR,
1733-
MENU_ENUM_LABEL_NETPLAY_START_AS_SPECTATOR_STR
1734-
)
1735-
MSG_HASH(
1736-
MENU_ENUM_LABEL_NETPLAY_FADE_CHAT,
1737-
MENU_ENUM_LABEL_NETPLAY_FADE_CHAT_STR
1738-
)
1739-
MSG_HASH(
1740-
MENU_ENUM_LABEL_NETPLAY_CHAT_COLOR_NAME,
1741-
MENU_ENUM_LABEL_NETPLAY_CHAT_COLOR_NAME_STR
1742-
)
1743-
MSG_HASH(
1744-
MENU_ENUM_LABEL_NETPLAY_CHAT_COLOR_MSG,
1745-
MENU_ENUM_LABEL_NETPLAY_CHAT_COLOR_MSG_STR
1746-
)
1747-
MSG_HASH(
1748-
MENU_ENUM_LABEL_NETPLAY_ALLOW_PAUSING,
1749-
MENU_ENUM_LABEL_NETPLAY_ALLOW_PAUSING_STR
1750-
)
17511687
MSG_HASH(
17521688
MENU_ENUM_LABEL_NETWORK_CMD_PORT,
17531689
MENU_ENUM_LABEL_NETWORK_CMD_PORT_STR
@@ -2392,10 +2328,6 @@ MSG_HASH(
23922328
MENU_ENUM_LABEL_RECORD_REPLAY,
23932329
MENU_ENUM_LABEL_RECORD_REPLAY_STR
23942330
)
2395-
MSG_HASH(
2396-
MENU_ENUM_LABEL_REPLAY_SLOT,
2397-
MENU_ENUM_LABEL_REPLAY_SLOT_STR
2398-
)
23992331
MSG_HASH(
24002332
MENU_ENUM_LABEL_PLAY_REPLAY,
24012333
MENU_ENUM_LABEL_PLAY_REPLAY_STR
@@ -2404,14 +2336,6 @@ MSG_HASH(
24042336
MENU_ENUM_LABEL_HALT_REPLAY,
24052337
MENU_ENUM_LABEL_HALT_REPLAY_STR
24062338
)
2407-
MSG_HASH(
2408-
MENU_ENUM_LABEL_CLOUD_SYNC_ENABLE,
2409-
MENU_ENUM_LABEL_CLOUD_SYNC_ENABLE_STR
2410-
)
2411-
MSG_HASH(
2412-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_MODE,
2413-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_MODE_STR
2414-
)
24152339
MSG_HASH(
24162340
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_MODE_AUTOMATIC,
24172341
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_MODE_AUTOMATIC_STR
@@ -2420,26 +2344,6 @@ MSG_HASH(
24202344
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_MODE_MANUAL,
24212345
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_MODE_MANUAL_STR
24222346
)
2423-
MSG_HASH(
2424-
MENU_ENUM_LABEL_CLOUD_SYNC_DESTRUCTIVE,
2425-
MENU_ENUM_LABEL_CLOUD_SYNC_DESTRUCTIVE_STR
2426-
)
2427-
MSG_HASH(
2428-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SAVES,
2429-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SAVES_STR
2430-
)
2431-
MSG_HASH(
2432-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_CONFIGS,
2433-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_CONFIGS_STR
2434-
)
2435-
MSG_HASH(
2436-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_THUMBS,
2437-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_THUMBS_STR
2438-
)
2439-
MSG_HASH(
2440-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SYSTEM,
2441-
MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SYSTEM_STR
2442-
)
24432347
MSG_HASH(
24442348
MENU_ENUM_LABEL_CLOUD_SYNC_DRIVER,
24452349
MENU_ENUM_LABEL_CLOUD_SYNC_DRIVER_STR
@@ -2571,22 +2475,6 @@ MSG_HASH(
25712475
MENU_ENUM_LABEL_BLUETOOTH_ERTM_DISABLE_STR
25722476
)
25732477
#endif
2574-
MSG_HASH(
2575-
MENU_ENUM_LABEL_START_CORE,
2576-
MENU_ENUM_LABEL_START_CORE_STR
2577-
)
2578-
MSG_HASH(
2579-
MENU_ENUM_LABEL_START_NET_RETROPAD,
2580-
MENU_ENUM_LABEL_START_NET_RETROPAD_STR
2581-
)
2582-
MSG_HASH(
2583-
MENU_ENUM_LABEL_START_VIDEO_PROCESSOR,
2584-
MENU_ENUM_LABEL_START_VIDEO_PROCESSOR_STR
2585-
)
2586-
MSG_HASH(
2587-
MENU_ENUM_LABEL_STATE_SLOT,
2588-
MENU_ENUM_LABEL_STATE_SLOT_STR
2589-
)
25902478
MSG_HASH(
25912479
MENU_ENUM_LABEL_SYSTEM_BGM_ENABLE,
25922480
MENU_ENUM_LABEL_SYSTEM_BGM_ENABLE_STR
@@ -2623,18 +2511,6 @@ MSG_HASH(
26232511
MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_ENTRY,
26242512
MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_ENTRY_STR
26252513
)
2626-
MSG_HASH(
2627-
MENU_ENUM_LABEL_TIMEDATE_ENABLE,
2628-
MENU_ENUM_LABEL_TIMEDATE_ENABLE_STR
2629-
)
2630-
MSG_HASH(
2631-
MENU_ENUM_LABEL_TIMEDATE_STYLE,
2632-
MENU_ENUM_LABEL_TIMEDATE_STYLE_STR
2633-
)
2634-
MSG_HASH(
2635-
MENU_ENUM_LABEL_TIMEDATE_DATE_SEPARATOR,
2636-
MENU_ENUM_LABEL_TIMEDATE_DATE_SEPARATOR_STR
2637-
)
26382514
MSG_HASH(
26392515
MENU_ENUM_LABEL_UNDO_LOAD_STATE,
26402516
MENU_ENUM_LABEL_UNDO_LOAD_STATE_STR
@@ -3019,10 +2895,6 @@ MSG_HASH(
30192895
MENU_ENUM_LABEL_WIFI_DRIVER,
30202896
MENU_ENUM_LABEL_WIFI_DRIVER_STR
30212897
)
3022-
MSG_HASH(
3023-
MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS,
3024-
MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS_STR
3025-
)
30262898
MSG_HASH(
30272899
MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT,
30282900
MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT_STR
@@ -3101,18 +2973,6 @@ MSG_HASH(
31012973
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
31022974
MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR_STR
31032975
)
3104-
MSG_HASH(
3105-
MENU_ENUM_LABEL_BATTERY_LEVEL_ENABLE,
3106-
MENU_ENUM_LABEL_BATTERY_LEVEL_ENABLE_STR
3107-
)
3108-
MSG_HASH(
3109-
MENU_ENUM_LABEL_MENU_SHOW_SUBLABELS,
3110-
MENU_ENUM_LABEL_MENU_SHOW_SUBLABELS_STR
3111-
)
3112-
MSG_HASH(
3113-
MENU_ENUM_LABEL_MENU_SHOW_CONFIRM,
3114-
MENU_ENUM_LABEL_MENU_SHOW_CONFIRM_STR
3115-
)
31162976
MSG_HASH(
31172977
MENU_ENUM_LABEL_BROWSE_START,
31182978
MENU_ENUM_LABEL_BROWSE_START_STR
@@ -3161,10 +3021,6 @@ MSG_HASH(
31613021
MENU_ENUM_LABEL_CORE_DELETE,
31623022
MENU_ENUM_LABEL_CORE_DELETE_STR
31633023
)
3164-
MSG_HASH(
3165-
MENU_ENUM_LABEL_PLAYLIST_ENTRY_RENAME,
3166-
MENU_ENUM_LABEL_PLAYLIST_ENTRY_RENAME_STR
3167-
)
31683024
MSG_HASH(
31693025
MENU_ENUM_LABEL_GOTO_FAVORITES,
31703026
MENU_ENUM_LABEL_GOTO_FAVORITES_STR
@@ -3213,10 +3069,6 @@ MSG_HASH(
32133069
MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING,
32143070
MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING_STR
32153071
)
3216-
MSG_HASH(
3217-
MENU_ENUM_LABEL_MENU_DISABLE_KIOSK_MODE,
3218-
MENU_ENUM_LABEL_MENU_DISABLE_KIOSK_MODE_STR
3219-
)
32203072
MSG_HASH(
32213073
MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC,
32223074
MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC_STR
@@ -3447,30 +3299,6 @@ MSG_HASH(
34473299
MENU_ENUM_LABEL_JOYPAD_DRIVER_NULL_STR
34483300
)
34493301

3450-
MSG_HASH(
3451-
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS,
3452-
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS_STR
3453-
)
3454-
MSG_HASH(
3455-
MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT,
3456-
MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_STR
3457-
)
3458-
MSG_HASH(
3459-
MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SPEED,
3460-
MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SPEED_STR
3461-
)
3462-
MSG_HASH(
3463-
MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SCREENSAVER,
3464-
MENU_ENUM_LABEL_MENU_RGUI_PARTICLE_EFFECT_SCREENSAVER_STR
3465-
)
3466-
MSG_HASH(
3467-
MENU_ENUM_LABEL_MENU_RGUI_EXTENDED_ASCII,
3468-
MENU_ENUM_LABEL_MENU_RGUI_EXTENDED_ASCII_STR
3469-
)
3470-
MSG_HASH(
3471-
MENU_ENUM_LABEL_MENU_RGUI_SWITCH_ICONS,
3472-
MENU_ENUM_LABEL_MENU_RGUI_SWITCH_ICONS_STR
3473-
)
34743302
MSG_HASH(
34753303
MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO_LAYOUT,
34763304
MENU_ENUM_LABEL_CONTENT_SHOW_VIDEO_LAYOUT_STR
@@ -3753,22 +3581,6 @@ MSG_HASH(
37533581
MENU_ENUM_LABEL_BOTTOM_ASSETS_DIRECTORY_STR
37543582
)
37553583
#endif
3756-
MSG_HASH(
3757-
MENU_ENUM_LABEL_PLAYLIST_USE_OLD_FORMAT,
3758-
MENU_ENUM_LABEL_PLAYLIST_USE_OLD_FORMAT_STR
3759-
)
3760-
MSG_HASH(
3761-
MENU_ENUM_LABEL_PLAYLIST_COMPRESSION,
3762-
MENU_ENUM_LABEL_PLAYLIST_COMPRESSION_STR
3763-
)
3764-
MSG_HASH(
3765-
MENU_ENUM_LABEL_PLAYLIST_SORT_ALPHABETICAL,
3766-
MENU_ENUM_LABEL_PLAYLIST_SORT_ALPHABETICAL_STR
3767-
)
3768-
MSG_HASH(
3769-
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS,
3770-
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS_STR
3771-
)
37723584
MSG_HASH(
37733585
MENU_ENUM_LABEL_AI_SERVICE_URL,
37743586
MENU_ENUM_LABEL_AI_SERVICE_URL_STR
@@ -3883,18 +3695,6 @@ MSG_HASH(
38833695
MENU_ENUM_LABEL_DEFERRED_AUDIO_SYNCHRONIZATION_SETTINGS_LIST,
38843696
MENU_ENUM_LABEL_DEFERRED_AUDIO_SYNCHRONIZATION_SETTINGS_LIST_STR
38853697
)
3886-
MSG_HASH(
3887-
MENU_ENUM_LABEL_INPUT_MENU_SETTINGS,
3888-
MENU_ENUM_LABEL_INPUT_MENU_SETTINGS_STR
3889-
)
3890-
MSG_HASH(
3891-
MENU_ENUM_LABEL_INPUT_HAPTIC_FEEDBACK_SETTINGS,
3892-
MENU_ENUM_LABEL_INPUT_HAPTIC_FEEDBACK_SETTINGS_STR
3893-
)
3894-
MSG_HASH(
3895-
MENU_ENUM_LABEL_INPUT_SENSOR_SETTINGS,
3896-
MENU_ENUM_LABEL_INPUT_SENSOR_SETTINGS_STR
3897-
)
38983698
MSG_HASH(
38993699
MENU_ENUM_LABEL_MIXER_ACTION_PLAY,
39003700
MENU_ENUM_LABEL_MIXER_ACTION_PLAY_STR

‎intl/msg_hash_us.c‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,13 @@ 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_sensors_extra.h"
563+
#include "../settings/settings_def_netplay_advanced.h"
564+
#include "../settings/settings_def_menu_main_state.h"
565+
#include "../settings/settings_def_playlist_management.h"
566+
#include "../settings/settings_def_menu_privacy.h"
567+
#include "../settings/settings_def_menu_landscape.h"
568+
#include "../settings/settings_def_cloud_sync_general.h"
562569
#include "../settings/settings_def_overlay_appearance.h"
563570
#include "../settings/settings_def_notification_views.h"
564571
#include "../settings/settings_def_ozone_typography.h"
@@ -873,6 +880,13 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
873880
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
874881
#include "../settings/settings_def_video_fullscreen.h"
875882
#include "../settings/settings_def_video_sync.h"
883+
#include "../settings/settings_def_input_sensors_extra.h"
884+
#include "../settings/settings_def_netplay_advanced.h"
885+
#include "../settings/settings_def_menu_main_state.h"
886+
#include "../settings/settings_def_playlist_management.h"
887+
#include "../settings/settings_def_menu_privacy.h"
888+
#include "../settings/settings_def_menu_landscape.h"
889+
#include "../settings/settings_def_cloud_sync_general.h"
876890
#include "../settings/settings_def_overlay_appearance.h"
877891
#include "../settings/settings_def_notification_views.h"
878892
#include "../settings/settings_def_ozone_typography.h"

0 commit comments

Comments
 (0)