Skip to content

Commit 0bcfb82

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate a batch of extended-row tables to single-source def files
Record quality, stream quality, record threads, the RGUI aspect ratio group, RGUI and XMB color themes, the XMB animation group and the XMB shader pipeline. 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 6712969 commit 0bcfb82

15 files changed

Lines changed: 3082 additions & 421 deletions

‎configuration.c‎

Lines changed: 100 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,26 @@ static struct config_bool_setting *populate_settings_bool(
19771977
#include "settings/settings_def_video_fullscreen.h"
19781978
#define SETTINGS_DEF_CONFIG_PASS
19791979
#include "settings/settings_def_video_sync.h"
1980+
#ifdef HAVE_MENU
1981+
#ifdef HAVE_XMB
1982+
#include "settings/settings_def_xmb_color_theme.h"
1983+
#endif
1984+
#endif
1985+
#include "settings/settings_def_xmb_shader_pipeline.h"
1986+
#include "settings/settings_def_xmb_animations.h"
1987+
#ifdef HAVE_MENU
1988+
#ifdef HAVE_RGUI
1989+
#include "settings/settings_def_rgui_color_theme.h"
1990+
#endif
1991+
#endif
1992+
#ifdef HAVE_MENU
1993+
#ifdef HAVE_RGUI
1994+
#include "settings/settings_def_rgui_aspect.h"
1995+
#endif
1996+
#endif
1997+
#include "settings/settings_def_record_threads.h"
1998+
#include "settings/settings_def_stream_quality.h"
1999+
#include "settings/settings_def_record_quality.h"
19802000
#include "settings/settings_def_input_touch_scale.h"
19812001
#ifdef GEKKO
19822002
#include "settings/settings_def_input_mouse_scale.h"
@@ -2539,6 +2559,26 @@ static struct config_float_setting *populate_settings_float(
25392559
#include "settings/settings_def_video_fullscreen.h"
25402560
#define SETTINGS_DEF_CONFIG_PASS
25412561
#include "settings/settings_def_video_sync.h"
2562+
#ifdef HAVE_MENU
2563+
#ifdef HAVE_XMB
2564+
#include "settings/settings_def_xmb_color_theme.h"
2565+
#endif
2566+
#endif
2567+
#include "settings/settings_def_xmb_shader_pipeline.h"
2568+
#include "settings/settings_def_xmb_animations.h"
2569+
#ifdef HAVE_MENU
2570+
#ifdef HAVE_RGUI
2571+
#include "settings/settings_def_rgui_color_theme.h"
2572+
#endif
2573+
#endif
2574+
#ifdef HAVE_MENU
2575+
#ifdef HAVE_RGUI
2576+
#include "settings/settings_def_rgui_aspect.h"
2577+
#endif
2578+
#endif
2579+
#include "settings/settings_def_record_threads.h"
2580+
#include "settings/settings_def_stream_quality.h"
2581+
#include "settings/settings_def_record_quality.h"
25422582
#include "settings/settings_def_input_touch_scale.h"
25432583
#ifdef GEKKO
25442584
#include "settings/settings_def_input_mouse_scale.h"
@@ -2945,12 +2985,9 @@ static struct config_uint_setting *populate_settings_uint(
29452985
SETTING_UINT("menu_remember_selection", &settings->uints.menu_remember_selection, true, DEFAULT_MENU_REMEMBER_SELECTION, false);
29462986
SETTING_UINT("menu_startup_page", &settings->uints.menu_startup_page, true, DEFAULT_MENU_STARTUP_PAGE, false);
29472987
#ifdef HAVE_RGUI
2948-
SETTING_UINT("rgui_menu_color_theme", &settings->uints.menu_rgui_color_theme, true, DEFAULT_RGUI_COLOR_THEME, false);
29492988
SETTING_UINT("rgui_thumbnail_downscaler", &settings->uints.menu_rgui_thumbnail_downscaler, true, DEFAULT_RGUI_THUMBNAIL_DOWNSCALER, false);
29502989
SETTING_UINT("rgui_thumbnail_delay", &settings->uints.menu_rgui_thumbnail_delay, true, DEFAULT_RGUI_THUMBNAIL_DELAY, false);
29512990
SETTING_UINT("rgui_internal_upscale_level", &settings->uints.menu_rgui_internal_upscale_level, true, DEFAULT_RGUI_INTERNAL_UPSCALE_LEVEL, false);
2952-
SETTING_UINT("rgui_aspect_ratio", &settings->uints.menu_rgui_aspect_ratio, true, DEFAULT_RGUI_ASPECT, false);
2953-
SETTING_UINT("rgui_aspect_ratio_lock", &settings->uints.menu_rgui_aspect_ratio_lock, true, DEFAULT_RGUI_ASPECT_LOCK, false);
29542991
SETTING_UINT("rgui_particle_effect", &settings->uints.menu_rgui_particle_effect, true, DEFAULT_RGUI_PARTICLE_EFFECT, false);
29552992
#endif
29562993
#ifdef HAVE_XMB
@@ -2963,7 +3000,6 @@ static struct config_uint_setting *populate_settings_uint(
29633000
SETTING_UINT("xmb_current_menu_icon", &settings->uints.menu_xmb_current_menu_icon, true, DEFAULT_XMB_CURRENT_MENU_ICON, false);
29643001
SETTING_UINT("xmb_layout", &settings->uints.menu_xmb_layout, true, DEFAULT_XMB_MENU_LAYOUT, false);
29653002
SETTING_UINT("xmb_theme", &settings->uints.menu_xmb_theme, true, DEFAULT_XMB_ICON_THEME, false);
2966-
SETTING_UINT("xmb_menu_color_theme", &settings->uints.menu_xmb_color_theme, true, DEFAULT_XMB_THEME, false);
29673003
SETTING_UINT("menu_shader_pipeline", &settings->uints.menu_xmb_shader_pipeline, true, DEFAULT_MENU_SHADER_PIPELINE, false);
29683004
SETTING_UINT("menu_font_color_red", &settings->uints.menu_font_color_red, true, DEFAULT_MENU_FONT_COLOR_RED, false);
29693005
SETTING_UINT("menu_font_color_green", &settings->uints.menu_font_color_green, true, DEFAULT_MENU_FONT_COLOR_GREEN, false);
@@ -3064,6 +3100,26 @@ static struct config_uint_setting *populate_settings_uint(
30643100
#include "settings/settings_def_video_fullscreen.h"
30653101
#define SETTINGS_DEF_CONFIG_PASS
30663102
#include "settings/settings_def_video_sync.h"
3103+
#ifdef HAVE_MENU
3104+
#ifdef HAVE_XMB
3105+
#include "settings/settings_def_xmb_color_theme.h"
3106+
#endif
3107+
#endif
3108+
#include "settings/settings_def_xmb_shader_pipeline.h"
3109+
#include "settings/settings_def_xmb_animations.h"
3110+
#ifdef HAVE_MENU
3111+
#ifdef HAVE_RGUI
3112+
#include "settings/settings_def_rgui_color_theme.h"
3113+
#endif
3114+
#endif
3115+
#ifdef HAVE_MENU
3116+
#ifdef HAVE_RGUI
3117+
#include "settings/settings_def_rgui_aspect.h"
3118+
#endif
3119+
#endif
3120+
#include "settings/settings_def_record_threads.h"
3121+
#include "settings/settings_def_stream_quality.h"
3122+
#include "settings/settings_def_record_quality.h"
30673123
#include "settings/settings_def_input_touch_scale.h"
30683124
#ifdef GEKKO
30693125
#include "settings/settings_def_input_mouse_scale.h"
@@ -3338,9 +3394,6 @@ static struct config_uint_setting *populate_settings_uint(
33383394
SETTING_UINT("video_msg_bgcolor_blue", &settings->uints.video_msg_bgcolor_blue, true, DEFAULT_MESSAGE_BGCOLOR_BLUE, false);
33393395

33403396
SETTING_UINT("video_stream_port", &settings->uints.video_stream_port, true, RARCH_STREAM_DEFAULT_PORT, false);
3341-
SETTING_UINT("video_record_threads", &settings->uints.video_record_threads, true, DEFAULT_VIDEO_RECORD_THREADS, false);
3342-
SETTING_UINT("video_record_quality", &settings->uints.video_record_quality, true, RECORD_CONFIG_TYPE_RECORDING_MED_QUALITY, false);
3343-
SETTING_UINT("video_stream_quality", &settings->uints.video_stream_quality, true, RECORD_CONFIG_TYPE_STREAMING_MED_QUALITY, false);
33443397
SETTING_UINT("video_record_scale_factor", &settings->uints.video_record_scale_factor, true, 1, false);
33453398
SETTING_UINT("video_stream_scale_factor", &settings->uints.video_stream_scale_factor, true, 1, false);
33463399

@@ -3552,6 +3605,26 @@ static struct config_int_setting *populate_settings_int(
35523605
#include "settings/settings_def_video_fullscreen.h"
35533606
#define SETTINGS_DEF_CONFIG_PASS
35543607
#include "settings/settings_def_video_sync.h"
3608+
#ifdef HAVE_MENU
3609+
#ifdef HAVE_XMB
3610+
#include "settings/settings_def_xmb_color_theme.h"
3611+
#endif
3612+
#endif
3613+
#include "settings/settings_def_xmb_shader_pipeline.h"
3614+
#include "settings/settings_def_xmb_animations.h"
3615+
#ifdef HAVE_MENU
3616+
#ifdef HAVE_RGUI
3617+
#include "settings/settings_def_rgui_color_theme.h"
3618+
#endif
3619+
#endif
3620+
#ifdef HAVE_MENU
3621+
#ifdef HAVE_RGUI
3622+
#include "settings/settings_def_rgui_aspect.h"
3623+
#endif
3624+
#endif
3625+
#include "settings/settings_def_record_threads.h"
3626+
#include "settings/settings_def_stream_quality.h"
3627+
#include "settings/settings_def_record_quality.h"
35553628
#include "settings/settings_def_input_touch_scale.h"
35563629
#ifdef GEKKO
35573630
#include "settings/settings_def_input_mouse_scale.h"
@@ -3858,6 +3931,26 @@ static struct config_int_setting *populate_settings_int(
38583931
#include "settings/settings_def_video_fullscreen.h"
38593932
#define SETTINGS_DEF_CONFIG_PASS
38603933
#include "settings/settings_def_video_sync.h"
3934+
#ifdef HAVE_MENU
3935+
#ifdef HAVE_XMB
3936+
#include "settings/settings_def_xmb_color_theme.h"
3937+
#endif
3938+
#endif
3939+
#include "settings/settings_def_xmb_shader_pipeline.h"
3940+
#include "settings/settings_def_xmb_animations.h"
3941+
#ifdef HAVE_MENU
3942+
#ifdef HAVE_RGUI
3943+
#include "settings/settings_def_rgui_color_theme.h"
3944+
#endif
3945+
#endif
3946+
#ifdef HAVE_MENU
3947+
#ifdef HAVE_RGUI
3948+
#include "settings/settings_def_rgui_aspect.h"
3949+
#endif
3950+
#endif
3951+
#include "settings/settings_def_record_threads.h"
3952+
#include "settings/settings_def_stream_quality.h"
3953+
#include "settings/settings_def_record_quality.h"
38613954
#include "settings/settings_def_input_touch_scale.h"
38623955
#ifdef GEKKO
38633956
#include "settings/settings_def_input_mouse_scale.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,10 +2046,6 @@ MSG_HASH(
20462046
MENU_ENUM_LABEL_MAIN_MENU,
20472047
MENU_ENUM_LABEL_MAIN_MENU_STR
20482048
)
2049-
MSG_HASH(
2050-
MENU_ENUM_LABEL_RGUI_MENU_COLOR_THEME,
2051-
MENU_ENUM_LABEL_RGUI_MENU_COLOR_THEME_STR
2052-
)
20532049
MSG_HASH(
20542050
MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME,
20552051
MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME_STR
@@ -3931,14 +3927,6 @@ MSG_HASH(
39313927
MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS,
39323928
MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS_STR
39333929
)
3934-
MSG_HASH(
3935-
MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME,
3936-
MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME_STR
3937-
)
3938-
MSG_HASH(
3939-
MENU_ENUM_LABEL_XMB_RIBBON_ENABLE,
3940-
MENU_ENUM_LABEL_XMB_RIBBON_ENABLE_STR
3941-
)
39423930
MSG_HASH(
39433931
MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE,
39443932
MENU_ENUM_LABEL_XMB_SHADOWS_ENABLE_STR
@@ -4543,14 +4531,6 @@ MSG_HASH(
45434531
MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL,
45444532
MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL_STR
45454533
)
4546-
MSG_HASH(
4547-
MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO,
4548-
MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_STR
4549-
)
4550-
MSG_HASH(
4551-
MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_LOCK,
4552-
MENU_ENUM_LABEL_MENU_RGUI_ASPECT_RATIO_LOCK_STR
4553-
)
45544534
MSG_HASH(
45554535
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS,
45564536
MENU_ENUM_LABEL_MENU_RGUI_SHADOWS_STR
@@ -4823,14 +4803,6 @@ MSG_HASH(
48234803
MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
48244804
MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE_STR
48254805
)
4826-
MSG_HASH(
4827-
MENU_ENUM_LABEL_VIDEO_RECORD_QUALITY,
4828-
MENU_ENUM_LABEL_VIDEO_RECORD_QUALITY_STR
4829-
)
4830-
MSG_HASH(
4831-
MENU_ENUM_LABEL_VIDEO_STREAM_QUALITY,
4832-
MENU_ENUM_LABEL_VIDEO_STREAM_QUALITY_STR
4833-
)
48344806
MSG_HASH(
48354807
MENU_ENUM_LABEL_UDP_STREAM_PORT,
48364808
MENU_ENUM_LABEL_UDP_STREAM_PORT_STR
@@ -5061,22 +5033,6 @@ MSG_HASH(
50615033
MENU_ENUM_LABEL_SCAN_SERIAL_AND_CRC,
50625034
MENU_ENUM_LABEL_SCAN_SERIAL_AND_CRC_STR
50635035
)
5064-
MSG_HASH(
5065-
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT,
5066-
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_HORIZONTAL_HIGHLIGHT_STR
5067-
)
5068-
MSG_HASH(
5069-
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_MOVE_UP_DOWN,
5070-
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_MOVE_UP_DOWN_STR
5071-
)
5072-
MSG_HASH(
5073-
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU,
5074-
MENU_ENUM_LABEL_MENU_XMB_ANIMATION_OPENING_MAIN_MENU_STR
5075-
)
5076-
MSG_HASH(
5077-
MENU_ENUM_LABEL_VIDEO_RECORD_THREADS,
5078-
MENU_ENUM_LABEL_VIDEO_RECORD_THREADS_STR
5079-
)
50805036
MSG_HASH(
50815037
MENU_ENUM_LABEL_VIDEO_GPU_INDEX,
50825038
MENU_ENUM_LABEL_VIDEO_GPU_INDEX_STR

‎intl/msg_hash_us.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,14 @@ 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_xmb_color_theme.h"
563+
#include "../settings/settings_def_xmb_shader_pipeline.h"
564+
#include "../settings/settings_def_xmb_animations.h"
565+
#include "../settings/settings_def_rgui_color_theme.h"
566+
#include "../settings/settings_def_rgui_aspect.h"
567+
#include "../settings/settings_def_record_threads.h"
568+
#include "../settings/settings_def_stream_quality.h"
569+
#include "../settings/settings_def_record_quality.h"
562570
#include "../settings/settings_def_input_touch_scale.h"
563571
#include "../settings/settings_def_input_mouse_scale.h"
564572
#include "../settings/settings_def_black_frame_insertion.h"
@@ -764,6 +772,14 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
764772
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
765773
#include "../settings/settings_def_video_fullscreen.h"
766774
#include "../settings/settings_def_video_sync.h"
775+
#include "../settings/settings_def_xmb_color_theme.h"
776+
#include "../settings/settings_def_xmb_shader_pipeline.h"
777+
#include "../settings/settings_def_xmb_animations.h"
778+
#include "../settings/settings_def_rgui_color_theme.h"
779+
#include "../settings/settings_def_rgui_aspect.h"
780+
#include "../settings/settings_def_record_threads.h"
781+
#include "../settings/settings_def_stream_quality.h"
782+
#include "../settings/settings_def_record_quality.h"
767783
#include "../settings/settings_def_input_touch_scale.h"
768784
#include "../settings/settings_def_input_mouse_scale.h"
769785
#include "../settings/settings_def_black_frame_insertion.h"

0 commit comments

Comments
 (0)