Skip to content

Commit 19ba36e

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the third video action group 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 8248ecb commit 19ba36e

8 files changed

Lines changed: 243 additions & 30 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,6 +1966,7 @@ static struct config_bool_setting *populate_settings_bool(
19661966
#include "settings/settings_def_video_fullscreen.h"
19671967
#define SETTINGS_DEF_CONFIG_PASS
19681968
#include "settings/settings_def_video_sync.h"
1969+
#include "settings/settings_def_video_actions_3.h"
19691970
#include "settings/settings_def_input_actions.h"
19701971
#include "settings/settings_def_video_actions_2.h"
19711972
#include "settings/settings_def_video_actions_1.h"
@@ -2454,6 +2455,7 @@ static struct config_float_setting *populate_settings_float(
24542455
#include "settings/settings_def_video_fullscreen.h"
24552456
#define SETTINGS_DEF_CONFIG_PASS
24562457
#include "settings/settings_def_video_sync.h"
2458+
#include "settings/settings_def_video_actions_3.h"
24572459
#include "settings/settings_def_input_actions.h"
24582460
#include "settings/settings_def_video_actions_2.h"
24592461
#include "settings/settings_def_video_actions_1.h"
@@ -2901,6 +2903,7 @@ static struct config_uint_setting *populate_settings_uint(
29012903
#include "settings/settings_def_video_fullscreen.h"
29022904
#define SETTINGS_DEF_CONFIG_PASS
29032905
#include "settings/settings_def_video_sync.h"
2906+
#include "settings/settings_def_video_actions_3.h"
29042907
#include "settings/settings_def_input_actions.h"
29052908
#include "settings/settings_def_video_actions_2.h"
29062909
#include "settings/settings_def_video_actions_1.h"
@@ -3324,6 +3327,7 @@ static struct config_int_setting *populate_settings_int(
33243327
#include "settings/settings_def_video_fullscreen.h"
33253328
#define SETTINGS_DEF_CONFIG_PASS
33263329
#include "settings/settings_def_video_sync.h"
3330+
#include "settings/settings_def_video_actions_3.h"
33273331
#include "settings/settings_def_input_actions.h"
33283332
#include "settings/settings_def_video_actions_2.h"
33293333
#include "settings/settings_def_video_actions_1.h"
@@ -3547,6 +3551,7 @@ static struct config_int_setting *populate_settings_int(
35473551
#include "settings/settings_def_video_fullscreen.h"
35483552
#define SETTINGS_DEF_CONFIG_PASS
35493553
#include "settings/settings_def_video_sync.h"
3554+
#include "settings/settings_def_video_actions_3.h"
35503555
#include "settings/settings_def_input_actions.h"
35513556
#include "settings/settings_def_video_actions_2.h"
35523557
#include "settings/settings_def_video_actions_1.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3887,18 +3887,10 @@ MSG_HASH(
38873887
MENU_ENUM_LABEL_VIDEO_SETTINGS,
38883888
MENU_ENUM_LABEL_VIDEO_SETTINGS_STR
38893889
)
3890-
MSG_HASH(
3891-
MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS,
3892-
MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS_STR
3893-
)
38943890
MSG_HASH(
38953891
MENU_ENUM_LABEL_VIDEO_HDR_SETTINGS,
38963892
MENU_ENUM_LABEL_VIDEO_HDR_SETTINGS_STR
38973893
)
3898-
MSG_HASH(
3899-
MENU_ENUM_LABEL_VIDEO_SYNCHRONIZATION_SETTINGS,
3900-
MENU_ENUM_LABEL_VIDEO_SYNCHRONIZATION_SETTINGS_STR
3901-
)
39023894
MSG_HASH(
39033895
MENU_ENUM_LABEL_VIDEO_USE_METAL_ARG_BUFFERS,
39043896
MENU_ENUM_LABEL_VIDEO_USE_METAL_ARG_BUFFERS_STR

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
549549
#define S_ACTION_NS(T, n, us) n,
550550
#include "../settings/settings_def_video_fullscreen.h"
551551
#include "../settings/settings_def_video_sync.h"
552+
#include "../settings/settings_def_video_actions_3.h"
552553
#include "../settings/settings_def_input_actions.h"
553554
#include "../settings/settings_def_video_actions_2.h"
554555
#include "../settings/settings_def_video_actions_1.h"
@@ -699,6 +700,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
699700
#define S_ACTION_NS(T, n, us) (uint32_t)MENU_ENUM_LABEL_##T,
700701
#include "../settings/settings_def_video_fullscreen.h"
701702
#include "../settings/settings_def_video_sync.h"
703+
#include "../settings/settings_def_video_actions_3.h"
702704
#include "../settings/settings_def_input_actions.h"
703705
#include "../settings/settings_def_video_actions_2.h"
704706
#include "../settings/settings_def_video_actions_1.h"

‎intl/msg_hash_us.h‎

Lines changed: 74 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2332,14 +2332,80 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23322332
#undef S_ACTION
23332333
#undef S_ACTION_NS
23342334
#undef SETTINGS_DEF_STRINGS_PASS
2335-
MSG_HASH(
2336-
MENU_ENUM_LABEL_VALUE_VIDEO_SCALING_SETTINGS,
2337-
"Scaling"
2338-
)
2339-
MSG_HASH(
2340-
MENU_ENUM_SUBLABEL_VIDEO_SCALING_SETTINGS,
2341-
"Change video scaling settings."
2342-
)
2335+
/* GENERATED REGION: third video action group (see settings_def_video_actions_3.h). */
2336+
#define SETTINGS_DEF_STRINGS_PASS
2337+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
2338+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2339+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2340+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
2341+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2342+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
2343+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2344+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2345+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
2346+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2347+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
2348+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2349+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2350+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
2351+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2352+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
2353+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2354+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2355+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
2356+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2357+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
2358+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2359+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2360+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
2361+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2362+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
2363+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2364+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2365+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
2366+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2367+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
2368+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2369+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2370+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
2371+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2372+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
2373+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2374+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2375+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
2376+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2377+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
2378+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2379+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2380+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
2381+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2382+
#define S_ACTION(T, n, us, sub) \
2383+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
2384+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
2385+
#define S_ACTION_NS(T, n, us) \
2386+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
2387+
#include "../settings/settings_def_video_actions_3.h"
2388+
#undef S_BOOL
2389+
#undef S_BOOL_NS
2390+
#undef S_UINT
2391+
#undef S_UINT_NS
2392+
#undef S_INT
2393+
#undef S_INT_NS
2394+
#undef S_FLOAT
2395+
#undef S_FLOAT_NS
2396+
#undef S_STRING
2397+
#undef S_STRING_NS
2398+
#undef S_DIR
2399+
#undef S_DIR_NS
2400+
#undef S_STRING_P
2401+
#undef S_STRING_P_NS
2402+
#undef S_PATH
2403+
#undef S_PATH_NS
2404+
#undef S_PATH_DS
2405+
#undef S_PATH_DS_NS
2406+
#undef S_ACTION
2407+
#undef S_ACTION_NS
2408+
#undef SETTINGS_DEF_STRINGS_PASS
23432409
MSG_HASH(
23442410
MENU_ENUM_LABEL_VALUE_VIDEO_HDR_SETTINGS,
23452411
"HDR"
@@ -2348,14 +2414,6 @@ MSG_HASH(
23482414
MENU_ENUM_SUBLABEL_VIDEO_HDR_SETTINGS,
23492415
"Change video HDR settings."
23502416
)
2351-
MSG_HASH(
2352-
MENU_ENUM_LABEL_VALUE_VIDEO_SYNCHRONIZATION_SETTINGS,
2353-
"Synchronization"
2354-
)
2355-
MSG_HASH(
2356-
MENU_ENUM_SUBLABEL_VIDEO_SYNCHRONIZATION_SETTINGS,
2357-
"Change video synchronization settings."
2358-
)
23592417
/* GENERATED REGION: video filter and rotation group (see settings_def_video_filter_rotation.h). */
23602418
#define SETTINGS_DEF_STRINGS_PASS
23612419
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \

‎menu/menu_setting.c‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14352,8 +14352,68 @@ static bool setting_append_list(
1435214352

1435314353
{
1435414354
static const setting_desc_t vid_desc_13[] = {
14355-
SDESC_ACTION_ROW(VIDEO_SYNCHRONIZATION_SETTINGS),
14356-
SDESC_ACTION_ROW(VIDEO_SCALING_SETTINGS),
14355+
/* GENERATED: rows come from settings_def_video_actions_3.h in order. */
14356+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
14357+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
14358+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
14359+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
14360+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
14361+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14362+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
14363+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14364+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
14365+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14366+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
14367+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
14368+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
14369+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
14370+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
14371+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
14372+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14373+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14374+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
14375+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14376+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
14377+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
14378+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
14379+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
14380+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
14381+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14382+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
14383+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
14384+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
14385+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
14386+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
14387+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
14388+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
14389+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
14390+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
14391+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
14392+
#define S_ACTION(T, n, us, sub) \
14393+
SDESC_ACTION_ROW(T),
14394+
#define S_ACTION_NS(T, n, us) \
14395+
SDESC_ACTION_ROW(T),
14396+
#include "../settings/settings_def_video_actions_3.h"
14397+
#undef S_BOOL
14398+
#undef S_BOOL_NS
14399+
#undef S_UINT
14400+
#undef S_UINT_NS
14401+
#undef S_INT
14402+
#undef S_INT_NS
14403+
#undef S_FLOAT
14404+
#undef S_FLOAT_NS
14405+
#undef S_STRING
14406+
#undef S_STRING_NS
14407+
#undef S_DIR
14408+
#undef S_DIR_NS
14409+
#undef S_STRING_P
14410+
#undef S_STRING_P_NS
14411+
#undef S_PATH
14412+
#undef S_PATH_NS
14413+
#undef S_PATH_DS
14414+
#undef S_PATH_DS_NS
14415+
#undef S_ACTION
14416+
#undef S_ACTION_NS
1435714417
};
1435814418
settings_list_add_desc(list, list_info, settings,
1435914419
vid_desc_13, ARRAY_SIZE(vid_desc_13),

‎msg_hash.h‎

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9436,8 +9436,92 @@ enum msg_hash_enums
94369436
#undef SETTINGS_DEF_STRINGS_PASS
94379437
#undef SETTINGS_DEF_ENUM_PASS
94389438
MENU_LABEL(VIDEO_OUTPUT_SETTINGS),
9439-
MENU_LABEL(VIDEO_SYNCHRONIZATION_SETTINGS),
9440-
MENU_LABEL(VIDEO_SCALING_SETTINGS),
9439+
/* GENERATED REGION: third video action group enum rows (see settings/settings_def_video_actions_3.h). */
9440+
#define SETTINGS_DEF_ENUM_PASS
9441+
#define SETTINGS_DEF_STRINGS_PASS
9442+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
9443+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
9444+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
9445+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
9446+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
9447+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
9448+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
9449+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
9450+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) MENU_LABEL(T),
9451+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) MENU_LABEL(T),
9452+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) MENU_LABEL(T),
9453+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) MENU_LABEL(T),
9454+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) MENU_LABEL(T),
9455+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) MENU_LABEL(T),
9456+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) MENU_LABEL(T),
9457+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) MENU_LABEL(T),
9458+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) MENU_LABEL(T),
9459+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) MENU_LABEL(T),
9460+
#define S_ACTION(T, n, us, sub) MENU_LABEL(T),
9461+
#define S_ACTION_NS(T, n, us) MENU_LABEL(T),
9462+
#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
9463+
#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
9464+
#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
9465+
#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
9466+
#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
9467+
#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
9468+
#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
9469+
#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
9470+
#define S_STRING_H(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) MENU_LBL_H(T),
9471+
#define S_STRING_NS_H(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) MENU_LBL_H(T),
9472+
#define S_DIR_H(f, T, n, d, el, sd, c, sta, us, sub) MENU_LBL_H(T),
9473+
#define S_DIR_NS_H(f, T, n, d, el, sd, c, sta, us) MENU_LBL_H(T),
9474+
#define S_STRING_P_H(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) MENU_LBL_H(T),
9475+
#define S_STRING_P_NS_H(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) MENU_LBL_H(T),
9476+
#define S_PATH_H(f, T, n, d, sd, c, vals, rp, ui, us, sub) MENU_LBL_H(T),
9477+
#define S_PATH_NS_H(f, T, n, d, sd, c, vals, rp, ui, us) MENU_LBL_H(T),
9478+
#define S_PATH_DS_H(f, T, n, df2, sd, c, vals, rp, ui, us, sub) MENU_LBL_H(T),
9479+
#define S_PATH_DS_NS_H(f, T, n, df2, sd, c, vals, rp, ui, us) MENU_LBL_H(T),
9480+
#define S_ACTION_H(T, n, us, sub) MENU_LBL_H(T),
9481+
#define S_ACTION_NS_H(T, n, us) MENU_LBL_H(T),
9482+
#include "settings/settings_def_video_actions_3.h"
9483+
#undef S_BOOL
9484+
#undef S_BOOL_NS
9485+
#undef S_UINT
9486+
#undef S_UINT_NS
9487+
#undef S_INT
9488+
#undef S_INT_NS
9489+
#undef S_FLOAT
9490+
#undef S_FLOAT_NS
9491+
#undef S_STRING
9492+
#undef S_STRING_NS
9493+
#undef S_STRING_H
9494+
#undef S_STRING_NS_H
9495+
#undef S_DIR
9496+
#undef S_DIR_NS
9497+
#undef S_DIR_H
9498+
#undef S_DIR_NS_H
9499+
#undef S_STRING_P
9500+
#undef S_STRING_P_NS
9501+
#undef S_STRING_P_H
9502+
#undef S_STRING_P_NS_H
9503+
#undef S_PATH
9504+
#undef S_PATH_NS
9505+
#undef S_PATH_H
9506+
#undef S_PATH_NS_H
9507+
#undef S_PATH_DS
9508+
#undef S_PATH_DS_NS
9509+
#undef S_PATH_DS_H
9510+
#undef S_PATH_DS_NS_H
9511+
#undef S_ACTION
9512+
#undef S_ACTION_NS
9513+
#undef S_ACTION_H
9514+
#undef S_ACTION_NS_H
9515+
#undef S_BOOL_H
9516+
#undef S_UINT_H
9517+
#undef S_BOOL_NS_H
9518+
#undef S_INT_H
9519+
#undef S_FLOAT_H
9520+
#undef S_UINT_NS_H
9521+
#undef S_INT_NS_H
9522+
#undef S_FLOAT_NS_H
9523+
#undef SETTINGS_DEF_STRINGS_PASS
9524+
#undef SETTINGS_DEF_ENUM_PASS
94419525
MENU_LABEL(VIDEO_HDR_SETTINGS),
94429526
MENU_LABEL(CRT_SWITCHRES_SETTINGS),
94439527
MENU_LABEL(AUDIO_SETTINGS),

