Skip to content

Commit 52842b1

Browse files
libretroadminLibretroAdmin
libretroadmin
authored and
LibretroAdmin
committed
settings: migrate the restart visibility setting to a single-source def file
Unblocked by the else-aware guard walker and the parenthesized flattening. Performed by tools/settings_migrate_group.py with the standard battery including the platform-profile lanes and the integrated enum consolidation stage.
1 parent cc3ca32 commit 52842b1

8 files changed

Lines changed: 125 additions & 17 deletions

File tree

‎configuration.c‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1961,6 +1961,9 @@ static struct config_bool_setting *populate_settings_bool(
19611961
#define SETTINGS_DEF_CONFIG_PASS
19621962
#include "settings/settings_def_video_sync.h"
19631963
#ifdef HAVE_MENU
1964+
#include "settings/settings_def_menu_restart_view.h"
1965+
#endif
1966+
#ifdef HAVE_MENU
19641967
#include "settings/settings_def_menu_thumbnail_background.h"
19651968
#endif
19661969
#ifdef HAVE_MENU
@@ -2160,7 +2163,6 @@ static struct config_bool_setting *populate_settings_bool(
21602163
SETTING_BOOL("menu_show_overlays", &settings->bools.menu_show_overlays, true, DEFAULT_QUICK_MENU_SHOW_OVERLAYS, false);
21612164

21622165
SETTING_BOOL("menu_show_quit_retroarch", &settings->bools.menu_show_quit_retroarch, true, DEFAULT_MENU_SHOW_QUIT, false);
2163-
SETTING_BOOL("menu_show_restart_retroarch", &settings->bools.menu_show_restart_retroarch, true, DEFAULT_MENU_SHOW_RESTART, false);
21642166
SETTING_BOOL("menu_show_online_updater", &settings->bools.menu_show_online_updater, true, DEFAULT_MENU_SHOW_ONLINE_UPDATER, false);
21652167
SETTING_BOOL("menu_show_core_updater", &settings->bools.menu_show_core_updater, true, DEFAULT_MENU_SHOW_CORE_UPDATER, false);
21662168
SETTING_BOOL("filter_by_current_core", &settings->bools.filter_by_current_core, true, DEFAULT_FILTER_BY_CURRENT_CORE, false);
@@ -2367,6 +2369,9 @@ static struct config_float_setting *populate_settings_float(
23672369
#define SETTINGS_DEF_CONFIG_PASS
23682370
#include "settings/settings_def_video_sync.h"
23692371
#ifdef HAVE_MENU
2372+
#include "settings/settings_def_menu_restart_view.h"
2373+
#endif
2374+
#ifdef HAVE_MENU
23702375
#include "settings/settings_def_menu_thumbnail_background.h"
23712376
#endif
23722377
#ifdef HAVE_MENU
@@ -2723,6 +2728,9 @@ static struct config_uint_setting *populate_settings_uint(
27232728
#define SETTINGS_DEF_CONFIG_PASS
27242729
#include "settings/settings_def_video_sync.h"
27252730
#ifdef HAVE_MENU
2731+
#include "settings/settings_def_menu_restart_view.h"
2732+
#endif
2733+
#ifdef HAVE_MENU
27262734
#include "settings/settings_def_menu_thumbnail_background.h"
27272735
#endif
27282736
#ifdef HAVE_MENU
@@ -3054,6 +3062,9 @@ static struct config_int_setting *populate_settings_int(
30543062
#define SETTINGS_DEF_CONFIG_PASS
30553063
#include "settings/settings_def_video_sync.h"
30563064
#ifdef HAVE_MENU
3065+
#include "settings/settings_def_menu_restart_view.h"
3066+
#endif
3067+
#ifdef HAVE_MENU
30573068
#include "settings/settings_def_menu_thumbnail_background.h"
30583069
#endif
30593070
#ifdef HAVE_MENU

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4703,10 +4703,6 @@ MSG_HASH(
47034703
MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH,
47044704
MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH_STR
47054705
)
4706-
MSG_HASH(
4707-
MENU_ENUM_LABEL_MENU_SHOW_RESTART_RETROARCH,
4708-
MENU_ENUM_LABEL_MENU_SHOW_RESTART_RETROARCH_STR
4709-
)
47104706
MSG_HASH(
47114707
MENU_ENUM_LABEL_QUICK_MENU_START_RECORDING,
47124708
MENU_ENUM_LABEL_QUICK_MENU_START_RECORDING_STR

‎intl/msg_hash_us.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
537537
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) n,
538538
#include "../settings/settings_def_video_fullscreen.h"
539539
#include "../settings/settings_def_video_sync.h"
540+
#include "../settings/settings_def_menu_restart_view.h"
540541
#include "../settings/settings_def_menu_thumbnail_background.h"
541542
#include "../settings/settings_def_menu_start_screen.h"
542543
#include "../settings/settings_def_menu_content_settings_view.h"
@@ -613,6 +614,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
613614
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) (uint32_t)MENU_ENUM_LABEL_##T,
614615
#include "../settings/settings_def_video_fullscreen.h"
615616
#include "../settings/settings_def_video_sync.h"
617+
#include "../settings/settings_def_menu_restart_view.h"
616618
#include "../settings/settings_def_menu_thumbnail_background.h"
617619
#include "../settings/settings_def_menu_start_screen.h"
618620
#include "../settings/settings_def_menu_content_settings_view.h"

‎intl/msg_hash_us.h‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7014,14 +7014,38 @@ MSG_HASH(
70147014
MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH,
70157015
"Show the 'Quit RetroArch' option in the Main Menu."
70167016
)
7017-
MSG_HASH(
7018-
MENU_ENUM_LABEL_VALUE_MENU_SHOW_RESTART_RETROARCH,
7019-
"Show 'Restart RetroArch'"
7020-
)
7021-
MSG_HASH(
7022-
MENU_ENUM_SUBLABEL_MENU_SHOW_RESTART_RETROARCH,
7023-
"Show the 'Restart RetroArch' option in the Main Menu."
7024-
)
7017+
/* GENERATED REGION: restart visibility setting (see settings_def_menu_restart_view.h). */
7018+
#define SETTINGS_DEF_STRINGS_PASS
7019+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
7020+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7021+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7022+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
7023+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7024+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7025+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7026+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7027+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7028+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7029+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
7030+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7031+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7032+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
7033+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7034+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
7035+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
7036+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
7037+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
7038+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
7039+
#include "../settings/settings_def_menu_restart_view.h"
7040+
#undef S_BOOL
7041+
#undef S_BOOL_NS
7042+
#undef S_UINT
7043+
#undef S_UINT_NS
7044+
#undef S_INT
7045+
#undef S_INT_NS
7046+
#undef S_FLOAT
7047+
#undef S_FLOAT_NS
7048+
#undef SETTINGS_DEF_STRINGS_PASS
70257049
/* GENERATED REGION: settings tab visibility setting (see settings_def_menu_content_settings_view.h). */
70267050
#define SETTINGS_DEF_STRINGS_PASS
70277051
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \

‎menu/menu_setting.c‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17470,8 +17470,32 @@ static bool setting_append_list(
1747017470
if (frontend_driver_has_fork())
1747117471
{
1747217472
static const setting_desc_t menu_desc_27[] = {
17473-
SDESC_BOOL_ROW(menu_show_restart_retroarch, MENU_SHOW_RESTART_RETROARCH,
17474-
DEFAULT_MENU_SHOW_RESTART, SD_FLAG_NONE, 0, 0),
17473+
/* GENERATED: rows come from settings_def_menu_restart_view.h in order. */
17474+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
17475+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
17476+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
17477+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
17478+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
17479+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17480+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
17481+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17482+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
17483+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17484+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
17485+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
17486+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
17487+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
17488+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
17489+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
17490+
#include "../settings/settings_def_menu_restart_view.h"
17491+
#undef S_BOOL
17492+
#undef S_BOOL_NS
17493+
#undef S_UINT
17494+
#undef S_UINT_NS
17495+
#undef S_INT
17496+
#undef S_INT_NS
17497+
#undef S_FLOAT
17498+
#undef S_FLOAT_NS
1747517499
};
1747617500
settings_list_add_desc(list, list_info, settings,
1747717501
menu_desc_27, ARRAY_SIZE(menu_desc_27),

‎msg_hash.h‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2125,7 +2125,44 @@ enum msg_hash_enums
21252125
#undef SETTINGS_DEF_ENUM_PASS
21262126
MENU_LABEL(MENU_SHOW_QUIT_RETROARCH),
21272127
MENU_ENUM_SUBLABEL_QUIT_RETROARCH_NOSAVE,
2128-
MENU_LABEL(MENU_SHOW_RESTART_RETROARCH),
2128+
/* GENERATED REGION: restart visibility setting enum rows (see settings/settings_def_menu_restart_view.h). */
2129+
#define SETTINGS_DEF_ENUM_PASS
2130+
#define SETTINGS_DEF_STRINGS_PASS
2131+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
2132+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
2133+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2134+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2135+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2136+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2137+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
2138+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
2139+
#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
2140+
#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2141+
#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
2142+
#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2143+
#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
2144+
#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2145+
#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2146+
#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
2147+
#include "settings/settings_def_menu_restart_view.h"
2148+
#undef S_BOOL
2149+
#undef S_BOOL_NS
2150+
#undef S_UINT
2151+
#undef S_UINT_NS
2152+
#undef S_INT
2153+
#undef S_INT_NS
2154+
#undef S_FLOAT
2155+
#undef S_FLOAT_NS
2156+
#undef S_BOOL_H
2157+
#undef S_UINT_H
2158+
#undef S_BOOL_NS_H
2159+
#undef S_INT_H
2160+
#undef S_FLOAT_H
2161+
#undef S_UINT_NS_H
2162+
#undef S_INT_NS_H
2163+
#undef S_FLOAT_NS_H
2164+
#undef SETTINGS_DEF_STRINGS_PASS
2165+
#undef SETTINGS_DEF_ENUM_PASS
21292166
/* GENERATED REGION: menu power views group enum rows (see settings/settings_def_menu_power_views.h). */
21302167
#define SETTINGS_DEF_ENUM_PASS
21312168
#define SETTINGS_DEF_STRINGS_PASS

‎msg_hash_lbl_str.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1175,7 +1175,6 @@
11751175
#define MENU_ENUM_LABEL_MATERIALUI_THUMBNAIL_BACKGROUND_ENABLE_STR "materialui_thumbnail_background_enable"
11761176
#define MENU_ENUM_LABEL_RENAME_ENTRY_STR "rename_entry"
11771177
#define MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH_STR "menu_show_quit_retroarch"
1178-
#define MENU_ENUM_LABEL_MENU_SHOW_RESTART_RETROARCH_STR "menu_show_restart_retroarch"
11791178
#define MENU_ENUM_LABEL_QUICK_MENU_START_RECORDING_STR "quick_menu_start_recording"
11801179
#define MENU_ENUM_LABEL_QUICK_MENU_START_STREAMING_STR "quick_menu_start_streaming"
11811180
#define MENU_ENUM_LABEL_QUICK_MENU_STOP_RECORDING_STR "quick_menu_stop_recording"

‎settings/settings_def_menu_restart_view.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/* Single-source definitions: restart visibility setting.
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+
/* Descriptor and configuration rows are #if !(defined(HAVE_LAKKA) || defined(HAVE_ODROIDGO2)) #if !defined(IOS); the string
8+
* tables always carry this row via the strings pass. */
9+
#if (!(defined(HAVE_LAKKA) || defined(HAVE_ODROIDGO2))) && !defined(IOS) || defined(SETTINGS_DEF_STRINGS_PASS)
10+
S_BOOL(menu_show_restart_retroarch, MENU_SHOW_RESTART_RETROARCH,
11+
"menu_show_restart_retroarch",
12+
DEFAULT_MENU_SHOW_RESTART, SD_FLAG_NONE, 0, 0,
13+
"Show 'Restart RetroArch'",
14+
"Show the 'Restart RetroArch' option in the Main Menu.")
15+
#endif

0 commit comments

Comments
 (0)