Skip to content

Commit 9ba039e

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 92036f6 commit 9ba039e

11 files changed

Lines changed: 1438 additions & 126 deletions

‎configuration.c‎

Lines changed: 60 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,18 @@ 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+
#include "settings/settings_def_wallpaper_opacity.h"
1982+
#endif
1983+
#ifdef HAVE_OVERLAY
1984+
#include "settings/settings_def_overlay_opacity.h"
1985+
#endif
1986+
#ifdef HAVE_MENU
1987+
#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
1988+
#include "settings/settings_def_widget_scale_windowed.h"
1989+
#endif
1990+
#endif
1991+
#include "settings/settings_def_video_hdr.h"
19801992
#ifdef HAVE_WINDOW_OFFSET
19811993
#include "settings/settings_def_video_window_offset.h"
19821994
#endif
@@ -2578,6 +2590,18 @@ static struct config_float_setting *populate_settings_float(
25782590
#include "settings/settings_def_video_fullscreen.h"
25792591
#define SETTINGS_DEF_CONFIG_PASS
25802592
#include "settings/settings_def_video_sync.h"
2593+
#ifdef HAVE_MENU
2594+
#include "settings/settings_def_wallpaper_opacity.h"
2595+
#endif
2596+
#ifdef HAVE_OVERLAY
2597+
#include "settings/settings_def_overlay_opacity.h"
2598+
#endif
2599+
#ifdef HAVE_MENU
2600+
#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
2601+
#include "settings/settings_def_widget_scale_windowed.h"
2602+
#endif
2603+
#endif
2604+
#include "settings/settings_def_video_hdr.h"
25812605
#ifdef HAVE_WINDOW_OFFSET
25822606
#include "settings/settings_def_video_window_offset.h"
25832607
#endif
@@ -2888,10 +2912,6 @@ static struct config_float_setting *populate_settings_float(
28882912
#undef S_ACTION_EX_NS
28892913
SETTING_FLOAT("menu_scale_factor", &settings->floats.menu_scale_factor, true, DEFAULT_MENU_SCALE_FACTOR, false);
28902914
SETTING_FLOAT("menu_widget_scale_factor", &settings->floats.menu_widget_scale_factor, true, DEFAULT_MENU_WIDGET_SCALE_FACTOR, false);
2891-
#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
2892-
SETTING_FLOAT("menu_widget_scale_factor_windowed", &settings->floats.menu_widget_scale_factor_windowed, true, DEFAULT_MENU_WIDGET_SCALE_FACTOR_WINDOWED, false);
2893-
#endif
2894-
SETTING_FLOAT("menu_wallpaper_opacity", &settings->floats.menu_wallpaper_opacity, true, DEFAULT_MENU_WALLPAPER_OPACITY, false);
28952915
SETTING_FLOAT("menu_framebuffer_opacity", &settings->floats.menu_framebuffer_opacity, true, DEFAULT_MENU_FRAMEBUFFER_OPACITY, false);
28962916
SETTING_FLOAT("menu_footer_opacity", &settings->floats.menu_footer_opacity, true, DEFAULT_MENU_FOOTER_OPACITY, false);
28972917
SETTING_FLOAT("menu_header_opacity", &settings->floats.menu_header_opacity, true, DEFAULT_MENU_HEADER_OPACITY, false);
@@ -2937,16 +2957,13 @@ static struct config_float_setting *populate_settings_float(
29372957
SETTING_FLOAT("video_message_pos_y", &settings->floats.video_msg_pos_y, true, DEFAULT_MESSAGE_POS_OFFSET_Y, false);
29382958
SETTING_FLOAT("video_font_size", &settings->floats.video_font_size, true, DEFAULT_FONT_SIZE, false);
29392959
SETTING_FLOAT("video_msg_bgcolor_opacity", &settings->floats.video_msg_bgcolor_opacity, true, DEFAULT_MESSAGE_BGCOLOR_OPACITY, false);
2940-
SETTING_FLOAT("video_hdr_menu_nits", &settings->floats.video_hdr_menu_nits, true, DEFAULT_MENU_HDR_BRIGHTNESS_NITS, false);
2941-
SETTING_FLOAT("video_hdr_paper_white_nits", &settings->floats.video_hdr_paper_white_nits, true, DEFAULT_VIDEO_HDR_PAPER_WHITE_NITS, false);
29422960

29432961
SETTING_FLOAT("input_axis_threshold", &settings->floats.input_axis_threshold, true, DEFAULT_AXIS_THRESHOLD, false);
29442962
SETTING_FLOAT("input_analog_deadzone", &settings->floats.input_analog_deadzone, true, DEFAULT_ANALOG_DEADZONE, false);
29452963
SETTING_FLOAT("input_analog_sensitivity", &settings->floats.input_analog_sensitivity, true, DEFAULT_ANALOG_SENSITIVITY, false);
29462964
SETTING_FLOAT("input_sensor_accelerometer_sensitivity",&settings->floats.input_sensor_accelerometer_sensitivity, true, DEFAULT_SENSOR_ACCELEROMETER_SENSITIVITY, false);
29472965
SETTING_FLOAT("input_sensor_gyroscope_sensitivity", &settings->floats.input_sensor_gyroscope_sensitivity, true, DEFAULT_SENSOR_GYROSCOPE_SENSITIVITY, false);
29482966
#ifdef HAVE_OVERLAY
2949-
SETTING_FLOAT("input_overlay_opacity", &settings->floats.input_overlay_opacity, true, DEFAULT_INPUT_OVERLAY_OPACITY, false);
29502967
SETTING_FLOAT("input_osk_overlay_opacity", &settings->floats.input_osk_overlay_opacity, true, DEFAULT_INPUT_OVERLAY_OPACITY, false);
29512968
SETTING_FLOAT("input_overlay_scale_landscape", &settings->floats.input_overlay_scale_landscape, true, DEFAULT_INPUT_OVERLAY_SCALE_LANDSCAPE, false);
29522969
SETTING_FLOAT("input_overlay_aspect_adjust_landscape", &settings->floats.input_overlay_aspect_adjust_landscape, true, DEFAULT_INPUT_OVERLAY_ASPECT_ADJUST_LANDSCAPE, false);
@@ -3134,6 +3151,18 @@ static struct config_uint_setting *populate_settings_uint(
31343151
#include "settings/settings_def_video_fullscreen.h"
31353152
#define SETTINGS_DEF_CONFIG_PASS
31363153
#include "settings/settings_def_video_sync.h"
3154+
#ifdef HAVE_MENU
3155+
#include "settings/settings_def_wallpaper_opacity.h"
3156+
#endif
3157+
#ifdef HAVE_OVERLAY
3158+
#include "settings/settings_def_overlay_opacity.h"
3159+
#endif
3160+
#ifdef HAVE_MENU
3161+
#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
3162+
#include "settings/settings_def_widget_scale_windowed.h"
3163+
#endif
3164+
#endif
3165+
#include "settings/settings_def_video_hdr.h"
31373166
#ifdef HAVE_WINDOW_OFFSET
31383167
#include "settings/settings_def_video_window_offset.h"
31393168
#endif
@@ -3452,7 +3481,6 @@ static struct config_uint_setting *populate_settings_uint(
34523481

34533482
SETTING_UINT("video_hdr_mode", &settings->uints.video_hdr_mode, true, DEFAULT_VIDEO_HDR_MODE, false);
34543483
SETTING_UINT("video_hdr_subpixel_layout", &settings->uints.video_hdr_subpixel_layout, true, DEFAULT_VIDEO_HDR_SUBPIXEL_LAYOUT, false);
3455-
SETTING_UINT("video_hdr_expand_gamut", &settings->uints.video_hdr_expand_gamut, true, DEFAULT_VIDEO_HDR_EXPAND_GAMUT, false);
34563484
#ifdef HAVE_NETWORKING
34573485
SETTING_UINT("streaming_mode", &settings->uints.streaming_mode, true, STREAMING_MODE_TWITCH, false);
34583486
#endif
@@ -3647,6 +3675,18 @@ static struct config_int_setting *populate_settings_int(
36473675
#include "settings/settings_def_video_fullscreen.h"
36483676
#define SETTINGS_DEF_CONFIG_PASS
36493677
#include "settings/settings_def_video_sync.h"
3678+
#ifdef HAVE_MENU
3679+
#include "settings/settings_def_wallpaper_opacity.h"
3680+
#endif
3681+
#ifdef HAVE_OVERLAY
3682+
#include "settings/settings_def_overlay_opacity.h"
3683+
#endif
3684+
#ifdef HAVE_MENU
3685+
#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
3686+
#include "settings/settings_def_widget_scale_windowed.h"
3687+
#endif
3688+
#endif
3689+
#include "settings/settings_def_video_hdr.h"
36503690
#ifdef HAVE_WINDOW_OFFSET
36513691
#include "settings/settings_def_video_window_offset.h"
36523692
#endif
@@ -3992,6 +4032,18 @@ static struct config_int_setting *populate_settings_int(
39924032
#include "settings/settings_def_video_fullscreen.h"
39934033
#define SETTINGS_DEF_CONFIG_PASS
39944034
#include "settings/settings_def_video_sync.h"
4035+
#ifdef HAVE_MENU
4036+
#include "settings/settings_def_wallpaper_opacity.h"
4037+
#endif
4038+
#ifdef HAVE_OVERLAY
4039+
#include "settings/settings_def_overlay_opacity.h"
4040+
#endif
4041+
#ifdef HAVE_MENU
4042+
#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
4043+
#include "settings/settings_def_widget_scale_windowed.h"
4044+
#endif
4045+
#endif
4046+
#include "settings/settings_def_video_hdr.h"
39954047
#ifdef HAVE_WINDOW_OFFSET
39964048
#include "settings/settings_def_video_window_offset.h"
39974049
#endif

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,10 +1446,6 @@ MSG_HASH(
14461446
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR,
14471447
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_STR
14481448
)
1449-
MSG_HASH(
1450-
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED,
1451-
MENU_ENUM_LABEL_MENU_WIDGET_SCALE_FACTOR_WINDOWED_STR
1452-
)
14531449
MSG_HASH(
14541450
MENU_ENUM_LABEL_DRIVER_SETTINGS,
14551451
MENU_ENUM_LABEL_DRIVER_SETTINGS_STR
@@ -2124,10 +2120,6 @@ MSG_HASH(
21242120
MENU_ENUM_LABEL_MENU_BOTTOM_SETTINGS_STR
21252121
)
21262122
#endif
2127-
MSG_HASH(
2128-
MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY,
2129-
MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY_STR
2130-
)
21312123
MSG_HASH(
21322124
MENU_ENUM_LABEL_MOUSE_ENABLE,
21332125
MENU_ENUM_LABEL_MOUSE_ENABLE_STR
@@ -2376,10 +2368,6 @@ MSG_HASH(
23762368
MENU_ENUM_LABEL_VIDEO_LAYOUT_DIRECTORY,
23772369
MENU_ENUM_LABEL_VIDEO_LAYOUT_DIRECTORY_STR
23782370
)
2379-
MSG_HASH(
2380-
MENU_ENUM_LABEL_OVERLAY_OPACITY,
2381-
MENU_ENUM_LABEL_OVERLAY_OPACITY_STR
2382-
)
23832371
MSG_HASH(
23842372
MENU_ENUM_LABEL_OSK_OVERLAY_OPACITY,
23852373
MENU_ENUM_LABEL_OSK_OVERLAY_OPACITY_STR
@@ -3883,18 +3871,6 @@ MSG_HASH(
38833871
MENU_ENUM_LABEL_MENU_FONT_COLOR_RED,
38843872
MENU_ENUM_LABEL_MENU_FONT_COLOR_RED_STR
38853873
)
3886-
MSG_HASH(
3887-
MENU_ENUM_LABEL_MENU_HDR_BRIGHTNESS_NITS,
3888-
MENU_ENUM_LABEL_MENU_HDR_BRIGHTNESS_NITS_STR
3889-
)
3890-
MSG_HASH(
3891-
MENU_ENUM_LABEL_VIDEO_HDR_EXPAND_GAMUT,
3892-
MENU_ENUM_LABEL_VIDEO_HDR_EXPAND_GAMUT_STR
3893-
)
3894-
MSG_HASH(
3895-
MENU_ENUM_LABEL_VIDEO_HDR_PAPER_WHITE_NITS,
3896-
MENU_ENUM_LABEL_VIDEO_HDR_PAPER_WHITE_NITS_STR
3897-
)
38983874
MSG_HASH(
38993875
MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN,
39003876
MENU_ENUM_LABEL_MENU_FONT_COLOR_GREEN_STR

‎intl/msg_hash_us.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,10 @@ 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_wallpaper_opacity.h"
563+
#include "../settings/settings_def_overlay_opacity.h"
564+
#include "../settings/settings_def_widget_scale_windowed.h"
565+
#include "../settings/settings_def_video_hdr.h"
562566
#include "../settings/settings_def_video_window_offset.h"
563567
#include "../settings/settings_def_vulkan_gpu_index.h"
564568
#include "../settings/settings_def_smb_client_auth.h"
@@ -779,6 +783,10 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
779783
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
780784
#include "../settings/settings_def_video_fullscreen.h"
781785
#include "../settings/settings_def_video_sync.h"
786+
#include "../settings/settings_def_wallpaper_opacity.h"
787+
#include "../settings/settings_def_overlay_opacity.h"
788+
#include "../settings/settings_def_widget_scale_windowed.h"
789+
#include "../settings/settings_def_video_hdr.h"
782790
#include "../settings/settings_def_video_window_offset.h"
783791
#include "../settings/settings_def_vulkan_gpu_index.h"
784792
#include "../settings/settings_def_smb_client_auth.h"

0 commit comments

Comments
 (0)