‎msg_hash_lbl_str.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,9 +976,7 @@
976976
#define MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_AXIS_STR "video_scale_integer_axis"
977977
#define MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_SCALING_STR "video_scale_integer_scaling"
978978
#define MENU_ENUM_LABEL_VIDEO_SETTINGS_STR "video_settings"
979-
#define MENU_ENUM_LABEL_VIDEO_SCALING_SETTINGS_STR "video_scaling_settings"
980979
#define MENU_ENUM_LABEL_VIDEO_HDR_SETTINGS_STR "video_hdr_settings"
981-
#define MENU_ENUM_LABEL_VIDEO_SYNCHRONIZATION_SETTINGS_STR "video_synchronization_settings"
982980
#define MENU_ENUM_LABEL_VIDEO_USE_METAL_ARG_BUFFERS_STR "video_use_metal_arg_buffers"
983981
#define MENU_ENUM_LABEL_VIDEO_OUTPUT_SETTINGS_STR "video_output_settings"
984982
#define MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS_STR "crt_switchres_settings"

‎settings/settings_def_video_actions_3.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* Single-source definitions: third video action group.
2+
* Grammar identical to settings_def_video_sync.h plus S_FLOAT and
3+
* the _NS no-sublabel variants; the descriptor argument span
4+
* matches SDESC_<kind>_ROW; row order is menu display order;
5+
* h2json.py parses these rows for the Crowdin source upload. */
6+
7+
S_ACTION(VIDEO_SYNCHRONIZATION_SETTINGS,
8+
"video_synchronization_settings",
9+
"Synchronization",
10+
"Change video synchronization settings.")
11+
S_ACTION(VIDEO_SCALING_SETTINGS,
12+
"video_scaling_settings",
13+
"Scaling",
14+
"Change video scaling settings.")

0 commit comments

Comments
 (0)