Skip to content

Commit 7b993b7

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 3ee44cd commit 7b993b7

9 files changed

Lines changed: 722 additions & 82 deletions

‎configuration.c‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,6 @@ static struct config_bool_setting *populate_settings_bool(
19311931
SETTING_BOOL("video_force_aspect", &settings->bools.video_force_aspect, true, DEFAULT_FORCE_ASPECT, false);
19321932
SETTING_BOOL("video_threaded", video_driver_get_threaded(), true, DEFAULT_VIDEO_THREADED, false);
19331933
SETTING_BOOL("video_shared_context", &settings->bools.video_shared_context, true, DEFAULT_VIDEO_SHARED_CONTEXT, false);
1934-
SETTING_BOOL("video_hdr_scanlines", &settings->bools.video_hdr_scanlines, true, DEFAULT_VIDEO_HDR_SCANLINES, false);
19351934
/* GENERATED: single-source setting rows (bool kind emits here) */
19361935
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
19371936
SETTING_BOOL(n, &settings->bools.f, true, d, false);
@@ -1970,6 +1969,8 @@ static struct config_bool_setting *populate_settings_bool(
19701969
#include "settings/settings_def_video_fullscreen.h"
19711970
#define SETTINGS_DEF_CONFIG_PASS
19721971
#include "settings/settings_def_video_sync.h"
1972+
#include "settings/settings_def_input_bind_timeouts.h"
1973+
#include "settings/settings_def_video_hdr_toggles.h"
19731974
#include "settings/settings_def_rewind.h"
19741975
#include "settings/settings_def_playlist_history.h"
19751976
#ifdef HAVE_MENU
@@ -2596,6 +2597,8 @@ static struct config_float_setting *populate_settings_float(
25962597
#include "settings/settings_def_video_fullscreen.h"
25972598
#define SETTINGS_DEF_CONFIG_PASS
25982599
#include "settings/settings_def_video_sync.h"
2600+
#include "settings/settings_def_input_bind_timeouts.h"
2601+
#include "settings/settings_def_video_hdr_toggles.h"
25992602
#include "settings/settings_def_rewind.h"
26002603
#include "settings/settings_def_playlist_history.h"
26012604
#ifdef HAVE_MENU
@@ -3165,6 +3168,8 @@ static struct config_uint_setting *populate_settings_uint(
31653168
#include "settings/settings_def_video_fullscreen.h"
31663169
#define SETTINGS_DEF_CONFIG_PASS
31673170
#include "settings/settings_def_video_sync.h"
3171+
#include "settings/settings_def_input_bind_timeouts.h"
3172+
#include "settings/settings_def_video_hdr_toggles.h"
31683173
#include "settings/settings_def_rewind.h"
31693174
#include "settings/settings_def_playlist_history.h"
31703175
#ifdef HAVE_MENU
@@ -3510,7 +3515,6 @@ static struct config_uint_setting *populate_settings_uint(
35103515
SETTING_UINT("video_stream_scale_factor", &settings->uints.video_stream_scale_factor, true, 1, false);
35113516

35123517
SETTING_UINT("video_hdr_mode", &settings->uints.video_hdr_mode, true, DEFAULT_VIDEO_HDR_MODE, false);
3513-
SETTING_UINT("video_hdr_subpixel_layout", &settings->uints.video_hdr_subpixel_layout, true, DEFAULT_VIDEO_HDR_SUBPIXEL_LAYOUT, false);
35143518
#ifdef HAVE_NETWORKING
35153519
SETTING_UINT("streaming_mode", &settings->uints.streaming_mode, true, STREAMING_MODE_TWITCH, false);
35163520
#endif
@@ -3532,7 +3536,6 @@ static struct config_uint_setting *populate_settings_uint(
35323536
#else
35333537
SETTING_UINT("input_sensor_orientation", &settings->uints.input_sensor_orientation, true, 1, false);
35343538
#endif
3535-
SETTING_UINT("keyboard_gamepad_mapping_type", &settings->uints.input_keyboard_gamepad_mapping_type, true, 1, false);
35363539

35373540
#if defined(HAVE_OVERLAY)
35383541
SETTING_UINT("input_overlay_show_inputs", &settings->uints.input_overlay_show_inputs, true, DEFAULT_OVERLAY_SHOW_INPUTS, false);
@@ -3704,6 +3707,8 @@ static struct config_int_setting *populate_settings_int(
37043707
#include "settings/settings_def_video_fullscreen.h"
37053708
#define SETTINGS_DEF_CONFIG_PASS
37063709
#include "settings/settings_def_video_sync.h"
3710+
#include "settings/settings_def_input_bind_timeouts.h"
3711+
#include "settings/settings_def_video_hdr_toggles.h"
37073712
#include "settings/settings_def_rewind.h"
37083713
#include "settings/settings_def_playlist_history.h"
37093714
#ifdef HAVE_MENU
@@ -4077,6 +4082,8 @@ static struct config_int_setting *populate_settings_int(
40774082
#include "settings/settings_def_video_fullscreen.h"
40784083
#define SETTINGS_DEF_CONFIG_PASS
40794084
#include "settings/settings_def_video_sync.h"
4085+
#include "settings/settings_def_input_bind_timeouts.h"
4086+
#include "settings/settings_def_video_hdr_toggles.h"
40804087
#include "settings/settings_def_rewind.h"
40814088
#include "settings/settings_def_playlist_history.h"
40824089
#ifdef HAVE_MENU

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ MSG_HASH(
1111
MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME,
1212
MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME_STR
1313
)
14-
MSG_HASH(
15-
MENU_ENUM_LABEL_VIDEO_HDR_SCANLINES,
16-
MENU_ENUM_LABEL_VIDEO_HDR_SCANLINES_STR
17-
)
18-
MSG_HASH(
19-
MENU_ENUM_LABEL_VIDEO_HDR_SUBPIXEL_LAYOUT,
20-
MENU_ENUM_LABEL_VIDEO_HDR_SUBPIXEL_LAYOUT_STR
21-
)
2214
MSG_HASH(
2315
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU,
2416
MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE_MENU_STR
@@ -1714,14 +1706,6 @@ MSG_HASH(
17141706
MENU_ENUM_LABEL_INPUT_HOTKEY_DEVICE_MERGE,
17151707
MENU_ENUM_LABEL_INPUT_HOTKEY_DEVICE_MERGE_STR
17161708
)
1717-
MSG_HASH(
1718-
MENU_ENUM_LABEL_INPUT_ICADE_ENABLE,
1719-
MENU_ENUM_LABEL_INPUT_ICADE_ENABLE_STR
1720-
)
1721-
MSG_HASH(
1722-
MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
1723-
MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE_STR
1724-
)
17251709
MSG_HASH(
17261710
MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE,
17271711
MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE_STR
@@ -1914,10 +1898,6 @@ MSG_HASH(
19141898
MENU_ENUM_LABEL_LATENCY_SETTINGS,
19151899
MENU_ENUM_LABEL_LATENCY_SETTINGS_STR
19161900
)
1917-
MSG_HASH(
1918-
MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE,
1919-
MENU_ENUM_LABEL_INPUT_SMALL_KEYBOARD_ENABLE_STR
1920-
)
19211901
MSG_HASH(
19221902
MENU_ENUM_LABEL_INPUT_USER_10_BINDS,
19231903
MENU_ENUM_LABEL_INPUT_USER_10_BINDS_STR

‎intl/msg_hash_us.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,8 @@ 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_input_bind_timeouts.h"
563+
#include "../settings/settings_def_video_hdr_toggles.h"
562564
#include "../settings/settings_def_rewind.h"
563565
#include "../settings/settings_def_playlist_history.h"
564566
#include "../settings/settings_def_menu_scroll.h"
@@ -791,6 +793,8 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
791793
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
792794
#include "../settings/settings_def_video_fullscreen.h"
793795
#include "../settings/settings_def_video_sync.h"
796+
#include "../settings/settings_def_input_bind_timeouts.h"
797+
#include "../settings/settings_def_video_hdr_toggles.h"
794798
#include "../settings/settings_def_rewind.h"
795799
#include "../settings/settings_def_playlist_history.h"
796800
#include "../settings/settings_def_menu_scroll.h"

‎intl/msg_hash_us.h‎

Lines changed: 218 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4867,22 +4867,115 @@ MSG_HASH(
48674867
MENU_ENUM_LABEL_VALUE_VIDEO_HDR_EXPAND_GAMUT_SUPER,
48684868
"Super"
48694869
)
4870-
MSG_HASH(
4871-
MENU_ENUM_LABEL_VALUE_VIDEO_HDR_SCANLINES,
4872-
"Scanlines"
4873-
)
4874-
MSG_HASH(
4875-
MENU_ENUM_SUBLABEL_VIDEO_HDR_SCANLINES,
4876-
"Enable HDR scanlines. Scanlines are the main reason for using HDR in RetroArch as an accurate scanline implementation turns off most of the screen and HDR recovers some of that lost brightness. If you require more control over your scanlines, look to custom shaders that RetroArch provides."
4877-
)
4878-
MSG_HASH(
4879-
MENU_ENUM_LABEL_VALUE_VIDEO_HDR_SUBPIXEL_LAYOUT,
4880-
"Subpixel Layout"
4881-
)
4882-
MSG_HASH(
4883-
MENU_ENUM_SUBLABEL_VIDEO_HDR_SUBPIXEL_LAYOUT,
4884-
"Select your displays subpixel layout, this only effects scanlines. If you have no idea what your displays sub pixel layout is see Rtings.com for your display's 'subpixel layout'"
4885-
)
4870+
/* GENERATED REGION: HDR toggle group (see settings_def_video_hdr_toggles.h). */
4871+
#define SETTINGS_DEF_STRINGS_PASS
4872+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
4873+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4874+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4875+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
4876+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4877+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
4878+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4879+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4880+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
4881+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4882+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
4883+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4884+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4885+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
4886+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4887+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
4888+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4889+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4890+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
4891+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4892+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
4893+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4894+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4895+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
4896+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4897+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
4898+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4899+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4900+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
4901+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4902+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
4903+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4904+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4905+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
4906+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4907+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
4908+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4909+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4910+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
4911+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4912+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
4913+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4914+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4915+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
4916+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4917+
#define S_ACTION(T, n, us, sub) \
4918+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4919+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4920+
#define S_ACTION_NS(T, n, us) \
4921+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4922+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
4923+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4924+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4925+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
4926+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4927+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
4928+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4929+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4930+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
4931+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4932+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
4933+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4934+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4935+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
4936+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4937+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
4938+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4939+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4940+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
4941+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4942+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
4943+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
4944+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
4945+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
4946+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
4947+
#include "../settings/settings_def_video_hdr_toggles.h"
4948+
#undef S_BOOL
4949+
#undef S_BOOL_NS
4950+
#undef S_UINT
4951+
#undef S_UINT_NS
4952+
#undef S_INT
4953+
#undef S_INT_NS
4954+
#undef S_FLOAT
4955+
#undef S_FLOAT_NS
4956+
#undef S_STRING
4957+
#undef S_STRING_NS
4958+
#undef S_DIR
4959+
#undef S_DIR_NS
4960+
#undef S_STRING_P
4961+
#undef S_STRING_P_NS
4962+
#undef S_PATH
4963+
#undef S_PATH_NS
4964+
#undef S_PATH_DS
4965+
#undef S_PATH_DS_NS
4966+
#undef S_ACTION
4967+
#undef S_ACTION_NS
4968+
#undef S_BOOL_EX
4969+
#undef S_BOOL_EX_NS
4970+
#undef S_UINT_EX
4971+
#undef S_UINT_EX_NS
4972+
#undef S_INT_EX
4973+
#undef S_INT_EX_NS
4974+
#undef S_FLOAT_EX
4975+
#undef S_FLOAT_EX_NS
4976+
#undef S_ACTION_EX
4977+
#undef S_ACTION_EX_NS
4978+
#undef SETTINGS_DEF_STRINGS_PASS
48864979
MSG_HASH(
48874980
MENU_ENUM_LABEL_VALUE_VIDEO_HDR_SUBPIXEL_LAYOUT_RGB,
48884981
"RGB"
@@ -23861,18 +23954,115 @@ MSG_HASH(
2386123954
MENU_ENUM_LABEL_HELP_INPUT_PREFER_FRONT_TOUCH,
2386223955
"Use front instead of back touch."
2386323956
)
23864-
MSG_HASH(
23865-
MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE,
23866-
"Keyboard Controller Mapping"
23867-
)
23868-
MSG_HASH(
23869-
MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
23870-
"Keyboard Controller Mapping Type"
23871-
)
23872-
MSG_HASH(
23873-
MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
23874-
"Small Keyboard"
23875-
)
23957+
/* GENERATED REGION: bind timeout group (see settings_def_input_bind_timeouts.h). */
23958+
#define SETTINGS_DEF_STRINGS_PASS
23959+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
23960+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23961+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23962+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
23963+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23964+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
23965+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23966+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23967+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
23968+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23969+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
23970+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23971+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23972+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
23973+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23974+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
23975+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23976+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23977+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
23978+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23979+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
23980+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23981+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23982+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
23983+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23984+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
23985+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23986+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23987+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
23988+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23989+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
23990+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23991+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23992+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
23993+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23994+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
23995+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
23996+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
23997+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
23998+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
23999+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
24000+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
24001+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
24002+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
24003+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
24004+
#define S_ACTION(T, n, us, sub) \
24005+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
24006+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
24007+
#define S_ACTION_NS(T, n, us) \
24008+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
24009+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24010+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
24011+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
24012+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
24013+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
24014+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24015+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
24016+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
24017+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
24018+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
24019+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24020+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
24021+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
24022+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
24023+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
24024+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
24025+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
24026+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
24027+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
24028+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
24029+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
24030+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
24031+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
24032+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
24033+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
24034+
#include "../settings/settings_def_input_bind_timeouts.h"
24035+
#undef S_BOOL
24036+
#undef S_BOOL_NS
24037+
#undef S_UINT
24038+
#undef S_UINT_NS
24039+
#undef S_INT
24040+
#undef S_INT_NS
24041+
#undef S_FLOAT
24042+
#undef S_FLOAT_NS
24043+
#undef S_STRING
24044+
#undef S_STRING_NS
24045+
#undef S_DIR
24046+
#undef S_DIR_NS
24047+
#undef S_STRING_P
24048+
#undef S_STRING_P_NS
24049+
#undef S_PATH
24050+
#undef S_PATH_NS
24051+
#undef S_PATH_DS
24052+
#undef S_PATH_DS_NS
24053+
#undef S_ACTION
24054+
#undef S_ACTION_NS
24055+
#undef S_BOOL_EX
24056+
#undef S_BOOL_EX_NS
24057+
#undef S_UINT_EX
24058+
#undef S_UINT_EX_NS
24059+
#undef S_INT_EX
24060+
#undef S_INT_EX_NS
24061+
#undef S_FLOAT_EX
24062+
#undef S_FLOAT_EX_NS
24063+
#undef S_ACTION_EX
24064+
#undef S_ACTION_EX_NS
24065+
#undef SETTINGS_DEF_STRINGS_PASS
2387624066
/* GENERATED REGION: slow-motion ratio setting (see settings_def_frame_throttle_slowmotion.h). */
2387724067
#define SETTINGS_DEF_STRINGS_PASS
2387824068
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \

0 commit comments

Comments
 (0)