Skip to content

Commit 48ebc3c

Browse files
libretroadminLibretroAdmin
authored andcommitted
settings: migrate the dynamic wallpaper setting 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 d91d069 commit 48ebc3c

8 files changed

Lines changed: 121 additions & 17 deletions

File tree

configuration.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1963,6 +1963,9 @@ static struct config_bool_setting *populate_settings_bool(
19631963
#include "settings/settings_def_video_fullscreen.h"
19641964
#define SETTINGS_DEF_CONFIG_PASS
19651965
#include "settings/settings_def_video_sync.h"
1966+
#ifdef HAVE_MENU
1967+
#include "settings/settings_def_menu_wallpaper.h"
1968+
#endif
19661969
#include "settings/settings_def_runahead_warnings.h"
19671970
#include "settings/settings_def_input_auto_mouse_grab.h"
19681971
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
@@ -2102,7 +2105,6 @@ static struct config_bool_setting *populate_settings_bool(
21022105
SETTING_BOOL("menu_core_enable", &settings->bools.menu_core_enable, true, true, false);
21032106
SETTING_BOOL("menu_show_sublabels", &settings->bools.menu_show_sublabels, true, DEFAULT_MENU_SHOW_SUBLABELS, false);
21042107
SETTING_BOOL("menu_show_confirm", &settings->bools.menu_show_confirm, true, DEFAULT_MENU_SHOW_CONFIRM, false);
2105-
SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE, false);
21062108
SETTING_BOOL("menu_ticker_smooth", &settings->bools.menu_ticker_smooth, true, DEFAULT_MENU_TICKER_SMOOTH, false);
21072109
SETTING_BOOL("menu_scroll_fast", &settings->bools.menu_scroll_fast, true, DEFAULT_MENU_SCROLL_FAST, false);
21082110
SETTING_BOOL("menu_ignore_missing_assets", &settings->bools.menu_ignore_missing_assets, true, DEFAULT_MENU_IGNORE_MISSING_ASSETS, false);
@@ -2348,6 +2350,9 @@ static struct config_float_setting *populate_settings_float(
23482350
#include "settings/settings_def_video_fullscreen.h"
23492351
#define SETTINGS_DEF_CONFIG_PASS
23502352
#include "settings/settings_def_video_sync.h"
2353+
#ifdef HAVE_MENU
2354+
#include "settings/settings_def_menu_wallpaper.h"
2355+
#endif
23512356
#include "settings/settings_def_runahead_warnings.h"
23522357
#include "settings/settings_def_input_auto_mouse_grab.h"
23532358
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
@@ -2676,6 +2681,9 @@ static struct config_uint_setting *populate_settings_uint(
26762681
#include "settings/settings_def_video_fullscreen.h"
26772682
#define SETTINGS_DEF_CONFIG_PASS
26782683
#include "settings/settings_def_video_sync.h"
2684+
#ifdef HAVE_MENU
2685+
#include "settings/settings_def_menu_wallpaper.h"
2686+
#endif
26792687
#include "settings/settings_def_runahead_warnings.h"
26802688
#include "settings/settings_def_input_auto_mouse_grab.h"
26812689
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)
@@ -2979,6 +2987,9 @@ static struct config_int_setting *populate_settings_int(
29792987
#include "settings/settings_def_video_fullscreen.h"
29802988
#define SETTINGS_DEF_CONFIG_PASS
29812989
#include "settings/settings_def_video_sync.h"
2990+
#ifdef HAVE_MENU
2991+
#include "settings/settings_def_menu_wallpaper.h"
2992+
#endif
29822993
#include "settings/settings_def_runahead_warnings.h"
29832994
#include "settings/settings_def_input_auto_mouse_grab.h"
29842995
#if defined(HAVE_DINPUT) || defined(HAVE_WINRAWINPUT)

intl/msg_hash_lbl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,10 +1564,6 @@ MSG_HASH(
15641564
MENU_ENUM_LABEL_ALWAYS_RELOAD_CORE_ON_RUN_CONTENT_STR
15651565
)
15661566
#endif
1567-
MSG_HASH(
1568-
MENU_ENUM_LABEL_DYNAMIC_WALLPAPER,
1569-
MENU_ENUM_LABEL_DYNAMIC_WALLPAPER_STR
1570-
)
15711567
MSG_HASH(
15721568
MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY,
15731569
MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY_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_wallpaper.h"
540541
#include "../settings/settings_def_runahead_warnings.h"
541542
#include "../settings/settings_def_input_auto_mouse_grab.h"
542543
#include "../settings/settings_def_input_nowinkey.h"
@@ -605,6 +606,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
605606
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) (uint32_t)MENU_ENUM_LABEL_##T,
606607
#include "../settings/settings_def_video_fullscreen.h"
607608
#include "../settings/settings_def_video_sync.h"
609+
#include "../settings/settings_def_menu_wallpaper.h"
608610
#include "../settings/settings_def_runahead_warnings.h"
609611
#include "../settings/settings_def_input_auto_mouse_grab.h"
610612
#include "../settings/settings_def_input_nowinkey.h"

intl/msg_hash_us.h

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12475,14 +12475,38 @@ MSG_HASH(
1247512475
MENU_ENUM_SUBLABEL_ICON_THUMBNAILS,
1247612476
"Type of playlist icon thumbnail to display."
1247712477
)
12478-
MSG_HASH(
12479-
MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
12480-
"Dynamic Background"
12481-
)
12482-
MSG_HASH(
12483-
MENU_ENUM_SUBLABEL_DYNAMIC_WALLPAPER,
12484-
"Dynamically load a new wallpaper depending on context."
12485-
)
12478+
/* GENERATED REGION: dynamic wallpaper setting (see settings_def_menu_wallpaper.h). */
12479+
#define SETTINGS_DEF_STRINGS_PASS
12480+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
12481+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12482+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12483+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
12484+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12485+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
12486+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12487+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12488+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
12489+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12490+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
12491+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12492+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12493+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
12494+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12495+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
12496+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
12497+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
12498+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
12499+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
12500+
#include "../settings/settings_def_menu_wallpaper.h"
12501+
#undef S_BOOL
12502+
#undef S_BOOL_NS
12503+
#undef S_UINT
12504+
#undef S_UINT_NS
12505+
#undef S_INT
12506+
#undef S_INT_NS
12507+
#undef S_FLOAT
12508+
#undef S_FLOAT_NS
12509+
#undef SETTINGS_DEF_STRINGS_PASS
1248612510
MSG_HASH(
1248712511
MENU_ENUM_LABEL_VALUE_MENU_HORIZONTAL_ANIMATION,
1248812512
"Horizontal Animation"

menu/menu_setting.c

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16705,8 +16705,32 @@ static bool setting_append_list(
1670516705
{
1670616706
{
1670716707
static const setting_desc_t menu_desc_2[] = {
16708-
SDESC_BOOL_ROW(menu_dynamic_wallpaper_enable, DYNAMIC_WALLPAPER,
16709-
DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE, SD_FLAG_NONE, 0, 0),
16708+
/* GENERATED: rows come from settings_def_menu_wallpaper.h in order. */
16709+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
16710+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
16711+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
16712+
SDESC_BOOL_ROW(f, T, d, sd, df, c),
16713+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
16714+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16715+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
16716+
SDESC_UINT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16717+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
16718+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16719+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
16720+
SDESC_INT_ROW(f, T, d, sd, df, c, mn, mx, st, ob, ok, rp),
16721+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
16722+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
16723+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
16724+
SDESC_FLOAT_ROW(f, T, d, rnd, sd, df, c, mn, mx, st, ok, rp),
16725+
#include "../settings/settings_def_menu_wallpaper.h"
16726+
#undef S_BOOL
16727+
#undef S_BOOL_NS
16728+
#undef S_UINT
16729+
#undef S_UINT_NS
16730+
#undef S_INT
16731+
#undef S_INT_NS
16732+
#undef S_FLOAT
16733+
#undef S_FLOAT_NS
1671016734
};
1671116735
settings_list_add_desc(list, list_info, settings,
1671216736
menu_desc_2, ARRAY_SIZE(menu_desc_2),

msg_hash.h

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2164,7 +2164,44 @@ enum msg_hash_enums
21642164
MENU_LABEL(RUN_MUSIC),
21652165
MENU_LABEL(RUN),
21662166
MENU_LABEL(MENU_WALLPAPER),
2167-
MENU_LABEL(DYNAMIC_WALLPAPER),
2167+
/* GENERATED REGION: dynamic wallpaper setting enum rows (see settings/settings_def_menu_wallpaper.h). */
2168+
#define SETTINGS_DEF_ENUM_PASS
2169+
#define SETTINGS_DEF_STRINGS_PASS
2170+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) MENU_LABEL(T),
2171+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) MENU_LABEL(T),
2172+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2173+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2174+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LABEL(T),
2175+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LABEL(T),
2176+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LABEL(T),
2177+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LABEL(T),
2178+
#define S_BOOL_H(f, T, n, d, sd, df, c, us, sub) MENU_LBL_H(T),
2179+
#define S_UINT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2180+
#define S_BOOL_NS_H(f, T, n, d, sd, df, c, us) MENU_LBL_H(T),
2181+
#define S_INT_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) MENU_LBL_H(T),
2182+
#define S_FLOAT_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) MENU_LBL_H(T),
2183+
#define S_UINT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2184+
#define S_INT_NS_H(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) MENU_LBL_H(T),
2185+
#define S_FLOAT_NS_H(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) MENU_LBL_H(T),
2186+
#include "settings/settings_def_menu_wallpaper.h"
2187+
#undef S_BOOL
2188+
#undef S_BOOL_NS
2189+
#undef S_UINT
2190+
#undef S_UINT_NS
2191+
#undef S_INT
2192+
#undef S_INT_NS
2193+
#undef S_FLOAT
2194+
#undef S_FLOAT_NS
2195+
#undef S_BOOL_H
2196+
#undef S_UINT_H
2197+
#undef S_BOOL_NS_H
2198+
#undef S_INT_H
2199+
#undef S_FLOAT_H
2200+
#undef S_UINT_NS_H
2201+
#undef S_INT_NS_H
2202+
#undef S_FLOAT_NS_H
2203+
#undef SETTINGS_DEF_STRINGS_PASS
2204+
#undef SETTINGS_DEF_ENUM_PASS
21682205
/* GENERATED REGION: ui focus group enum rows (see settings/settings_def_ui_focus.h). */
21692206
#define SETTINGS_DEF_ENUM_PASS
21702207
#define SETTINGS_DEF_STRINGS_PASS

msg_hash_lbl_str.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,6 @@
396396
#define MENU_ENUM_LABEL_CORE_INFO_SAVESTATE_BYPASS_STR "core_info_savestate_bypass"
397397
#define MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN_STR "dummy_on_core_shutdown"
398398
#define MENU_ENUM_LABEL_ALWAYS_RELOAD_CORE_ON_RUN_CONTENT_STR "always_reload_core_on_run_content"
399-
#define MENU_ENUM_LABEL_DYNAMIC_WALLPAPER_STR "menu_dynamic_wallpaper_enable"
400399
#define MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY_STR "dynamic_wallpapers_directory"
401400
#define MENU_ENUM_LABEL_FASTFORWARD_RATIO_STR "fastforward_ratio"
402401
#define MENU_ENUM_LABEL_FASTFORWARD_FRAMESKIP_STR "fastforward_frameskip"
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/* Single-source definitions: dynamic wallpaper 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+
S_BOOL(menu_dynamic_wallpaper_enable, DYNAMIC_WALLPAPER,
8+
"menu_dynamic_wallpaper_enable",
9+
DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE, SD_FLAG_NONE, 0, 0,
10+
"Dynamic Background",
11+
"Dynamically load a new wallpaper depending on context.")

0 commit comments

Comments
 (0)