Skip to content

Commit fe0d5d3

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 9a89381 commit fe0d5d3

12 files changed

Lines changed: 1871 additions & 183 deletions

‎configuration.c‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1958,6 +1958,21 @@ static struct config_bool_setting *populate_settings_bool(
19581958
#include "settings/settings_def_video_fullscreen.h"
19591959
#define SETTINGS_DEF_CONFIG_PASS
19601960
#include "settings/settings_def_video_sync.h"
1961+
#ifdef HAVE_MENU
1962+
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
1963+
#include "settings/settings_def_playlist_flags.h"
1964+
#endif
1965+
#endif
1966+
#include "settings/settings_def_notification_enable.h"
1967+
#ifdef HAVE_MENU
1968+
#include "settings/settings_def_rgui_particle_effect.h"
1969+
#endif
1970+
#ifdef HAVE_MENU
1971+
#include "settings/settings_def_menu_savestate_resume.h"
1972+
#endif
1973+
#ifdef HAVE_MENU
1974+
#include "settings/settings_def_menu_framebuffer_opacity.h"
1975+
#endif
19611976
#include "settings/settings_def_input_haptics.h"
19621977
#include "settings/settings_def_input_general.h"
19631978
#ifdef HAVE_MENU
@@ -2338,7 +2353,6 @@ static struct config_bool_setting *populate_settings_bool(
23382353
SETTING_BOOL("video_window_save_positions", &settings->bools.video_window_save_positions, true, DEFAULT_WINDOW_SAVE_POSITIONS, false);
23392354

23402355
SETTING_BOOL("menu_enable_widgets", &settings->bools.menu_enable_widgets, true, DEFAULT_MENU_ENABLE_WIDGETS, false);
2341-
SETTING_BOOL("menu_widget_scale_auto", &settings->bools.menu_widget_scale_auto, true, DEFAULT_MENU_WIDGET_SCALE_AUTO, false);
23422356
SETTING_BOOL("menu_show_load_content_animation", &settings->bools.menu_show_load_content_animation, true, DEFAULT_MENU_SHOW_LOAD_CONTENT_ANIMATION, false);
23432357
SETTING_BOOL("notification_show_autoconfig", &settings->bools.notification_show_autoconfig, true, DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG, false);
23442358
SETTING_BOOL("notification_show_autoconfig_fails", &settings->bools.notification_show_autoconfig_fails, true, DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG_FAILS, false);
@@ -2388,7 +2402,6 @@ static struct config_bool_setting *populate_settings_bool(
23882402

23892403
SETTING_BOOL("menu_show_quit_retroarch", &settings->bools.menu_show_quit_retroarch, true, DEFAULT_MENU_SHOW_QUIT, false);
23902404
SETTING_BOOL("filter_by_current_core", &settings->bools.filter_by_current_core, true, DEFAULT_FILTER_BY_CURRENT_CORE, false);
2391-
SETTING_BOOL("menu_show_advanced_settings", &settings->bools.menu_show_advanced_settings, true, DEFAULT_SHOW_ADVANCED_SETTINGS, false);
23922405
#ifdef HAVE_MATERIALUI
23932406
SETTING_BOOL("materialui_icons_enable", &settings->bools.menu_materialui_icons_enable, true, DEFAULT_MATERIALUI_ICONS_ENABLE, false);
23942407
SETTING_BOOL("materialui_switch_icons", &settings->bools.menu_materialui_switch_icons, true, DEFAULT_MATERIALUI_SWITCH_ICONS, false);
@@ -2414,10 +2427,6 @@ static struct config_bool_setting *populate_settings_bool(
24142427
#ifdef HAVE_OZONE
24152428
SETTING_BOOL("ozone_scroll_content_metadata", &settings->bools.ozone_scroll_content_metadata, true, DEFAULT_OZONE_SCROLL_CONTENT_METADATA, false);
24162429
#endif
2417-
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
2418-
SETTING_BOOL("ozone_truncate_playlist_name", &settings->bools.ozone_truncate_playlist_name, true, DEFAULT_OZONE_TRUNCATE_PLAYLIST_NAME, false);
2419-
SETTING_BOOL("ozone_sort_after_truncate_playlist_name", &settings->bools.ozone_sort_after_truncate_playlist_name, true, DEFAULT_OZONE_SORT_AFTER_TRUNCATE_PLAYLIST_NAME, false);
2420-
#endif
24212430
#endif /* HAVE_MENU */
24222431

24232432
#ifdef HAVE_CHEEVOS
@@ -2572,6 +2581,21 @@ static struct config_float_setting *populate_settings_float(
25722581
#include "settings/settings_def_video_fullscreen.h"
25732582
#define SETTINGS_DEF_CONFIG_PASS
25742583
#include "settings/settings_def_video_sync.h"
2584+
#ifdef HAVE_MENU
2585+
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
2586+
#include "settings/settings_def_playlist_flags.h"
2587+
#endif
2588+
#endif
2589+
#include "settings/settings_def_notification_enable.h"
2590+
#ifdef HAVE_MENU
2591+
#include "settings/settings_def_rgui_particle_effect.h"
2592+
#endif
2593+
#ifdef HAVE_MENU
2594+
#include "settings/settings_def_menu_savestate_resume.h"
2595+
#endif
2596+
#ifdef HAVE_MENU
2597+
#include "settings/settings_def_menu_framebuffer_opacity.h"
2598+
#endif
25752599
#include "settings/settings_def_input_haptics.h"
25762600
#include "settings/settings_def_input_general.h"
25772601
#ifdef HAVE_MENU
@@ -2943,9 +2967,7 @@ static struct config_float_setting *populate_settings_float(
29432967
#undef S_FLOAT_EX_NS
29442968
#undef S_ACTION_EX
29452969
#undef S_ACTION_EX_NS
2946-
SETTING_FLOAT("menu_scale_factor", &settings->floats.menu_scale_factor, true, DEFAULT_MENU_SCALE_FACTOR, false);
29472970
SETTING_FLOAT("menu_widget_scale_factor", &settings->floats.menu_widget_scale_factor, true, DEFAULT_MENU_WIDGET_SCALE_FACTOR, false);
2948-
SETTING_FLOAT("menu_framebuffer_opacity", &settings->floats.menu_framebuffer_opacity, true, DEFAULT_MENU_FRAMEBUFFER_OPACITY, false);
29492971
SETTING_FLOAT("menu_footer_opacity", &settings->floats.menu_footer_opacity, true, DEFAULT_MENU_FOOTER_OPACITY, false);
29502972
SETTING_FLOAT("menu_header_opacity", &settings->floats.menu_header_opacity, true, DEFAULT_MENU_HEADER_OPACITY, false);
29512973
SETTING_FLOAT("menu_ticker_speed", &settings->floats.menu_ticker_speed, true, DEFAULT_MENU_TICKER_SPEED, false);
@@ -3155,6 +3177,21 @@ static struct config_uint_setting *populate_settings_uint(
31553177
#include "settings/settings_def_video_fullscreen.h"
31563178
#define SETTINGS_DEF_CONFIG_PASS
31573179
#include "settings/settings_def_video_sync.h"
3180+
#ifdef HAVE_MENU
3181+
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
3182+
#include "settings/settings_def_playlist_flags.h"
3183+
#endif
3184+
#endif
3185+
#include "settings/settings_def_notification_enable.h"
3186+
#ifdef HAVE_MENU
3187+
#include "settings/settings_def_rgui_particle_effect.h"
3188+
#endif
3189+
#ifdef HAVE_MENU
3190+
#include "settings/settings_def_menu_savestate_resume.h"
3191+
#endif
3192+
#ifdef HAVE_MENU
3193+
#include "settings/settings_def_menu_framebuffer_opacity.h"
3194+
#endif
31583195
#include "settings/settings_def_input_haptics.h"
31593196
#include "settings/settings_def_input_general.h"
31603197
#ifdef HAVE_MENU
@@ -3718,6 +3755,21 @@ static struct config_int_setting *populate_settings_int(
37183755
#include "settings/settings_def_video_fullscreen.h"
37193756
#define SETTINGS_DEF_CONFIG_PASS
37203757
#include "settings/settings_def_video_sync.h"
3758+
#ifdef HAVE_MENU
3759+
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
3760+
#include "settings/settings_def_playlist_flags.h"
3761+
#endif
3762+
#endif
3763+
#include "settings/settings_def_notification_enable.h"
3764+
#ifdef HAVE_MENU
3765+
#include "settings/settings_def_rgui_particle_effect.h"
3766+
#endif
3767+
#ifdef HAVE_MENU
3768+
#include "settings/settings_def_menu_savestate_resume.h"
3769+
#endif
3770+
#ifdef HAVE_MENU
3771+
#include "settings/settings_def_menu_framebuffer_opacity.h"
3772+
#endif
37213773
#include "settings/settings_def_input_haptics.h"
37223774
#include "settings/settings_def_input_general.h"
37233775
#ifdef HAVE_MENU
@@ -4126,6 +4178,21 @@ static struct config_int_setting *populate_settings_int(
41264178
#include "settings/settings_def_video_fullscreen.h"
41274179
#define SETTINGS_DEF_CONFIG_PASS
41284180
#include "settings/settings_def_video_sync.h"
4181+
#ifdef HAVE_MENU
4182+
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
4183+
#include "settings/settings_def_playlist_flags.h"
4184+
#endif
4185+
#endif
4186+
#include "settings/settings_def_notification_enable.h"
4187+
#ifdef HAVE_MENU
4188+
#include "settings/settings_def_rgui_particle_effect.h"
4189+
#endif
4190+
#ifdef HAVE_MENU
4191+
#include "settings/settings_def_menu_savestate_resume.h"
4192+
#endif
4193+
#ifdef HAVE_MENU
4194+
#include "settings/settings_def_menu_framebuffer_opacity.h"
4195+
#endif
41294196
#include "settings/settings_def_input_haptics.h"
41304197
#include "settings/settings_def_input_general.h"
41314198
#ifdef HAVE_MENU

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,14 +1382,6 @@ MSG_HASH(
13821382
MENU_ENUM_LABEL_SWITCH_INSTALLED_CORES_PFD,
13831383
MENU_ENUM_LABEL_SWITCH_INSTALLED_CORES_PFD_STR
13841384
)
1385-
MSG_HASH(
1386-
MENU_ENUM_LABEL_MENU_SCALE_FACTOR,
1387-
MENU_ENUM_LABEL_MENU_SCALE_FACTOR_STR
1388-
)
1389-
MSG_HASH(
1390-
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_AUTO,
1391-
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_AUTO_STR
1392-
)
13931385
MSG_HASH(
13941386
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR,
13951387
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_STR
@@ -1918,14 +1910,6 @@ MSG_HASH(
19181910
MENU_ENUM_LABEL_MAIN_MENU,
19191911
MENU_ENUM_LABEL_MAIN_MENU_STR
19201912
)
1921-
MSG_HASH(
1922-
MENU_ENUM_LABEL_OZONE_TRUNCATE_PLAYLIST_NAME,
1923-
MENU_ENUM_LABEL_OZONE_TRUNCATE_PLAYLIST_NAME_STR
1924-
)
1925-
MSG_HASH(
1926-
MENU_ENUM_LABEL_OZONE_SORT_AFTER_TRUNCATE_PLAYLIST_NAME,
1927-
MENU_ENUM_LABEL_OZONE_SORT_AFTER_TRUNCATE_PLAYLIST_NAME_STR
1928-
)
19291913
MSG_HASH(
19301914
MENU_ENUM_LABEL_OZONE_SCROLL_CONTENT_METADATA,
19311915
MENU_ENUM_LABEL_OZONE_SCROLL_CONTENT_METADATA_STR
@@ -2980,10 +2964,6 @@ MSG_HASH(
29802964
MENU_ENUM_LABEL_SETTINGS_TAB,
29812965
MENU_ENUM_LABEL_SETTINGS_TAB_STR
29822966
)
2983-
MSG_HASH(
2984-
MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS,
2985-
MENU_ENUM_LABEL_SHOW_ADVANCED_SETTINGS_STR
2986-
)
29872967
MSG_HASH(
29882968
MENU_ENUM_LABEL_SHOW_HIDDEN_FILES,
29892969
MENU_ENUM_LABEL_SHOW_HIDDEN_FILES_STR
@@ -3813,10 +3793,6 @@ MSG_HASH(
38133793
MENU_ENUM_LABEL_PLAYLIST_ENTRY_RENAME,
38143794
MENU_ENUM_LABEL_PLAYLIST_ENTRY_RENAME_STR
38153795
)
3816-
MSG_HASH(
3817-
MENU_ENUM_LABEL_MENU_FRAMEBUFFER_OPACITY,
3818-
MENU_ENUM_LABEL_MENU_FRAMEBUFFER_OPACITY_STR
3819-
)
38203796
MSG_HASH(
38213797
MENU_ENUM_LABEL_GOTO_FAVORITES,
38223798
MENU_ENUM_LABEL_GOTO_FAVORITES_STR
@@ -3897,10 +3873,6 @@ MSG_HASH(
38973873
MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING,
38983874
MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING_STR
38993875
)
3900-
MSG_HASH(
3901-
MENU_ENUM_LABEL_MENU_ENABLE_KIOSK_MODE,
3902-
MENU_ENUM_LABEL_MENU_ENABLE_KIOSK_MODE_STR
3903-
)
39043876
MSG_HASH(
39053877
MENU_ENUM_LABEL_MENU_DISABLE_KIOSK_MODE,
39063878
MENU_ENUM_LABEL_MENU_DISABLE_KIOSK_MODE_STR
@@ -4549,10 +4521,6 @@ MSG_HASH(
45494521
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS,
45504522
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS_STR
45514523
)
4552-
MSG_HASH(
4553-
MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE,
4554-
MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE_STR
4555-
)
45564524
MSG_HASH(
45574525
MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT_ANIMATION,
45584526
MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT_ANIMATION_STR

‎intl/msg_hash_us.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,11 @@ 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_playlist_flags.h"
563+
#include "../settings/settings_def_notification_enable.h"
564+
#include "../settings/settings_def_rgui_particle_effect.h"
565+
#include "../settings/settings_def_menu_savestate_resume.h"
566+
#include "../settings/settings_def_menu_framebuffer_opacity.h"
562567
#include "../settings/settings_def_input_haptics.h"
563568
#include "../settings/settings_def_input_general.h"
564569
#include "../settings/settings_def_ozone_appearance.h"
@@ -804,6 +809,11 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
804809
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
805810
#include "../settings/settings_def_video_fullscreen.h"
806811
#include "../settings/settings_def_video_sync.h"
812+
#include "../settings/settings_def_playlist_flags.h"
813+
#include "../settings/settings_def_notification_enable.h"
814+
#include "../settings/settings_def_rgui_particle_effect.h"
815+
#include "../settings/settings_def_menu_savestate_resume.h"
816+
#include "../settings/settings_def_menu_framebuffer_opacity.h"
807817
#include "../settings/settings_def_input_haptics.h"
808818
#include "../settings/settings_def_input_general.h"
809819
#include "../settings/settings_def_ozone_appearance.h"

0 commit comments

Comments
 (0)