Skip to content

Commit 594fb8b

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate a batch of extended-row tables to single-source def files
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 9ba039e commit 594fb8b

13 files changed

Lines changed: 2192 additions & 268 deletions

‎configuration.c‎

Lines changed: 70 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,7 +1823,6 @@ static struct config_bool_setting *populate_settings_bool(
18231823
SETTING_BOOL("statistics_show", &settings->bools.video_statistics_show, true, DEFAULT_STATISTICS_SHOW, false);
18241824
SETTING_BOOL("framecount_show", &settings->bools.video_framecount_show, true, DEFAULT_FRAMECOUNT_SHOW, false);
18251825
SETTING_BOOL("memory_show", &settings->bools.video_memory_show, true, DEFAULT_MEMORY_SHOW, false);
1826-
SETTING_BOOL("pause_on_disconnect", &settings->bools.pause_on_disconnect, true, DEFAULT_PAUSE_ON_DISCONNECT, false);
18271826
SETTING_BOOL("auto_screenshot_filename", &settings->bools.auto_screenshot_filename, true, DEFAULT_AUTO_SCREENSHOT_FILENAME, false);
18281827
SETTING_BOOL("video_filter_enable", &settings->bools.video_filter_enable, true, true, false);
18291828
SETTING_BOOL("apply_cheats_after_toggle", &settings->bools.apply_cheats_after_toggle, true, DEFAULT_APPLY_CHEATS_AFTER_TOGGLE, false);
@@ -1908,12 +1907,8 @@ static struct config_bool_setting *populate_settings_bool(
19081907
#endif
19091908
SETTING_BOOL("audio_fastforward_mute", &settings->bools.audio_fastforward_mute, true, DEFAULT_AUDIO_FASTFORWARD_MUTE, false);
19101909
SETTING_BOOL("audio_fastforward_speedup", &settings->bools.audio_fastforward_speedup, true, DEFAULT_AUDIO_FASTFORWARD_SPEEDUP, false);
1911-
SETTING_BOOL("audio_fastpath_s16", &settings->bools.audio_fastpath_s16, true, DEFAULT_AUDIO_FASTPATH_S16, false);
19121910
SETTING_BOOL("audio_rewind_mute", &settings->bools.audio_rewind_mute, true, DEFAULT_AUDIO_REWIND_MUTE, false);
19131911

1914-
#ifdef HAVE_WASAPI
1915-
SETTING_BOOL("audio_wasapi_exclusive_mode", &settings->bools.audio_wasapi_exclusive_mode, true, DEFAULT_WASAPI_EXCLUSIVE_MODE, false);
1916-
#endif
19171912

19181913
#ifdef HAVE_MICROPHONE
19191914
#ifdef HAVE_WASAPI
@@ -1935,7 +1930,6 @@ static struct config_bool_setting *populate_settings_bool(
19351930
SETTING_BOOL("video_scale_integer", &settings->bools.video_scale_integer, true, DEFAULT_SCALE_INTEGER, false);
19361931
SETTING_BOOL("video_ctx_scaling", &settings->bools.video_ctx_scaling, true, DEFAULT_VIDEO_CTX_SCALING, false);
19371932
SETTING_BOOL("video_force_aspect", &settings->bools.video_force_aspect, true, DEFAULT_FORCE_ASPECT, false);
1938-
SETTING_BOOL("video_frame_delay_auto", &settings->bools.video_frame_delay_auto, true, DEFAULT_FRAME_DELAY_AUTO, false);
19391933
SETTING_BOOL("video_threaded", video_driver_get_threaded(), true, DEFAULT_VIDEO_THREADED, false);
19401934
SETTING_BOOL("video_shared_context", &settings->bools.video_shared_context, true, DEFAULT_VIDEO_SHARED_CONTEXT, false);
19411935
SETTING_BOOL("video_hdr_scanlines", &settings->bools.video_hdr_scanlines, true, DEFAULT_VIDEO_HDR_SCANLINES, false);
@@ -1978,6 +1972,20 @@ static struct config_bool_setting *populate_settings_bool(
19781972
#define SETTINGS_DEF_CONFIG_PASS
19791973
#include "settings/settings_def_video_sync.h"
19801974
#ifdef HAVE_MENU
1975+
#include "settings/settings_def_menu_scroll.h"
1976+
#endif
1977+
#ifdef HAVE_MENU
1978+
#ifdef HAVE_XMB
1979+
#include "settings/settings_def_menu_thumbnails.h"
1980+
#endif
1981+
#endif
1982+
#include "settings/settings_def_input_turbo.h"
1983+
#include "settings/settings_def_frame_delay.h"
1984+
#ifdef HAVE_WASAPI
1985+
#include "settings/settings_def_audio_wasapi.h"
1986+
#endif
1987+
#include "settings/settings_def_audio_resampler_quality.h"
1988+
#ifdef HAVE_MENU
19811989
#include "settings/settings_def_wallpaper_opacity.h"
19821990
#endif
19831991
#ifdef HAVE_OVERLAY
@@ -2335,7 +2343,6 @@ static struct config_bool_setting *populate_settings_bool(
23352343
SETTING_BOOL("menu_disable_search_button", &settings->bools.menu_disable_search_button, true, false, false);
23362344
SETTING_BOOL("menu_disable_left_analog", &settings->bools.menu_disable_left_analog, true, false, false);
23372345
SETTING_BOOL("menu_disable_right_analog", &settings->bools.menu_disable_right_analog, true, false, false);
2338-
SETTING_BOOL("menu_linear_filter", &settings->bools.menu_linear_filter, true, DEFAULT_VIDEO_SMOOTH, false);
23392346
SETTING_BOOL("menu_pause_libretro", &settings->bools.menu_pause_libretro, true, true, false);
23402347
SETTING_BOOL("menu_savestate_resume", &settings->bools.menu_savestate_resume, true, DEFAULT_MENU_SAVESTATE_RESUME, false);
23412348
SETTING_BOOL("menu_insert_disk_resume", &settings->bools.menu_insert_disk_resume, true, DEFAULT_MENU_INSERT_DISK_RESUME, false);
@@ -2400,7 +2407,6 @@ static struct config_bool_setting *populate_settings_bool(
24002407
SETTING_BOOL("xmb_shadows_enable", &settings->bools.menu_xmb_shadows_enable, true, DEFAULT_XMB_SHADOWS_ENABLE, false);
24012408
SETTING_BOOL("xmb_entry_icons", &settings->bools.menu_xmb_entry_icons, true, DEFAULT_XMB_ENTRY_ICONS, false);
24022409
SETTING_BOOL("xmb_switch_icons", &settings->bools.menu_xmb_switch_icons, true, DEFAULT_XMB_SWITCH_ICONS, false);
2403-
SETTING_BOOL("xmb_vertical_thumbnails", &settings->bools.menu_xmb_vertical_thumbnails, true, DEFAULT_XMB_VERTICAL_THUMBNAILS, false);
24042410
SETTING_BOOL("menu_xmb_show_horizontal_list", &settings->bools.menu_xmb_show_horizontal_list, true, DEFAULT_XMB_SHOW_HORIZONTAL_LIST, false);
24052411
SETTING_BOOL("menu_xmb_show_title_header", &settings->bools.menu_xmb_show_title_header, true, DEFAULT_XMB_SHOW_TITLE_HEADER, false);
24062412
#endif
@@ -2591,6 +2597,20 @@ static struct config_float_setting *populate_settings_float(
25912597
#define SETTINGS_DEF_CONFIG_PASS
25922598
#include "settings/settings_def_video_sync.h"
25932599
#ifdef HAVE_MENU
2600+
#include "settings/settings_def_menu_scroll.h"
2601+
#endif
2602+
#ifdef HAVE_MENU
2603+
#ifdef HAVE_XMB
2604+
#include "settings/settings_def_menu_thumbnails.h"
2605+
#endif
2606+
#endif
2607+
#include "settings/settings_def_input_turbo.h"
2608+
#include "settings/settings_def_frame_delay.h"
2609+
#ifdef HAVE_WASAPI
2610+
#include "settings/settings_def_audio_wasapi.h"
2611+
#endif
2612+
#include "settings/settings_def_audio_resampler_quality.h"
2613+
#ifdef HAVE_MENU
25942614
#include "settings/settings_def_wallpaper_opacity.h"
25952615
#endif
25962616
#ifdef HAVE_OVERLAY
@@ -3039,7 +3059,6 @@ static struct config_uint_setting *populate_settings_uint(
30393059
SETTING_UINT("menu_remember_selection", &settings->uints.menu_remember_selection, true, DEFAULT_MENU_REMEMBER_SELECTION, false);
30403060
SETTING_UINT("menu_startup_page", &settings->uints.menu_startup_page, true, DEFAULT_MENU_STARTUP_PAGE, false);
30413061
#ifdef HAVE_RGUI
3042-
SETTING_UINT("rgui_internal_upscale_level", &settings->uints.menu_rgui_internal_upscale_level, true, DEFAULT_RGUI_INTERNAL_UPSCALE_LEVEL, false);
30433062
SETTING_UINT("rgui_particle_effect", &settings->uints.menu_rgui_particle_effect, true, DEFAULT_RGUI_PARTICLE_EFFECT, false);
30443063
#endif
30453064
#ifdef HAVE_XMB
@@ -3074,12 +3093,8 @@ static struct config_uint_setting *populate_settings_uint(
30743093

30753094
SETTING_UINT("audio_out_rate", &settings->uints.audio_output_sample_rate, true, DEFAULT_OUTPUT_RATE, false);
30763095
SETTING_UINT("audio_latency", &settings->uints.audio_latency, false, 0 /* TODO */, false);
3077-
SETTING_UINT("audio_resampler_quality", &settings->uints.audio_resampler_quality, true, DEFAULT_AUDIO_RESAMPLER_QUALITY_LEVEL, false);
30783096
SETTING_UINT("audio_block_frames", &settings->uints.audio_block_frames, true, 0, false);
30793097

3080-
#ifdef HAVE_WASAPI
3081-
SETTING_UINT("audio_wasapi_sh_buffer_length", &settings->uints.audio_wasapi_sh_buffer_length, true, DEFAULT_WASAPI_SH_BUFFER_LENGTH, false);
3082-
#endif
30833098

30843099
#ifdef HAVE_MICROPHONE
30853100
SETTING_UINT("microphone_latency", &settings->uints.microphone_latency, false, 0 /* TODO */, false);
@@ -3112,7 +3127,6 @@ static struct config_uint_setting *populate_settings_uint(
31123127
#ifdef GEKKO
31133128
SETTING_UINT("video_viwidth", &settings->uints.video_viwidth, true, DEFAULT_VIDEO_VI_WIDTH, false);
31143129
#endif
3115-
SETTING_UINT("video_frame_delay", &settings->uints.video_frame_delay, true, DEFAULT_FRAME_DELAY, false);
31163130
/* GENERATED: single-source setting rows (uint kind emits here) */
31173131
#define S_BOOL(f, T, n, d, sd, df, c, us, sub)
31183132
#define S_BOOL_NS(f, T, n, d, sd, df, c, us)
@@ -3152,6 +3166,20 @@ static struct config_uint_setting *populate_settings_uint(
31523166
#define SETTINGS_DEF_CONFIG_PASS
31533167
#include "settings/settings_def_video_sync.h"
31543168
#ifdef HAVE_MENU
3169+
#include "settings/settings_def_menu_scroll.h"
3170+
#endif
3171+
#ifdef HAVE_MENU
3172+
#ifdef HAVE_XMB
3173+
#include "settings/settings_def_menu_thumbnails.h"
3174+
#endif
3175+
#endif
3176+
#include "settings/settings_def_input_turbo.h"
3177+
#include "settings/settings_def_frame_delay.h"
3178+
#ifdef HAVE_WASAPI
3179+
#include "settings/settings_def_audio_wasapi.h"
3180+
#endif
3181+
#include "settings/settings_def_audio_resampler_quality.h"
3182+
#ifdef HAVE_MENU
31553183
#include "settings/settings_def_wallpaper_opacity.h"
31563184
#endif
31573185
#ifdef HAVE_OVERLAY
@@ -3497,7 +3525,6 @@ static struct config_uint_setting *populate_settings_uint(
34973525
SETTING_UINT("input_quit_gamepad_combo", &settings->uints.input_quit_gamepad_combo, true, DEFAULT_QUIT_GAMEPAD_COMBO, false);
34983526
SETTING_UINT("input_hotkey_block_delay", &settings->uints.input_hotkey_block_delay, true, DEFAULT_INPUT_HOTKEY_BLOCK_DELAY, false);
34993527
SETTING_UINT("input_rumble_gain", &settings->uints.input_rumble_gain, true, DEFAULT_RUMBLE_GAIN, false);
3500-
SETTING_UINT("input_auto_game_focus", &settings->uints.input_auto_game_focus, true, DEFAULT_INPUT_AUTO_GAME_FOCUS, false);
35013528
#ifdef ANDROID
35023529
SETTING_UINT("input_sensor_orientation", &settings->uints.input_sensor_orientation, true, 0, false);
35033530
#else
@@ -3676,6 +3703,20 @@ static struct config_int_setting *populate_settings_int(
36763703
#define SETTINGS_DEF_CONFIG_PASS
36773704
#include "settings/settings_def_video_sync.h"
36783705
#ifdef HAVE_MENU
3706+
#include "settings/settings_def_menu_scroll.h"
3707+
#endif
3708+
#ifdef HAVE_MENU
3709+
#ifdef HAVE_XMB
3710+
#include "settings/settings_def_menu_thumbnails.h"
3711+
#endif
3712+
#endif
3713+
#include "settings/settings_def_input_turbo.h"
3714+
#include "settings/settings_def_frame_delay.h"
3715+
#ifdef HAVE_WASAPI
3716+
#include "settings/settings_def_audio_wasapi.h"
3717+
#endif
3718+
#include "settings/settings_def_audio_resampler_quality.h"
3719+
#ifdef HAVE_MENU
36793720
#include "settings/settings_def_wallpaper_opacity.h"
36803721
#endif
36813722
#ifdef HAVE_OVERLAY
@@ -4033,6 +4074,20 @@ static struct config_int_setting *populate_settings_int(
40334074
#define SETTINGS_DEF_CONFIG_PASS
40344075
#include "settings/settings_def_video_sync.h"
40354076
#ifdef HAVE_MENU
4077+
#include "settings/settings_def_menu_scroll.h"
4078+
#endif
4079+
#ifdef HAVE_MENU
4080+
#ifdef HAVE_XMB
4081+
#include "settings/settings_def_menu_thumbnails.h"
4082+
#endif
4083+
#endif
4084+
#include "settings/settings_def_input_turbo.h"
4085+
#include "settings/settings_def_frame_delay.h"
4086+
#ifdef HAVE_WASAPI
4087+
#include "settings/settings_def_audio_wasapi.h"
4088+
#endif
4089+
#include "settings/settings_def_audio_resampler_quality.h"
4090+
#ifdef HAVE_MENU
40364091
#include "settings/settings_def_wallpaper_opacity.h"
40374092
#endif
40384093
#ifdef HAVE_OVERLAY

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -278,18 +278,10 @@ MSG_HASH(
278278
MENU_ENUM_LABEL_AUDIO_VOLUME,
279279
MENU_ENUM_LABEL_AUDIO_VOLUME_STR
280280
)
281-
MSG_HASH(
282-
MENU_ENUM_LABEL_AUDIO_WASAPI_EXCLUSIVE_MODE,
283-
MENU_ENUM_LABEL_AUDIO_WASAPI_EXCLUSIVE_MODE_STR
284-
)
285281
MSG_HASH(
286282
MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT,
287283
MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT_STR
288284
)
289-
MSG_HASH(
290-
MENU_ENUM_LABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH,
291-
MENU_ENUM_LABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH_STR
292-
)
293285
#ifdef HAVE_MICROPHONE
294286
MSG_HASH(
295287
MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_DRIVER,
@@ -1658,10 +1650,6 @@ MSG_HASH(
16581650
MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE,
16591651
MENU_ENUM_LABEL_INPUT_SENSORS_ENABLE_STR
16601652
)
1661-
MSG_HASH(
1662-
MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS,
1663-
MENU_ENUM_LABEL_INPUT_AUTO_GAME_FOCUS_STR
1664-
)
16651653
MSG_HASH(
16661654
MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD,
16671655
MENU_ENUM_LABEL_INPUT_BUTTON_AXIS_THRESHOLD_STR
@@ -2106,10 +2094,6 @@ MSG_HASH(
21062094
MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS,
21072095
MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS_STR
21082096
)
2109-
MSG_HASH(
2110-
MENU_ENUM_LABEL_MENU_LINEAR_FILTER,
2111-
MENU_ENUM_LABEL_MENU_LINEAR_FILTER_STR
2112-
)
21132097
MSG_HASH(
21142098
MENU_ENUM_LABEL_MENU_SETTINGS,
21152099
MENU_ENUM_LABEL_MENU_SETTINGS_STR
@@ -2448,10 +2432,6 @@ MSG_HASH(
24482432
MENU_ENUM_LABEL_QUIT_ON_CLOSE_CONTENT,
24492433
MENU_ENUM_LABEL_QUIT_ON_CLOSE_CONTENT_STR
24502434
)
2451-
MSG_HASH(
2452-
MENU_ENUM_LABEL_PAUSE_ON_DISCONNECT,
2453-
MENU_ENUM_LABEL_PAUSE_ON_DISCONNECT_STR
2454-
)
24552435
MSG_HASH(
24562436
MENU_ENUM_LABEL_MENU_SCREENSAVER_TIMEOUT,
24572437
MENU_ENUM_LABEL_MENU_SCREENSAVER_TIMEOUT_STR
@@ -3295,10 +3275,6 @@ MSG_HASH(
32953275
MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY,
32963276
MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY_STR
32973277
)
3298-
MSG_HASH(
3299-
MENU_ENUM_LABEL_ICON_THUMBNAILS,
3300-
MENU_ENUM_LABEL_ICON_THUMBNAILS_STR
3301-
)
33023278
MSG_HASH(
33033279
MENU_ENUM_LABEL_TAKE_SCREENSHOT,
33043280
MENU_ENUM_LABEL_TAKE_SCREENSHOT_STR
@@ -3311,10 +3287,6 @@ MSG_HASH(
33113287
MENU_ENUM_LABEL_LEFT_THUMBNAILS,
33123288
MENU_ENUM_LABEL_LEFT_THUMBNAILS_STR
33133289
)
3314-
MSG_HASH(
3315-
MENU_ENUM_LABEL_XMB_VERTICAL_THUMBNAILS,
3316-
MENU_ENUM_LABEL_XMB_VERTICAL_THUMBNAILS_STR
3317-
)
33183290
MSG_HASH(
33193291
MENU_ENUM_LABEL_MENU_XMB_THUMBNAIL_SCALE_FACTOR,
33203292
MENU_ENUM_LABEL_MENU_XMB_THUMBNAIL_SCALE_FACTOR_STR
@@ -3659,14 +3631,6 @@ MSG_HASH(
36593631
MENU_ENUM_LABEL_VIDEO_FONT_SIZE,
36603632
MENU_ENUM_LABEL_VIDEO_FONT_SIZE_STR
36613633
)
3662-
MSG_HASH(
3663-
MENU_ENUM_LABEL_VIDEO_FRAME_DELAY,
3664-
MENU_ENUM_LABEL_VIDEO_FRAME_DELAY_STR
3665-
)
3666-
MSG_HASH(
3667-
MENU_ENUM_LABEL_VIDEO_FRAME_DELAY_AUTO,
3668-
MENU_ENUM_LABEL_VIDEO_FRAME_DELAY_AUTO_STR
3669-
)
36703634
MSG_HASH(
36713635
MENU_ENUM_LABEL_VIDEO_GAMMA,
36723636
MENU_ENUM_LABEL_VIDEO_GAMMA_STR
@@ -4245,14 +4209,6 @@ MSG_HASH(
42454209
MENU_ENUM_LABEL_MEMORY_SHOW,
42464210
MENU_ENUM_LABEL_MEMORY_SHOW_STR
42474211
)
4248-
MSG_HASH(
4249-
MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY,
4250-
MENU_ENUM_LABEL_AUDIO_RESAMPLER_QUALITY_STR
4251-
)
4252-
MSG_HASH(
4253-
MENU_ENUM_LABEL_AUDIO_FASTPATH_S16,
4254-
MENU_ENUM_LABEL_AUDIO_FASTPATH_S16_STR
4255-
)
42564212
MSG_HASH(
42574213
MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC,
42584214
MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC_STR
@@ -4483,10 +4439,6 @@ MSG_HASH(
44834439
MENU_ENUM_LABEL_JOYPAD_DRIVER_NULL_STR
44844440
)
44854441

4486-
MSG_HASH(
4487-
MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL,
4488-
MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL_STR
4489-
)
44904442
MSG_HASH(
44914443
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS,
44924444
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS_STR

‎intl/msg_hash_us.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,12 @@ 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_menu_scroll.h"
563+
#include "../settings/settings_def_menu_thumbnails.h"
564+
#include "../settings/settings_def_input_turbo.h"
565+
#include "../settings/settings_def_frame_delay.h"
566+
#include "../settings/settings_def_audio_wasapi.h"
567+
#include "../settings/settings_def_audio_resampler_quality.h"
562568
#include "../settings/settings_def_wallpaper_opacity.h"
563569
#include "../settings/settings_def_overlay_opacity.h"
564570
#include "../settings/settings_def_widget_scale_windowed.h"
@@ -783,6 +789,12 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
783789
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
784790
#include "../settings/settings_def_video_fullscreen.h"
785791
#include "../settings/settings_def_video_sync.h"
792+
#include "../settings/settings_def_menu_scroll.h"
793+
#include "../settings/settings_def_menu_thumbnails.h"
794+
#include "../settings/settings_def_input_turbo.h"
795+
#include "../settings/settings_def_frame_delay.h"
796+
#include "../settings/settings_def_audio_wasapi.h"
797+
#include "../settings/settings_def_audio_resampler_quality.h"
786798
#include "../settings/settings_def_wallpaper_opacity.h"
787799
#include "../settings/settings_def_overlay_opacity.h"
788800
#include "../settings/settings_def_widget_scale_windowed.h"

0 commit comments

Comments
 (0)