Skip to content

Commit 33b1493

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the extended-row pilot setting to a single-source def file
First extended-grammar row through the re-landed wiring: a single boolean carrying callbacks, display flags and a ui type in its descriptor. Performed by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage. The remaining extended-row queue holds until a CI round-trip confirms this pilot under the traditional preprocessor.
1 parent bdf6436 commit 33b1493

8 files changed

Lines changed: 355 additions & 18 deletions

File tree

‎configuration.c‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1978,6 +1978,9 @@ static struct config_bool_setting *populate_settings_bool(
19781978
#include "settings/settings_def_video_fullscreen.h"
19791979
#define SETTINGS_DEF_CONFIG_PASS
19801980
#include "settings/settings_def_video_sync.h"
1981+
#ifdef HAVE_MENU
1982+
#include "settings/settings_def_menu_ex_pilot.h"
1983+
#endif
19811984
#include "settings/settings_def_accounts_streaming.h"
19821985
#include "settings/settings_def_accounts_cheevos.h"
19831986
#include "settings/settings_def_power_action.h"
@@ -2271,7 +2274,6 @@ static struct config_bool_setting *populate_settings_bool(
22712274

22722275
SETTING_BOOL("menu_show_quit_retroarch", &settings->bools.menu_show_quit_retroarch, true, DEFAULT_MENU_SHOW_QUIT, false);
22732276
SETTING_BOOL("filter_by_current_core", &settings->bools.filter_by_current_core, true, DEFAULT_FILTER_BY_CURRENT_CORE, false);
2274-
SETTING_BOOL("menu_use_preferred_system_color_theme", &settings->bools.menu_use_preferred_system_color_theme, true, DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME, false);
22752277
SETTING_BOOL("menu_show_advanced_settings", &settings->bools.menu_show_advanced_settings, true, DEFAULT_SHOW_ADVANCED_SETTINGS, false);
22762278
#ifdef HAVE_MATERIALUI
22772279
SETTING_BOOL("materialui_icons_enable", &settings->bools.menu_materialui_icons_enable, true, DEFAULT_MATERIALUI_ICONS_ENABLE, false);
@@ -2494,6 +2496,9 @@ static struct config_float_setting *populate_settings_float(
24942496
#include "settings/settings_def_video_fullscreen.h"
24952497
#define SETTINGS_DEF_CONFIG_PASS
24962498
#include "settings/settings_def_video_sync.h"
2499+
#ifdef HAVE_MENU
2500+
#include "settings/settings_def_menu_ex_pilot.h"
2501+
#endif
24972502
#include "settings/settings_def_accounts_streaming.h"
24982503
#include "settings/settings_def_accounts_cheevos.h"
24992504
#include "settings/settings_def_power_action.h"
@@ -2969,6 +2974,9 @@ static struct config_uint_setting *populate_settings_uint(
29692974
#include "settings/settings_def_video_fullscreen.h"
29702975
#define SETTINGS_DEF_CONFIG_PASS
29712976
#include "settings/settings_def_video_sync.h"
2977+
#ifdef HAVE_MENU
2978+
#include "settings/settings_def_menu_ex_pilot.h"
2979+
#endif
29722980
#include "settings/settings_def_accounts_streaming.h"
29732981
#include "settings/settings_def_accounts_cheevos.h"
29742982
#include "settings/settings_def_power_action.h"
@@ -3420,6 +3428,9 @@ static struct config_int_setting *populate_settings_int(
34203428
#include "settings/settings_def_video_fullscreen.h"
34213429
#define SETTINGS_DEF_CONFIG_PASS
34223430
#include "settings/settings_def_video_sync.h"
3431+
#ifdef HAVE_MENU
3432+
#include "settings/settings_def_menu_ex_pilot.h"
3433+
#endif
34233434
#include "settings/settings_def_accounts_streaming.h"
34243435
#include "settings/settings_def_accounts_cheevos.h"
34253436
#include "settings/settings_def_power_action.h"
@@ -3669,6 +3680,9 @@ static struct config_int_setting *populate_settings_int(
36693680
#include "settings/settings_def_video_fullscreen.h"
36703681
#define SETTINGS_DEF_CONFIG_PASS
36713682
#include "settings/settings_def_video_sync.h"
3683+
#ifdef HAVE_MENU
3684+
#include "settings/settings_def_menu_ex_pilot.h"
3685+
#endif
36723686
#include "settings/settings_def_accounts_streaming.h"
36733687
#include "settings/settings_def_accounts_cheevos.h"
36743688
#include "settings/settings_def_power_action.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4975,10 +4975,6 @@ MSG_HASH(
49754975
MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
49764976
MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG_STR
49774977
)
4978-
MSG_HASH(
4979-
MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
4980-
MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME_STR
4981-
)
49824978
MSG_HASH(
49834979
MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE,
49844980
MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE_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_menu_ex_pilot.h"
562563
#include "../settings/settings_def_accounts_streaming.h"
563564
#include "../settings/settings_def_accounts_cheevos.h"
564565
#include "../settings/settings_def_power_action.h"
@@ -735,6 +736,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
735736
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
736737
#include "../settings/settings_def_video_fullscreen.h"
737738
#include "../settings/settings_def_video_sync.h"
739+
#include "../settings/settings_def_menu_ex_pilot.h"
738740
#include "../settings/settings_def_accounts_streaming.h"
739741
#include "../settings/settings_def_accounts_cheevos.h"
740742
#include "../settings/settings_def_power_action.h"

‎intl/msg_hash_us.h‎

Lines changed: 109 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8783,14 +8783,115 @@ MSG_HASH(
87838783
MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY,
87848784
"Modify the opacity of the default menu background."
87858785
)
8786-
MSG_HASH(
8787-
MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
8788-
"Use Preferred System Color Theme"
8789-
)
8790-
MSG_HASH(
8791-
MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
8792-
"Use operating system's color theme (if any). Overrides theme settings."
8793-
)
8786+
/* GENERATED REGION: extended-row pilot setting (see settings_def_menu_ex_pilot.h). */
8787+
#define SETTINGS_DEF_STRINGS_PASS
8788+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
8789+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8790+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8791+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
8792+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8793+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
8794+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8795+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8796+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
8797+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8798+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
8799+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8800+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8801+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
8802+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8803+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
8804+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8805+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8806+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
8807+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8808+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8809+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8810+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8811+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
8812+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8813+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
8814+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8815+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8816+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
8817+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8818+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8819+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8820+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8821+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
8822+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8823+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
8824+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8825+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8826+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
8827+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8828+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
8829+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8830+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8831+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
8832+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8833+
#define S_ACTION(T, n, us, sub) \
8834+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8835+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8836+
#define S_ACTION_NS(T, n, us) \
8837+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8838+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8839+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8840+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8841+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
8842+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8843+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8844+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8845+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8846+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
8847+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8848+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8849+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8850+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8851+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
8852+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8853+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8854+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8855+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8856+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
8857+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8858+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
8859+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8860+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8861+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
8862+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8863+
#include "../settings/settings_def_menu_ex_pilot.h"
8864+
#undef S_BOOL
8865+
#undef S_BOOL_NS
8866+
#undef S_UINT
8867+
#undef S_UINT_NS
8868+
#undef S_INT
8869+
#undef S_INT_NS
8870+
#undef S_FLOAT
8871+
#undef S_FLOAT_NS
8872+
#undef S_STRING
8873+
#undef S_STRING_NS
8874+
#undef S_DIR
8875+
#undef S_DIR_NS
8876+
#undef S_STRING_P
8877+
#undef S_STRING_P_NS
8878+
#undef S_PATH
8879+
#undef S_PATH_NS
8880+
#undef S_PATH_DS
8881+
#undef S_PATH_DS_NS
8882+
#undef S_ACTION
8883+
#undef S_ACTION_NS
8884+
#undef S_BOOL_EX
8885+
#undef S_BOOL_EX_NS
8886+
#undef S_UINT_EX
8887+
#undef S_UINT_EX_NS
8888+
#undef S_INT_EX
8889+
#undef S_INT_EX_NS
8890+
#undef S_FLOAT_EX
8891+
#undef S_FLOAT_EX_NS
8892+
#undef S_ACTION_EX
8893+
#undef S_ACTION_EX_NS
8894+
#undef SETTINGS_DEF_STRINGS_PASS
87948895
MSG_HASH(
87958896
MENU_ENUM_LABEL_VALUE_THUMBNAILS,
87968897
"Primary Thumbnail"

‎menu/menu_setting.c‎

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18860,9 +18860,98 @@ static bool setting_append_list(
1886018860
{
1886118861
{
1886218862
static const setting_desc_t menu_desc_23[] = {
18863-
SDESC_BOOL_ROW_EX(menu_use_preferred_system_color_theme, MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
18864-
DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME, SD_FLAG_NONE, 0, 0,
18865-
setting_bool_action_left_with_refresh, NULL, NULL, NULL, setting_bool_action_left_with_refresh, setting_bool_action_right_with_refresh, 0),
18863+
/* GENERATED: rows come from settings_def_menu_ex_pilot.h in order. */
18864+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
18865+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
18866+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
18867+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
18868+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
18869+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18870+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
18871+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18872+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
18873+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18874+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
18875+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
18876+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
18877+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
18878+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
18879+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
18880+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18881+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18882+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
18883+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18884+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
18885+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
18886+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
18887+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
18888+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18889+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18890+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
18891+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
18892+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
18893+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
18894+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
18895+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
18896+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
18897+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
18898+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
18899+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
18900+
#define S_ACTION(T, n, us, sub) \
18901+
SDESC_ACTION_ROW(T),
18902+
#define S_ACTION_NS(T, n, us) \
18903+
SDESC_ACTION_ROW(T),
18904+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18905+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
18906+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
18907+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
18908+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18909+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18910+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
18911+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18912+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18913+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18914+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
18915+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
18916+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
18917+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
18918+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
18919+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
18920+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
18921+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
18922+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
18923+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
18924+
#include "../settings/settings_def_menu_ex_pilot.h"
18925+
#undef S_BOOL
18926+
#undef S_BOOL_NS
18927+
#undef S_UINT
18928+
#undef S_UINT_NS
18929+
#undef S_INT
18930+
#undef S_INT_NS
18931+
#undef S_FLOAT
18932+
#undef S_FLOAT_NS
18933+
#undef S_STRING
18934+
#undef S_STRING_NS
18935+
#undef S_DIR
18936+
#undef S_DIR_NS
18937+
#undef S_STRING_P
18938+
#undef S_STRING_P_NS
18939+
#undef S_PATH
18940+
#undef S_PATH_NS
18941+
#undef S_PATH_DS
18942+
#undef S_PATH_DS_NS
18943+
#undef S_ACTION
18944+
#undef S_ACTION_NS
18945+
#undef S_BOOL_EX
18946+
#undef S_BOOL_EX_NS
18947+
#undef S_UINT_EX
18948+
#undef S_UINT_EX_NS
18949+
#undef S_INT_EX
18950+
#undef S_INT_EX_NS
18951+
#undef S_FLOAT_EX
18952+
#undef S_FLOAT_EX_NS
18953+
#undef S_ACTION_EX
18954+
#undef S_ACTION_EX_NS
1886618955
};
1886718956
settings_list_add_desc(list, list_info, settings,
1886818957
menu_desc_23, ARRAY_SIZE(menu_desc_23),

0 commit comments

Comments
 (0)