Skip to content

Commit 9e4f2fa

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 7149548 commit 9e4f2fa

8 files changed

Lines changed: 589 additions & 263 deletions

File tree

‎configuration.c‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,6 +1932,11 @@ static struct config_bool_setting *populate_settings_bool(
19321932
#include "settings/settings_def_video_fullscreen.h"
19331933
#define SETTINGS_DEF_CONFIG_PASS
19341934
#include "settings/settings_def_video_sync.h"
1935+
#ifdef HAVE_MENU
1936+
#ifdef HAVE_OZONE
1937+
#include "settings/settings_def_ozone_typography.h"
1938+
#endif
1939+
#endif
19351940
#include "settings/settings_def_saving.h"
19361941
#include "settings/settings_def_notification_positions.h"
19371942
#include "settings/settings_def_menu_main_lists_4.h"
@@ -2466,9 +2471,6 @@ static struct config_bool_setting *populate_settings_bool(
24662471
SETTING_BOOL("rgui_switch_icons", &settings->bools.menu_rgui_switch_icons, true, DEFAULT_RGUI_SWITCH_ICONS, false);
24672472
SETTING_BOOL("rgui_particle_effect_screensaver", &settings->bools.menu_rgui_particle_effect_screensaver, true, DEFAULT_RGUI_PARTICLE_EFFECT_SCREENSAVER, false);
24682473
#endif
2469-
#ifdef HAVE_OZONE
2470-
SETTING_BOOL("ozone_scroll_content_metadata", &settings->bools.ozone_scroll_content_metadata, true, DEFAULT_OZONE_SCROLL_CONTENT_METADATA, false);
2471-
#endif
24722474
#endif /* HAVE_MENU */
24732475

24742476
#ifdef HAVE_CHEEVOS
@@ -2604,6 +2606,11 @@ static struct config_float_setting *populate_settings_float(
26042606
#include "settings/settings_def_video_fullscreen.h"
26052607
#define SETTINGS_DEF_CONFIG_PASS
26062608
#include "settings/settings_def_video_sync.h"
2609+
#ifdef HAVE_MENU
2610+
#ifdef HAVE_OZONE
2611+
#include "settings/settings_def_ozone_typography.h"
2612+
#endif
2613+
#endif
26072614
#include "settings/settings_def_saving.h"
26082615
#include "settings/settings_def_notification_positions.h"
26092616
#include "settings/settings_def_menu_main_lists_4.h"
@@ -3081,14 +3088,6 @@ static struct config_float_setting *populate_settings_float(
30813088
#endif
30823089
#ifdef HAVE_OZONE
30833090
SETTING_FLOAT("ozone_thumbnail_scale_factor", &settings->floats.ozone_thumbnail_scale_factor, true, DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR, false);
3084-
SETTING_FLOAT("ozone_padding_factor", &settings->floats.ozone_padding_factor, true, DEFAULT_OZONE_PADDING_FACTOR, false);
3085-
SETTING_FLOAT("ozone_font_scale_factor_global", &settings->floats.ozone_font_scale_factor_global, true, DEFAULT_OZONE_FONT_SCALE_FACTOR_GLOBAL, false);
3086-
SETTING_FLOAT("ozone_font_scale_factor_title", &settings->floats.ozone_font_scale_factor_title, true, DEFAULT_OZONE_FONT_SCALE_FACTOR_TITLE, false);
3087-
SETTING_FLOAT("ozone_font_scale_factor_sidebar", &settings->floats.ozone_font_scale_factor_sidebar, true, DEFAULT_OZONE_FONT_SCALE_FACTOR_SIDEBAR, false);
3088-
SETTING_FLOAT("ozone_font_scale_factor_label", &settings->floats.ozone_font_scale_factor_label, true, DEFAULT_OZONE_FONT_SCALE_FACTOR_LABEL, false);
3089-
SETTING_FLOAT("ozone_font_scale_factor_sublabel", &settings->floats.ozone_font_scale_factor_sublabel, true, DEFAULT_OZONE_FONT_SCALE_FACTOR_SUBLABEL, false);
3090-
SETTING_FLOAT("ozone_font_scale_factor_time", &settings->floats.ozone_font_scale_factor_time, true, DEFAULT_OZONE_FONT_SCALE_FACTOR_TIME, false);
3091-
SETTING_FLOAT("ozone_font_scale_factor_footer", &settings->floats.ozone_font_scale_factor_footer, true, DEFAULT_OZONE_FONT_SCALE_FACTOR_FOOTER, false);
30923091
#endif
30933092
#endif /* HAVE_MENU */
30943093

@@ -3159,11 +3158,6 @@ static struct config_uint_setting *populate_settings_uint(
31593158
SETTING_UINT("menu_xmb_thumbnail_scale_factor", &settings->uints.menu_xmb_thumbnail_scale_factor, true, DEFAULT_XMB_THUMBNAIL_SCALE_FACTOR, false);
31603159
SETTING_UINT("menu_shader_pipeline", &settings->uints.menu_xmb_shader_pipeline, true, DEFAULT_MENU_SHADER_PIPELINE, false);
31613160
#endif
3162-
#ifdef HAVE_OZONE
3163-
SETTING_UINT("ozone_header_icon", &settings->uints.menu_ozone_header_icon, true, DEFAULT_OZONE_HEADER_ICON, false);
3164-
SETTING_UINT("ozone_header_separator", &settings->uints.menu_ozone_header_separator, true, DEFAULT_OZONE_HEADER_SEPARATOR, false);
3165-
SETTING_UINT("ozone_font_scale", &settings->uints.menu_ozone_font_scale, true, DEFAULT_OZONE_FONT_SCALE, false);
3166-
#endif
31673161
#endif /* HAVE_MENU */
31683162

31693163
SETTING_UINT("audio_out_rate", &settings->uints.audio_output_sample_rate, true, DEFAULT_OUTPUT_RATE, false);
@@ -3230,6 +3224,11 @@ static struct config_uint_setting *populate_settings_uint(
32303224
#include "settings/settings_def_video_fullscreen.h"
32313225
#define SETTINGS_DEF_CONFIG_PASS
32323226
#include "settings/settings_def_video_sync.h"
3227+
#ifdef HAVE_MENU
3228+
#ifdef HAVE_OZONE
3229+
#include "settings/settings_def_ozone_typography.h"
3230+
#endif
3231+
#endif
32333232
#include "settings/settings_def_saving.h"
32343233
#include "settings/settings_def_notification_positions.h"
32353234
#include "settings/settings_def_menu_main_lists_4.h"
@@ -3864,6 +3863,11 @@ static struct config_int_setting *populate_settings_int(
38643863
#include "settings/settings_def_video_fullscreen.h"
38653864
#define SETTINGS_DEF_CONFIG_PASS
38663865
#include "settings/settings_def_video_sync.h"
3866+
#ifdef HAVE_MENU
3867+
#ifdef HAVE_OZONE
3868+
#include "settings/settings_def_ozone_typography.h"
3869+
#endif
3870+
#endif
38673871
#include "settings/settings_def_saving.h"
38683872
#include "settings/settings_def_notification_positions.h"
38693873
#include "settings/settings_def_menu_main_lists_4.h"
@@ -4370,6 +4374,11 @@ static struct config_int_setting *populate_settings_int(
43704374
#include "settings/settings_def_video_fullscreen.h"
43714375
#define SETTINGS_DEF_CONFIG_PASS
43724376
#include "settings/settings_def_video_sync.h"
4377+
#ifdef HAVE_MENU
4378+
#ifdef HAVE_OZONE
4379+
#include "settings/settings_def_ozone_typography.h"
4380+
#endif
4381+
#endif
43734382
#include "settings/settings_def_saving.h"
43744383
#include "settings/settings_def_notification_positions.h"
43754384
#include "settings/settings_def_menu_main_lists_4.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,6 @@ MSG_HASH(
55
MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME,
66
MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME_STR
77
)
8-
MSG_HASH(
9-
MENU_ENUM_LABEL_OZONE_HEADER_SEPARATOR,
10-
MENU_ENUM_LABEL_OZONE_HEADER_SEPARATOR_STR
11-
)
12-
MSG_HASH(
13-
MENU_ENUM_LABEL_OZONE_HEADER_ICON,
14-
MENU_ENUM_LABEL_OZONE_HEADER_ICON_STR
15-
)
16-
MSG_HASH(
17-
MENU_ENUM_LABEL_OZONE_PADDING_FACTOR,
18-
MENU_ENUM_LABEL_OZONE_PADDING_FACTOR_STR
19-
)
20-
MSG_HASH(
21-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_FOOTER,
22-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_FOOTER_STR
23-
)
24-
MSG_HASH(
25-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_TIME,
26-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_TIME_STR
27-
)
28-
MSG_HASH(
29-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_SUBLABEL,
30-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_SUBLABEL_STR
31-
)
32-
MSG_HASH(
33-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_LABEL,
34-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_LABEL_STR
35-
)
36-
MSG_HASH(
37-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_SIDEBAR,
38-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_SIDEBAR_STR
39-
)
40-
MSG_HASH(
41-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_TITLE,
42-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_TITLE_STR
43-
)
44-
MSG_HASH(
45-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_GLOBAL,
46-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_FACTOR_GLOBAL_STR
47-
)
48-
MSG_HASH(
49-
MENU_ENUM_LABEL_OZONE_FONT_SCALE,
50-
MENU_ENUM_LABEL_OZONE_FONT_SCALE_STR
51-
)
528
MSG_HASH(
539
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
5410
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU_STR
@@ -1720,14 +1676,6 @@ MSG_HASH(
17201676
MENU_ENUM_LABEL_MAIN_MENU,
17211677
MENU_ENUM_LABEL_MAIN_MENU_STR
17221678
)
1723-
MSG_HASH(
1724-
MENU_ENUM_LABEL_OZONE_SCROLL_CONTENT_METADATA,
1725-
MENU_ENUM_LABEL_OZONE_SCROLL_CONTENT_METADATA_STR
1726-
)
1727-
MSG_HASH(
1728-
MENU_ENUM_LABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
1729-
MENU_ENUM_LABEL_OZONE_THUMBNAIL_SCALE_FACTOR_STR
1730-
)
17311679
MSG_HASH(
17321680
MENU_ENUM_LABEL_MENU_DRIVER,
17331681
MENU_ENUM_LABEL_MENU_DRIVER_STR

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ 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_ozone_typography.h"
562563
#include "../settings/settings_def_saving.h"
563564
#include "../settings/settings_def_notification_positions.h"
564565
#include "../settings/settings_def_menu_main_lists_4.h"
@@ -870,6 +871,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
870871
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
871872
#include "../settings/settings_def_video_fullscreen.h"
872873
#include "../settings/settings_def_video_sync.h"
874+
#include "../settings/settings_def_ozone_typography.h"
873875
#include "../settings/settings_def_saving.h"
874876
#include "../settings/settings_def_notification_positions.h"
875877
#include "../settings/settings_def_menu_main_lists_4.h"

0 commit comments

Comments
 (0)