Skip to content

Commit ea93d64

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 ba18e27 commit ea93d64

8 files changed

Lines changed: 368 additions & 44 deletions

File tree

‎configuration.c‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,9 @@ 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_WINDOW_OFFSET
1981+
#include "settings/settings_def_video_window_offset.h"
1982+
#endif
19801983
#include "settings/settings_def_vulkan_gpu_index.h"
19811984
#ifdef HAVE_SMBCLIENT
19821985
#include "settings/settings_def_smb_client_auth.h"
@@ -2575,6 +2578,9 @@ static struct config_float_setting *populate_settings_float(
25752578
#include "settings/settings_def_video_fullscreen.h"
25762579
#define SETTINGS_DEF_CONFIG_PASS
25772580
#include "settings/settings_def_video_sync.h"
2581+
#ifdef HAVE_WINDOW_OFFSET
2582+
#include "settings/settings_def_video_window_offset.h"
2583+
#endif
25782584
#include "settings/settings_def_vulkan_gpu_index.h"
25792585
#ifdef HAVE_SMBCLIENT
25802586
#include "settings/settings_def_smb_client_auth.h"
@@ -3128,6 +3134,9 @@ static struct config_uint_setting *populate_settings_uint(
31283134
#include "settings/settings_def_video_fullscreen.h"
31293135
#define SETTINGS_DEF_CONFIG_PASS
31303136
#include "settings/settings_def_video_sync.h"
3137+
#ifdef HAVE_WINDOW_OFFSET
3138+
#include "settings/settings_def_video_window_offset.h"
3139+
#endif
31313140
#include "settings/settings_def_vulkan_gpu_index.h"
31323141
#ifdef HAVE_SMBCLIENT
31333142
#include "settings/settings_def_smb_client_auth.h"
@@ -3600,10 +3609,6 @@ static struct config_int_setting *populate_settings_int(
36003609
SETTING_INT("crt_switch_center_adjust", &settings->ints.crt_switch_center_adjust, false, DEFAULT_CRT_SWITCH_CENTER_ADJUST, false);
36013610
SETTING_INT("crt_switch_porch_adjust", &settings->ints.crt_switch_porch_adjust, false, DEFAULT_CRT_SWITCH_PORCH_ADJUST, false);
36023611
SETTING_INT("crt_switch_vertical_adjust", &settings->ints.crt_switch_vertical_adjust, false, DEFAULT_CRT_SWITCH_VERTICAL_ADJUST, false);
3603-
#ifdef HAVE_WINDOW_OFFSET
3604-
SETTING_INT("video_window_offset_x", &settings->ints.video_window_offset_x, true, DEFAULT_WINDOW_OFFSET_X, false);
3605-
SETTING_INT("video_window_offset_y", &settings->ints.video_window_offset_y, true, DEFAULT_WINDOW_OFFSET_Y, false);
3606-
#endif
36073612
/* GENERATED: single-source setting rows (int kind emits here) */
36083613
#define S_BOOL(f, T, n, d, sd, df, c, us, sub)
36093614
#define S_BOOL_NS(f, T, n, d, sd, df, c, us)
@@ -3642,6 +3647,9 @@ static struct config_int_setting *populate_settings_int(
36423647
#include "settings/settings_def_video_fullscreen.h"
36433648
#define SETTINGS_DEF_CONFIG_PASS
36443649
#include "settings/settings_def_video_sync.h"
3650+
#ifdef HAVE_WINDOW_OFFSET
3651+
#include "settings/settings_def_video_window_offset.h"
3652+
#endif
36453653
#include "settings/settings_def_vulkan_gpu_index.h"
36463654
#ifdef HAVE_SMBCLIENT
36473655
#include "settings/settings_def_smb_client_auth.h"
@@ -3984,6 +3992,9 @@ static struct config_int_setting *populate_settings_int(
39843992
#include "settings/settings_def_video_fullscreen.h"
39853993
#define SETTINGS_DEF_CONFIG_PASS
39863994
#include "settings/settings_def_video_sync.h"
3995+
#ifdef HAVE_WINDOW_OFFSET
3996+
#include "settings/settings_def_video_window_offset.h"
3997+
#endif
39873998
#include "settings/settings_def_vulkan_gpu_index.h"
39883999
#ifdef HAVE_SMBCLIENT
39894000
#include "settings/settings_def_smb_client_auth.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3691,14 +3691,6 @@ MSG_HASH(
36913691
MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y,
36923692
MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y_STR
36933693
)
3694-
MSG_HASH(
3695-
MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_X,
3696-
MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_X_STR
3697-
)
3698-
MSG_HASH(
3699-
MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_Y,
3700-
MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_Y_STR
3701-
)
37023694
MSG_HASH(
37033695
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE,
37043696
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_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_video_window_offset.h"
562563
#include "../settings/settings_def_vulkan_gpu_index.h"
563564
#include "../settings/settings_def_smb_client_auth.h"
564565
#include "../settings/settings_def_midi_volume.h"
@@ -778,6 +779,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
778779
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
779780
#include "../settings/settings_def_video_fullscreen.h"
780781
#include "../settings/settings_def_video_sync.h"
782+
#include "../settings/settings_def_video_window_offset.h"
781783
#include "../settings/settings_def_vulkan_gpu_index.h"
782784
#include "../settings/settings_def_smb_client_auth.h"
783785
#include "../settings/settings_def_midi_volume.h"

‎intl/msg_hash_us.h‎

Lines changed: 109 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,22 +3853,115 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
38533853
#undef S_ACTION_EX
38543854
#undef S_ACTION_EX_NS
38553855
#undef SETTINGS_DEF_STRINGS_PASS
3856-
MSG_HASH(
3857-
MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_OFFSET_X,
3858-
"Screen Horizontal Offset"
3859-
)
3860-
MSG_HASH(
3861-
MENU_ENUM_SUBLABEL_VIDEO_WINDOW_OFFSET_X,
3862-
"Forces a certain offset horizontally to the video. The offset is applied globally."
3863-
)
3864-
MSG_HASH(
3865-
MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_OFFSET_Y,
3866-
"Screen Vertical Offset"
3867-
)
3868-
MSG_HASH(
3869-
MENU_ENUM_SUBLABEL_VIDEO_WINDOW_OFFSET_Y,
3870-
"Forces a certain offset vertically to the video. The offset is applied globally."
3871-
)
3856+
/* GENERATED REGION: window offset group (see settings_def_video_window_offset.h). */
3857+
#define SETTINGS_DEF_STRINGS_PASS
3858+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
3859+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3860+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3861+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
3862+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3863+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
3864+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3865+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3866+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
3867+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3868+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
3869+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3870+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3871+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
3872+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3873+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
3874+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3875+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3876+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
3877+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3878+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3879+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3880+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3881+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
3882+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3883+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
3884+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3885+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3886+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
3887+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3888+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3889+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3890+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3891+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
3892+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3893+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
3894+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3895+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3896+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
3897+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3898+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
3899+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3900+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3901+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
3902+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3903+
#define S_ACTION(T, n, us, sub) \
3904+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3905+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3906+
#define S_ACTION_NS(T, n, us) \
3907+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3908+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3909+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3910+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3911+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
3912+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3913+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3914+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3915+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3916+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
3917+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3918+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3919+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3920+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3921+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
3922+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3923+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3924+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3925+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3926+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
3927+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3928+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
3929+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3930+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3931+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
3932+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3933+
#include "../settings/settings_def_video_window_offset.h"
3934+
#undef S_BOOL
3935+
#undef S_BOOL_NS
3936+
#undef S_UINT
3937+
#undef S_UINT_NS
3938+
#undef S_INT
3939+
#undef S_INT_NS
3940+
#undef S_FLOAT
3941+
#undef S_FLOAT_NS
3942+
#undef S_STRING
3943+
#undef S_STRING_NS
3944+
#undef S_DIR
3945+
#undef S_DIR_NS
3946+
#undef S_STRING_P
3947+
#undef S_STRING_P_NS
3948+
#undef S_PATH
3949+
#undef S_PATH_NS
3950+
#undef S_PATH_DS
3951+
#undef S_PATH_DS_NS
3952+
#undef S_ACTION
3953+
#undef S_ACTION_NS
3954+
#undef S_BOOL_EX
3955+
#undef S_BOOL_EX_NS
3956+
#undef S_UINT_EX
3957+
#undef S_UINT_EX_NS
3958+
#undef S_INT_EX
3959+
#undef S_INT_EX_NS
3960+
#undef S_FLOAT_EX
3961+
#undef S_FLOAT_EX_NS
3962+
#undef S_ACTION_EX
3963+
#undef S_ACTION_EX_NS
3964+
#undef SETTINGS_DEF_STRINGS_PASS
38723965
MSG_HASH(
38733966
MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE,
38743967
"Vertical Refresh Rate"

‎menu/menu_setting.c‎

Lines changed: 92 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14886,18 +14886,98 @@ static bool setting_append_list(
1488614886
#if defined(HAVE_WINDOW_OFFSET)
1488714887
{
1488814888
static const setting_desc_t vid_desc_12[] = {
14889-
SDESC_INT_ROW_EX(video_window_offset_x, VIDEO_WINDOW_OFFSET_X,
14890-
DEFAULT_WINDOW_OFFSET_X,
14891-
SD_FLAG_NONE, SDESC_RANGE_MINMAX, 0,
14892-
-50, 50, 1, 0,
14893-
NULL, NULL,
14894-
NULL, NULL, NULL, NULL, 0),
14895-
SDESC_INT_ROW_EX(video_window_offset_y, VIDEO_WINDOW_OFFSET_Y,
14896-
DEFAULT_WINDOW_OFFSET_Y,
14897-
SD_FLAG_NONE, SDESC_RANGE_MINMAX, 0,
14898-
-50, 50, 1, 0,
14899-
NULL, NULL,
14900-
NULL, NULL, NULL, NULL, 0),
14889+
/* GENERATED: rows come from settings_def_video_window_offset.h in order. */
14890+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
14891+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
14892+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
14893+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
14894+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
14895+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14896+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
14897+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14898+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
14899+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14900+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
14901+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14902+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
14903+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
14904+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
14905+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
14906+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14907+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14908+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
14909+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14910+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
14911+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
14912+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
14913+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
14914+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14915+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14916+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
14917+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14918+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
14919+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
14920+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
14921+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
14922+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
14923+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
14924+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
14925+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
14926+
#define S_ACTION(T, n, us, sub) \
14927+
SDESC_ACTION_ROW(T),
14928+
#define S_ACTION_NS(T, n, us) \
14929+
SDESC_ACTION_ROW(T),
14930+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14931+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
14932+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
14933+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
14934+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14935+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14936+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
14937+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14938+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14939+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14940+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
14941+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14942+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14943+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
14944+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
14945+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
14946+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
14947+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
14948+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
14949+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
14950+
#include "../settings/settings_def_video_window_offset.h"
14951+
#undef S_BOOL
14952+
#undef S_BOOL_NS
14953+
#undef S_UINT
14954+
#undef S_UINT_NS
14955+
#undef S_INT
14956+
#undef S_INT_NS
14957+
#undef S_FLOAT
14958+
#undef S_FLOAT_NS
14959+
#undef S_STRING
14960+
#undef S_STRING_NS
14961+
#undef S_DIR
14962+
#undef S_DIR_NS
14963+
#undef S_STRING_P
14964+
#undef S_STRING_P_NS
14965+
#undef S_PATH
14966+
#undef S_PATH_NS
14967+
#undef S_PATH_DS
14968+
#undef S_PATH_DS_NS
14969+
#undef S_ACTION
14970+
#undef S_ACTION_NS
14971+
#undef S_BOOL_EX
14972+
#undef S_BOOL_EX_NS
14973+
#undef S_UINT_EX
14974+
#undef S_UINT_EX_NS
14975+
#undef S_INT_EX
14976+
#undef S_INT_EX_NS
14977+
#undef S_FLOAT_EX
14978+
#undef S_FLOAT_EX_NS
14979+
#undef S_ACTION_EX
14980+
#undef S_ACTION_EX_NS
1490114981
};
1490214982
settings_list_add_desc(list, list_info, settings,
1490314983
vid_desc_12, ARRAY_SIZE(vid_desc_12),

0 commit comments

Comments
 (0)