Skip to content

Commit df163ad

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the quit and restart action to a single-source def file
The Lakka quit entry is a level-variant action borrowing both its tokens - the quit label and the restart display value - from their owning defs, so the descriptor row is the def's whole contribution. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent 2c15df2 commit df163ad

5 files changed

Lines changed: 339 additions & 2 deletions

File tree

‎configuration.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,6 +1930,7 @@ static struct config_bool_setting *populate_settings_bool(
19301930
#include "settings/settings_def_video_fullscreen.h"
19311931
#define SETTINGS_DEF_CONFIG_PASS
19321932
#include "settings/settings_def_video_sync.h"
1933+
#include "settings/settings_def_quit_restart.h"
19331934
#include "settings/settings_def_menu_throttle.h"
19341935
#include "settings/settings_def_video_ctx_scaling.h"
19351936
#include "settings/settings_def_input_sensors_extra.h"
@@ -2609,6 +2610,7 @@ static struct config_float_setting *populate_settings_float(
26092610
#include "settings/settings_def_video_fullscreen.h"
26102611
#define SETTINGS_DEF_CONFIG_PASS
26112612
#include "settings/settings_def_video_sync.h"
2613+
#include "settings/settings_def_quit_restart.h"
26122614
#include "settings/settings_def_menu_throttle.h"
26132615
#include "settings/settings_def_video_ctx_scaling.h"
26142616
#include "settings/settings_def_input_sensors_extra.h"
@@ -3246,6 +3248,7 @@ static struct config_uint_setting *populate_settings_uint(
32463248
#include "settings/settings_def_video_fullscreen.h"
32473249
#define SETTINGS_DEF_CONFIG_PASS
32483250
#include "settings/settings_def_video_sync.h"
3251+
#include "settings/settings_def_quit_restart.h"
32493252
#include "settings/settings_def_menu_throttle.h"
32503253
#include "settings/settings_def_video_ctx_scaling.h"
32513254
#include "settings/settings_def_input_sensors_extra.h"
@@ -3916,6 +3919,7 @@ static struct config_int_setting *populate_settings_int(
39163919
#include "settings/settings_def_video_fullscreen.h"
39173920
#define SETTINGS_DEF_CONFIG_PASS
39183921
#include "settings/settings_def_video_sync.h"
3922+
#include "settings/settings_def_quit_restart.h"
39193923
#include "settings/settings_def_menu_throttle.h"
39203924
#include "settings/settings_def_video_ctx_scaling.h"
39213925
#include "settings/settings_def_input_sensors_extra.h"
@@ -4474,6 +4478,7 @@ static struct config_int_setting *populate_settings_int(
44744478
#include "settings/settings_def_video_fullscreen.h"
44754479
#define SETTINGS_DEF_CONFIG_PASS
44764480
#include "settings/settings_def_video_sync.h"
4481+
#include "settings/settings_def_quit_restart.h"
44774482
#include "settings/settings_def_menu_throttle.h"
44784483
#include "settings/settings_def_video_ctx_scaling.h"
44794484
#include "settings/settings_def_input_sensors_extra.h"

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
567567
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
568568
#include "../settings/settings_def_video_fullscreen.h"
569569
#include "../settings/settings_def_video_sync.h"
570+
#include "../settings/settings_def_quit_restart.h"
570571
#include "../settings/settings_def_menu_throttle.h"
571572
#include "../settings/settings_def_video_ctx_scaling.h"
572573
#include "../settings/settings_def_input_sensors_extra.h"
@@ -914,6 +915,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
914915
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
915916
#include "../settings/settings_def_video_fullscreen.h"
916917
#include "../settings/settings_def_video_sync.h"
918+
#include "../settings/settings_def_quit_restart.h"
917919
#include "../settings/settings_def_menu_throttle.h"
918920
#include "../settings/settings_def_video_ctx_scaling.h"
919921
#include "../settings/settings_def_input_sensors_extra.h"

‎intl/msg_hash_us.h‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34317,3 +34317,170 @@ MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
3431734317
#undef S_ACTION_LV_H
3431834318
#undef S_ACTION_LV_NS_H
3431934319
#undef SETTINGS_DEF_STRINGS_PASS
34320+
/* GENERATED REGION: quit and restart action (see settings_def_quit_restart.h). */
34321+
#define SETTINGS_DEF_STRINGS_PASS
34322+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
34323+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34324+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34325+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
34326+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34327+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
34328+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34329+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34330+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
34331+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34332+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
34333+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34334+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34335+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
34336+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34337+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
34338+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34339+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34340+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
34341+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34342+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34343+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34344+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34345+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
34346+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34347+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
34348+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34349+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34350+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
34351+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34352+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34353+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34354+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34355+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
34356+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34357+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
34358+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34359+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34360+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
34361+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34362+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
34363+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34364+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34365+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
34366+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34367+
#define S_ACTION(T, n, us, sub) \
34368+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34369+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34370+
#define S_ACTION_NS(T, n, us) \
34371+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34372+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34373+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34374+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34375+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
34376+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34377+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34378+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34379+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34380+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
34381+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34382+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34383+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34384+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34385+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
34386+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34387+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34388+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34389+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34390+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
34391+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34392+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
34393+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
34394+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34395+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
34396+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
34397+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
34398+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34399+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us)
34400+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
34401+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34402+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us)
34403+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
34404+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34405+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us)
34406+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
34407+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
34408+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us)
34409+
#include "../settings/settings_def_quit_restart.h"
34410+
#undef S_BOOL
34411+
#undef S_BOOL_NS
34412+
#undef S_BOOL_H
34413+
#undef S_BOOL_NS_H
34414+
#undef S_UINT
34415+
#undef S_UINT_NS
34416+
#undef S_UINT_H
34417+
#undef S_UINT_NS_H
34418+
#undef S_INT
34419+
#undef S_INT_NS
34420+
#undef S_INT_H
34421+
#undef S_INT_NS_H
34422+
#undef S_FLOAT
34423+
#undef S_FLOAT_NS
34424+
#undef S_FLOAT_H
34425+
#undef S_FLOAT_NS_H
34426+
#undef S_STRING
34427+
#undef S_STRING_NS
34428+
#undef S_STRING_H
34429+
#undef S_STRING_NS_H
34430+
#undef S_DIR
34431+
#undef S_DIR_NS
34432+
#undef S_DIR_H
34433+
#undef S_DIR_NS_H
34434+
#undef S_STRING_P
34435+
#undef S_STRING_P_NS
34436+
#undef S_STRING_P_H
34437+
#undef S_STRING_P_NS_H
34438+
#undef S_PATH
34439+
#undef S_PATH_NS
34440+
#undef S_PATH_H
34441+
#undef S_PATH_NS_H
34442+
#undef S_PATH_DS
34443+
#undef S_PATH_DS_NS
34444+
#undef S_PATH_DS_H
34445+
#undef S_PATH_DS_NS_H
34446+
#undef S_ACTION
34447+
#undef S_ACTION_NS
34448+
#undef S_ACTION_H
34449+
#undef S_ACTION_NS_H
34450+
#undef S_BOOL_EX
34451+
#undef S_BOOL_EX_NS
34452+
#undef S_BOOL_EX_H
34453+
#undef S_BOOL_EX_NS_H
34454+
#undef S_UINT_EX
34455+
#undef S_UINT_EX_NS
34456+
#undef S_UINT_EX_H
34457+
#undef S_UINT_EX_NS_H
34458+
#undef S_INT_EX
34459+
#undef S_INT_EX_NS
34460+
#undef S_INT_EX_H
34461+
#undef S_INT_EX_NS_H
34462+
#undef S_FLOAT_EX
34463+
#undef S_FLOAT_EX_NS
34464+
#undef S_FLOAT_EX_H
34465+
#undef S_FLOAT_EX_NS_H
34466+
#undef S_ACTION_EX
34467+
#undef S_ACTION_EX_NS
34468+
#undef S_ACTION_EX_H
34469+
#undef S_ACTION_EX_NS_H
34470+
#undef S_BOOL_LV
34471+
#undef S_BOOL_LV_NS
34472+
#undef S_BOOL_LV_H
34473+
#undef S_BOOL_LV_NS_H
34474+
#undef S_FLOAT_LV
34475+
#undef S_FLOAT_LV_NS
34476+
#undef S_FLOAT_LV_H
34477+
#undef S_FLOAT_LV_NS_H
34478+
#undef S_STRING_LV
34479+
#undef S_STRING_LV_NS
34480+
#undef S_STRING_LV_H
34481+
#undef S_STRING_LV_NS_H
34482+
#undef S_ACTION_LV
34483+
#undef S_ACTION_LV_NS
34484+
#undef S_ACTION_LV_H
34485+
#undef S_ACTION_LV_NS_H
34486+
#undef SETTINGS_DEF_STRINGS_PASS

‎menu/menu_setting.c‎

Lines changed: 154 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11956,8 +11956,160 @@ static bool setting_append_list(
1195611956
#ifdef HAVE_LAKKA
1195711957
{
1195811958
static const setting_desc_t quit_lakka_desc[] = {
11959-
SDESC_ACTION_ROW_LV(QUIT_RETROARCH, RESTART_RETROARCH,
11960-
SD_FLAG_NONE, NULL, NULL, 0)
11959+
/* GENERATED: rows come from settings_def_quit_restart.h in order. */
11960+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
11961+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
11962+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
11963+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
11964+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
11965+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
11966+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
11967+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
11968+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
11969+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
11970+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
11971+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
11972+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
11973+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
11974+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
11975+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
11976+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
11977+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
11978+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
11979+
SDESC_STRING_ROW(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
11980+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
11981+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
11982+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
11983+
SDESC_DIR_ROW(f, T, d, el, sd, c, sta),
11984+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
11985+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
11986+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
11987+
SDESC_STRING_ROW_P(f, T, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
11988+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
11989+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
11990+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
11991+
SDESC_PATH_ROW(f, T, d, sd, c, vals, rp, ui),
11992+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
11993+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
11994+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
11995+
SDESC_PATH_ROW_DS(f, T, df2, sd, c, vals, rp, ui),
11996+
#define S_ACTION(T, n, us, sub) \
11997+
SDESC_ACTION_ROW(T),
11998+
#define S_ACTION_NS(T, n, us) \
11999+
SDESC_ACTION_ROW(T),
12000+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
12001+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
12002+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
12003+
SDESC_BOOL_ROW_EX(f, T, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui),
12004+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
12005+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
12006+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
12007+
SDESC_UINT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
12008+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
12009+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
12010+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
12011+
SDESC_INT_ROW_EX(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui),
12012+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
12013+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
12014+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
12015+
SDESC_FLOAT_ROW_EX(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui),
12016+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
12017+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
12018+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
12019+
SDESC_ACTION_ROW_EX(T, sd, ok, rp, c),
12020+
#define S_BOOL_LV(f, T, TV, n, d, sd, df, c, us, sub) \
12021+
SDESC_BOOL_ROW_LV(f, T, TV, d, sd, df, c),
12022+
#define S_BOOL_LV_NS(f, T, TV, n, d, sd, df, c, us) \
12023+
SDESC_BOOL_ROW_LV(f, T, TV, d, sd, df, c),
12024+
#define S_FLOAT_LV(f, T, TV, n, d, rnd, sd, df, c, us, sub) \
12025+
SDESC_FLOAT_ROW_LV(f, T, TV, d, rnd, sd, df, c),
12026+
#define S_FLOAT_LV_NS(f, T, TV, n, d, rnd, sd, df, c, us) \
12027+
SDESC_FLOAT_ROW_LV(f, T, TV, d, rnd, sd, df, c),
12028+
#define S_STRING_LV(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
12029+
SDESC_STRING_ROW_LV(f, T, TV, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
12030+
#define S_STRING_LV_NS(f, T, TV, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
12031+
SDESC_STRING_ROW_LV(f, T, TV, d, sd, c, ok, rp, sta, sel, lf, rt, ui),
12032+
#define S_ACTION_LV(T, TV, n, sd, ok, rp, c, us, sub) \
12033+
SDESC_ACTION_ROW_LV(T, TV, sd, ok, rp, c),
12034+
#define S_ACTION_LV_NS(T, TV, n, sd, ok, rp, c, us) \
12035+
SDESC_ACTION_ROW_LV(T, TV, sd, ok, rp, c),
12036+
#include "../settings/settings_def_quit_restart.h"
12037+
#undef S_BOOL
12038+
#undef S_BOOL_NS
12039+
#undef S_BOOL_H
12040+
#undef S_BOOL_NS_H
12041+
#undef S_UINT
12042+
#undef S_UINT_NS
12043+
#undef S_UINT_H
12044+
#undef S_UINT_NS_H
12045+
#undef S_INT
12046+
#undef S_INT_NS
12047+
#undef S_INT_H
12048+
#undef S_INT_NS_H
12049+
#undef S_FLOAT
12050+
#undef S_FLOAT_NS
12051+
#undef S_FLOAT_H
12052+
#undef S_FLOAT_NS_H
12053+
#undef S_STRING
12054+
#undef S_STRING_NS
12055+
#undef S_STRING_H
12056+
#undef S_STRING_NS_H
12057+
#undef S_DIR
12058+
#undef S_DIR_NS
12059+
#undef S_DIR_H
12060+
#undef S_DIR_NS_H
12061+
#undef S_STRING_P
12062+
#undef S_STRING_P_NS
12063+
#undef S_STRING_P_H
12064+
#undef S_STRING_P_NS_H
12065+
#undef S_PATH
12066+
#undef S_PATH_NS
12067+
#undef S_PATH_H
12068+
#undef S_PATH_NS_H
12069+
#undef S_PATH_DS
12070+
#undef S_PATH_DS_NS
12071+
#undef S_PATH_DS_H
12072+
#undef S_PATH_DS_NS_H
12073+
#undef S_ACTION
12074+
#undef S_ACTION_NS
12075+
#undef S_ACTION_H
12076+
#undef S_ACTION_NS_H
12077+
#undef S_BOOL_EX
12078+
#undef S_BOOL_EX_NS
12079+
#undef S_BOOL_EX_H
12080+
#undef S_BOOL_EX_NS_H
12081+
#undef S_UINT_EX
12082+
#undef S_UINT_EX_NS
12083+
#undef S_UINT_EX_H
12084+
#undef S_UINT_EX_NS_H
12085+
#undef S_INT_EX
12086+
#undef S_INT_EX_NS
12087+
#undef S_INT_EX_H
12088+
#undef S_INT_EX_NS_H
12089+
#undef S_FLOAT_EX
12090+
#undef S_FLOAT_EX_NS
12091+
#undef S_FLOAT_EX_H
12092+
#undef S_FLOAT_EX_NS_H
12093+
#undef S_ACTION_EX
12094+
#undef S_ACTION_EX_NS
12095+
#undef S_ACTION_EX_H
12096+
#undef S_ACTION_EX_NS_H
12097+
#undef S_BOOL_LV
12098+
#undef S_BOOL_LV_NS
12099+
#undef S_BOOL_LV_H
12100+
#undef S_BOOL_LV_NS_H
12101+
#undef S_FLOAT_LV
12102+
#undef S_FLOAT_LV_NS
12103+
#undef S_FLOAT_LV_H
12104+
#undef S_FLOAT_LV_NS_H
12105+
#undef S_STRING_LV
12106+
#undef S_STRING_LV_NS
12107+
#undef S_STRING_LV_H
12108+
#undef S_STRING_LV_NS_H
12109+
#undef S_ACTION_LV
12110+
#undef S_ACTION_LV_NS
12111+
#undef S_ACTION_LV_H
12112+
#undef S_ACTION_LV_NS_H
1196112113
};
1196212114
settings_list_add_desc(list, list_info, settings,
1196312115
quit_lakka_desc, ARRAY_SIZE(quit_lakka_desc),

0 commit comments

Comments
 (0)