Skip to content

Commit 2315479

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the custom window size setting to a single-source def file
Performed by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage.
1 parent 2018641 commit 2315479

8 files changed

Lines changed: 349 additions & 18 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,7 @@ 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+
#include "settings/settings_def_video_window_custom_size.h"
19801981
#include "settings/settings_def_video_window_save_position.h"
19811982
#include "settings/settings_def_user_language_action.h"
19821983
#ifdef _3DS
@@ -2224,7 +2225,6 @@ static struct config_bool_setting *populate_settings_bool(
22242225
#endif
22252226
SETTING_BOOL("video_msg_bgcolor_enable", &settings->bools.video_msg_bgcolor_enable, true, DEFAULT_MESSAGE_BGCOLOR_ENABLE, false);
22262227
SETTING_BOOL("video_window_save_positions", &settings->bools.video_window_save_positions, true, DEFAULT_WINDOW_SAVE_POSITIONS, false);
2227-
SETTING_BOOL("video_window_custom_size_enable", &settings->bools.video_window_custom_size_enable, true, DEFAULT_WINDOW_CUSTOM_SIZE_ENABLE, false);
22282228

22292229
SETTING_BOOL("menu_enable_widgets", &settings->bools.menu_enable_widgets, true, DEFAULT_MENU_ENABLE_WIDGETS, false);
22302230
SETTING_BOOL("menu_widget_scale_auto", &settings->bools.menu_widget_scale_auto, true, DEFAULT_MENU_WIDGET_SCALE_AUTO, false);
@@ -2511,6 +2511,7 @@ static struct config_float_setting *populate_settings_float(
25112511
#include "settings/settings_def_video_fullscreen.h"
25122512
#define SETTINGS_DEF_CONFIG_PASS
25132513
#include "settings/settings_def_video_sync.h"
2514+
#include "settings/settings_def_video_window_custom_size.h"
25142515
#include "settings/settings_def_video_window_save_position.h"
25152516
#include "settings/settings_def_user_language_action.h"
25162517
#ifdef _3DS
@@ -3013,6 +3014,7 @@ static struct config_uint_setting *populate_settings_uint(
30133014
#include "settings/settings_def_video_fullscreen.h"
30143015
#define SETTINGS_DEF_CONFIG_PASS
30153016
#include "settings/settings_def_video_sync.h"
3017+
#include "settings/settings_def_video_window_custom_size.h"
30163018
#include "settings/settings_def_video_window_save_position.h"
30173019
#include "settings/settings_def_user_language_action.h"
30183020
#ifdef _3DS
@@ -3492,6 +3494,7 @@ static struct config_int_setting *populate_settings_int(
34923494
#include "settings/settings_def_video_fullscreen.h"
34933495
#define SETTINGS_DEF_CONFIG_PASS
34943496
#include "settings/settings_def_video_sync.h"
3497+
#include "settings/settings_def_video_window_custom_size.h"
34953498
#include "settings/settings_def_video_window_save_position.h"
34963499
#include "settings/settings_def_user_language_action.h"
34973500
#ifdef _3DS
@@ -3769,6 +3772,7 @@ static struct config_int_setting *populate_settings_int(
37693772
#include "settings/settings_def_video_fullscreen.h"
37703773
#define SETTINGS_DEF_CONFIG_PASS
37713774
#include "settings/settings_def_video_sync.h"
3775+
#include "settings/settings_def_video_window_custom_size.h"
37723776
#include "settings/settings_def_video_window_save_position.h"
37733777
#include "settings/settings_def_user_language_action.h"
37743778
#ifdef _3DS

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4607,10 +4607,6 @@ MSG_HASH(
46074607
MENU_ENUM_LABEL_JOYPAD_DRIVER_NULL_STR
46084608
)
46094609

4610-
MSG_HASH(
4611-
MENU_ENUM_LABEL_VIDEO_WINDOW_CUSTOM_SIZE_ENABLE,
4612-
MENU_ENUM_LABEL_VIDEO_WINDOW_CUSTOM_SIZE_ENABLE_STR
4613-
)
46144610
MSG_HASH(
46154611
MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL,
46164612
MENU_ENUM_LABEL_MENU_RGUI_INTERNAL_UPSCALE_LEVEL_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_custom_size.h"
562563
#include "../settings/settings_def_video_window_save_position.h"
563564
#include "../settings/settings_def_user_language_action.h"
564565
#include "../settings/settings_def_3ds_bottom_lcd.h"
@@ -749,6 +750,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
749750
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
750751
#include "../settings/settings_def_video_fullscreen.h"
751752
#include "../settings/settings_def_video_sync.h"
753+
#include "../settings/settings_def_video_window_custom_size.h"
752754
#include "../settings/settings_def_video_window_save_position.h"
753755
#include "../settings/settings_def_user_language_action.h"
754756
#include "../settings/settings_def_3ds_bottom_lcd.h"

‎intl/msg_hash_us.h‎

Lines changed: 109 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3535,14 +3535,115 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
35353535
#undef S_ACTION_EX
35363536
#undef S_ACTION_EX_NS
35373537
#undef SETTINGS_DEF_STRINGS_PASS
3538-
MSG_HASH(
3539-
MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_CUSTOM_SIZE_ENABLE,
3540-
"Use Custom Window Size"
3541-
)
3542-
MSG_HASH(
3543-
MENU_ENUM_SUBLABEL_VIDEO_WINDOW_CUSTOM_SIZE_ENABLE,
3544-
"Show all content in a fixed size window of dimensions specified by 'Window Width' and 'Window Height'. When disabled, window size will be set dynamically based on 'Windowed Scale'."
3545-
)
3538+
/* GENERATED REGION: custom window size setting (see settings_def_video_window_custom_size.h). */
3539+
#define SETTINGS_DEF_STRINGS_PASS
3540+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
3541+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3542+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3543+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
3544+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3545+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
3546+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3547+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3548+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
3549+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3550+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
3551+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3552+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3553+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
3554+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3555+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
3556+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3557+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3558+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
3559+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3560+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3561+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3562+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3563+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
3564+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3565+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
3566+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3567+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3568+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
3569+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3570+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3571+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3572+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3573+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
3574+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3575+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
3576+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3577+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3578+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
3579+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3580+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
3581+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3582+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3583+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
3584+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3585+
#define S_ACTION(T, n, us, sub) \
3586+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3587+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3588+
#define S_ACTION_NS(T, n, us) \
3589+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3590+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3591+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3592+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3593+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
3594+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3595+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3596+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3597+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3598+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
3599+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3600+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3601+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3602+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3603+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
3604+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3605+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
3606+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3607+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3608+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
3609+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3610+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
3611+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
3612+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3613+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
3614+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
3615+
#include "../settings/settings_def_video_window_custom_size.h"
3616+
#undef S_BOOL
3617+
#undef S_BOOL_NS
3618+
#undef S_UINT
3619+
#undef S_UINT_NS
3620+
#undef S_INT
3621+
#undef S_INT_NS
3622+
#undef S_FLOAT
3623+
#undef S_FLOAT_NS
3624+
#undef S_STRING
3625+
#undef S_STRING_NS
3626+
#undef S_DIR
3627+
#undef S_DIR_NS
3628+
#undef S_STRING_P
3629+
#undef S_STRING_P_NS
3630+
#undef S_PATH
3631+
#undef S_PATH_NS
3632+
#undef S_PATH_DS
3633+
#undef S_PATH_DS_NS
3634+
#undef S_ACTION
3635+
#undef S_ACTION_NS
3636+
#undef S_BOOL_EX
3637+
#undef S_BOOL_EX_NS
3638+
#undef S_UINT_EX
3639+
#undef S_UINT_EX_NS
3640+
#undef S_INT_EX
3641+
#undef S_INT_EX_NS
3642+
#undef S_FLOAT_EX
3643+
#undef S_FLOAT_EX_NS
3644+
#undef S_ACTION_EX
3645+
#undef S_ACTION_EX_NS
3646+
#undef SETTINGS_DEF_STRINGS_PASS
35463647

35473648
/* Settings > Video > Scaling */
35483649

‎menu/menu_setting.c‎

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14909,9 +14909,98 @@ static bool setting_append_list(
1490914909
#else
1491014910
{
1491114911
static const setting_desc_t vid_desc_17[] = {
14912-
SDESC_BOOL_ROW_EX(video_window_custom_size_enable, VIDEO_WINDOW_CUSTOM_SIZE_ENABLE,
14913-
DEFAULT_WINDOW_CUSTOM_SIZE_ENABLE, SD_FLAG_NONE, 0, CMD_EVENT_REINIT,
14914-
setting_bool_action_left_with_refresh, NULL, NULL, NULL, setting_bool_action_left_with_refresh, setting_bool_action_right_with_refresh, 0),
14912+
/* GENERATED: rows come from settings_def_video_window_custom_size.h in order. */
14913+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
14914+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
14915+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
14916+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
14917+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
14918+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14919+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
14920+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14921+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
14922+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14923+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
14924+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14925+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
14926+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
14927+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
14928+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
14929+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14930+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14931+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
14932+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14933+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
14934+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
14935+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
14936+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
14937+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14938+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14939+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
14940+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14941+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
14942+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
14943+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
14944+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
14945+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
14946+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
14947+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
14948+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
14949+
#define S_ACTION(T, n, us, sub) \
14950+
SDESC_ACTION_ROW(T),
14951+
#define S_ACTION_NS(T, n, us) \
14952+
SDESC_ACTION_ROW(T),
14953+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14954+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
14955+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
14956+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
14957+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14958+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14959+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
14960+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14961+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14962+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14963+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
14964+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
14965+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14966+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
14967+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
14968+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
14969+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
14970+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
14971+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
14972+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
14973+
#include "../settings/settings_def_video_window_custom_size.h"
14974+
#undef S_BOOL
14975+
#undef S_BOOL_NS
14976+
#undef S_UINT
14977+
#undef S_UINT_NS
14978+
#undef S_INT
14979+
#undef S_INT_NS
14980+
#undef S_FLOAT
14981+
#undef S_FLOAT_NS
14982+
#undef S_STRING
14983+
#undef S_STRING_NS
14984+
#undef S_DIR
14985+
#undef S_DIR_NS
14986+
#undef S_STRING_P
14987+
#undef S_STRING_P_NS
14988+
#undef S_PATH
14989+
#undef S_PATH_NS
14990+
#undef S_PATH_DS
14991+
#undef S_PATH_DS_NS
14992+
#undef S_ACTION
14993+
#undef S_ACTION_NS
14994+
#undef S_BOOL_EX
14995+
#undef S_BOOL_EX_NS
14996+
#undef S_UINT_EX
14997+
#undef S_UINT_EX_NS
14998+
#undef S_INT_EX
14999+
#undef S_INT_EX_NS
15000+
#undef S_FLOAT_EX
15001+
#undef S_FLOAT_EX_NS
15002+
#undef S_ACTION_EX
15003+
#undef S_ACTION_EX_NS
1491515004
};
1491615005
settings_list_add_desc(list, list_info, settings,
1491715006
vid_desc_17, ARRAY_SIZE(vid_desc_17),

0 commit comments

Comments
 (0)