Skip to content

Commit 1164bb0

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 ac1f973 commit 1164bb0

9 files changed

Lines changed: 704 additions & 76 deletions

‎configuration.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,6 @@ static struct config_bool_setting *populate_settings_bool(
18271827
SETTING_BOOL("video_filter_enable", &settings->bools.video_filter_enable, true, true, false);
18281828
SETTING_BOOL("apply_cheats_after_toggle", &settings->bools.apply_cheats_after_toggle, true, DEFAULT_APPLY_CHEATS_AFTER_TOGGLE, false);
18291829
SETTING_BOOL("apply_cheats_after_load", &settings->bools.apply_cheats_after_load, true, DEFAULT_APPLY_CHEATS_AFTER_LOAD, false);
1830-
SETTING_BOOL("rewind_enable", &settings->bools.rewind_enable, true, DEFAULT_REWIND_ENABLE, false);
18311830
SETTING_BOOL("fastforward_frameskip", &settings->bools.fastforward_frameskip, true, DEFAULT_FASTFORWARD_FRAMESKIP, false);
18321831
SETTING_BOOL("vrr_runloop_enable", &settings->bools.vrr_runloop_enable, true, DEFAULT_VRR_RUNLOOP_ENABLE, false);
18331832
SETTING_BOOL("menu_throttle_framerate", &settings->bools.menu_throttle_framerate, true, true, false);
@@ -1971,6 +1970,8 @@ static struct config_bool_setting *populate_settings_bool(
19711970
#include "settings/settings_def_video_fullscreen.h"
19721971
#define SETTINGS_DEF_CONFIG_PASS
19731972
#include "settings/settings_def_video_sync.h"
1973+
#include "settings/settings_def_rewind.h"
1974+
#include "settings/settings_def_playlist_history.h"
19741975
#ifdef HAVE_MENU
19751976
#include "settings/settings_def_menu_scroll.h"
19761977
#endif
@@ -2482,7 +2483,6 @@ static struct config_bool_setting *populate_settings_bool(
24822483
SETTING_BOOL("playlist_use_old_format", &settings->bools.playlist_use_old_format, true, DEFAULT_PLAYLIST_USE_OLD_FORMAT, false);
24832484
SETTING_BOOL("playlist_compression", &settings->bools.playlist_compression, true, DEFAULT_PLAYLIST_COMPRESSION, false);
24842485
SETTING_BOOL("playlist_show_sublabels", &settings->bools.playlist_show_sublabels, true, DEFAULT_PLAYLIST_SHOW_SUBLABELS, false);
2485-
SETTING_BOOL("playlist_show_entry_idx", &settings->bools.playlist_show_entry_idx, true, DEFAULT_PLAYLIST_SHOW_ENTRY_IDX, false);
24862486
SETTING_BOOL("playlist_sort_alphabetical", &settings->bools.playlist_sort_alphabetical, true, DEFAULT_PLAYLIST_SORT_ALPHABETICAL, false);
24872487
SETTING_BOOL("playlist_fuzzy_archive_match", &settings->bools.playlist_fuzzy_archive_match, true, DEFAULT_PLAYLIST_FUZZY_ARCHIVE_MATCH, false);
24882488
SETTING_BOOL("playlist_portable_paths", &settings->bools.playlist_portable_paths, true, DEFAULT_PLAYLIST_PORTABLE_PATHS, false);
@@ -2596,6 +2596,8 @@ static struct config_float_setting *populate_settings_float(
25962596
#include "settings/settings_def_video_fullscreen.h"
25972597
#define SETTINGS_DEF_CONFIG_PASS
25982598
#include "settings/settings_def_video_sync.h"
2599+
#include "settings/settings_def_rewind.h"
2600+
#include "settings/settings_def_playlist_history.h"
25992601
#ifdef HAVE_MENU
26002602
#include "settings/settings_def_menu_scroll.h"
26012603
#endif
@@ -3027,7 +3029,6 @@ static struct config_uint_setting *populate_settings_uint(
30273029
SETTING_UINT("core_updater_auto_backup_history_size", &settings->uints.core_updater_auto_backup_history_size, true, DEFAULT_CORE_UPDATER_AUTO_BACKUP_HISTORY_SIZE, false);
30283030
SETTING_UINT("autosave_interval", &settings->uints.autosave_interval, true, DEFAULT_AUTOSAVE_INTERVAL, false);
30293031
SETTING_UINT("savestate_automatic_interval", &settings->uints.savestate_automatic_interval, true, DEFAULT_SAVESTATE_AUTOMATIC_INTERVAL, false);
3030-
SETTING_UINT("rewind_granularity", &settings->uints.rewind_granularity, true, DEFAULT_REWIND_GRANULARITY, false);
30313032
SETTING_UINT("run_ahead_frames", &settings->uints.run_ahead_frames, true, DEFAULT_RUN_AHEAD_FRAMES, false);
30323033
SETTING_UINT("replay_max_keep", &settings->uints.replay_max_keep, true, DEFAULT_REPLAY_MAX_KEEP, false);
30333034
SETTING_UINT("replay_checkpoint_interval", &settings->uints.replay_checkpoint_interval, true, DEFAULT_REPLAY_CHECKPOINT_INTERVAL, false);
@@ -3041,7 +3042,6 @@ static struct config_uint_setting *populate_settings_uint(
30413042
SETTING_UINT("content_history_size", &settings->uints.content_history_size, true, DEFAULT_CONTENT_HISTORY_SIZE, false);
30423043
SETTING_UINT("playlist_entry_remove_enable", &settings->uints.playlist_entry_remove_enable, true, DEFAULT_PLAYLIST_ENTRY_REMOVE_ENABLE, false);
30433044
SETTING_UINT("playlist_show_inline_core_name", &settings->uints.playlist_show_inline_core_name, true, DEFAULT_PLAYLIST_SHOW_INLINE_CORE_NAME, false);
3044-
SETTING_UINT("playlist_show_history_icons", &settings->uints.playlist_show_history_icons, true, DEFAULT_PLAYLIST_SHOW_HISTORY_ICONS, false);
30453045
SETTING_UINT("playlist_sublabel_runtime_type", &settings->uints.playlist_sublabel_runtime_type, true, DEFAULT_PLAYLIST_SUBLABEL_RUNTIME_TYPE, false);
30463046
SETTING_UINT("playlist_sublabel_last_played_style", &settings->uints.playlist_sublabel_last_played_style, true, DEFAULT_PLAYLIST_SUBLABEL_LAST_PLAYED_STYLE, false);
30473047
SETTING_UINT("quit_on_close_content", &settings->uints.quit_on_close_content, true, DEFAULT_QUIT_ON_CLOSE_CONTENT, false);
@@ -3165,6 +3165,8 @@ static struct config_uint_setting *populate_settings_uint(
31653165
#include "settings/settings_def_video_fullscreen.h"
31663166
#define SETTINGS_DEF_CONFIG_PASS
31673167
#include "settings/settings_def_video_sync.h"
3168+
#include "settings/settings_def_rewind.h"
3169+
#include "settings/settings_def_playlist_history.h"
31683170
#ifdef HAVE_MENU
31693171
#include "settings/settings_def_menu_scroll.h"
31703172
#endif
@@ -3702,6 +3704,8 @@ static struct config_int_setting *populate_settings_int(
37023704
#include "settings/settings_def_video_fullscreen.h"
37033705
#define SETTINGS_DEF_CONFIG_PASS
37043706
#include "settings/settings_def_video_sync.h"
3707+
#include "settings/settings_def_rewind.h"
3708+
#include "settings/settings_def_playlist_history.h"
37053709
#ifdef HAVE_MENU
37063710
#include "settings/settings_def_menu_scroll.h"
37073711
#endif
@@ -4073,6 +4077,8 @@ static struct config_int_setting *populate_settings_int(
40734077
#include "settings/settings_def_video_fullscreen.h"
40744078
#define SETTINGS_DEF_CONFIG_PASS
40754079
#include "settings/settings_def_video_sync.h"
4080+
#include "settings/settings_def_rewind.h"
4081+
#include "settings/settings_def_playlist_history.h"
40764082
#ifdef HAVE_MENU
40774083
#include "settings/settings_def_menu_scroll.h"
40784084
#endif

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2838,18 +2838,10 @@ MSG_HASH(
28382838
MENU_ENUM_LABEL_CHEAT_SETTINGS,
28392839
MENU_ENUM_LABEL_CHEAT_SETTINGS_STR
28402840
)
2841-
MSG_HASH(
2842-
MENU_ENUM_LABEL_REWIND_ENABLE,
2843-
MENU_ENUM_LABEL_REWIND_ENABLE_STR
2844-
)
28452841
MSG_HASH(
28462842
MENU_ENUM_LABEL_REWIND_SETTINGS,
28472843
MENU_ENUM_LABEL_REWIND_SETTINGS_STR
28482844
)
2849-
MSG_HASH(
2850-
MENU_ENUM_LABEL_REWIND_GRANULARITY,
2851-
MENU_ENUM_LABEL_REWIND_GRANULARITY_STR
2852-
)
28532845
MSG_HASH(
28542846
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE,
28552847
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE_STR
@@ -4817,14 +4809,6 @@ MSG_HASH(
48174809
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS,
48184810
MENU_ENUM_LABEL_PLAYLIST_SHOW_SUBLABELS_STR
48194811
)
4820-
MSG_HASH(
4821-
MENU_ENUM_LABEL_PLAYLIST_SHOW_HISTORY_ICONS,
4822-
MENU_ENUM_LABEL_PLAYLIST_SHOW_HISTORY_ICONS_STR
4823-
)
4824-
MSG_HASH(
4825-
MENU_ENUM_LABEL_PLAYLIST_SHOW_ENTRY_IDX,
4826-
MENU_ENUM_LABEL_PLAYLIST_SHOW_ENTRY_IDX_STR
4827-
)
48284812
MSG_HASH(
48294813
MENU_ENUM_LABEL_PLAYLIST_FUZZY_ARCHIVE_MATCH,
48304814
MENU_ENUM_LABEL_PLAYLIST_FUZZY_ARCHIVE_MATCH_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_rewind.h"
563+
#include "../settings/settings_def_playlist_history.h"
562564
#include "../settings/settings_def_menu_scroll.h"
563565
#include "../settings/settings_def_menu_thumbnails.h"
564566
#include "../settings/settings_def_input_turbo.h"
@@ -789,6 +791,8 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
789791
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
790792
#include "../settings/settings_def_video_fullscreen.h"
791793
#include "../settings/settings_def_video_sync.h"
794+
#include "../settings/settings_def_rewind.h"
795+
#include "../settings/settings_def_playlist_history.h"
792796
#include "../settings/settings_def_menu_scroll.h"
793797
#include "../settings/settings_def_menu_thumbnails.h"
794798
#include "../settings/settings_def_input_turbo.h"

‎intl/msg_hash_us.h‎

Lines changed: 218 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8694,22 +8694,115 @@ MSG_HASH(
86948694

86958695
/* Settings > Frame Throttle > Rewind */
86968696

8697-
MSG_HASH(
8698-
MENU_ENUM_LABEL_VALUE_REWIND_ENABLE,
8699-
"Rewind Support"
8700-
)
8701-
MSG_HASH(
8702-
MENU_ENUM_SUBLABEL_REWIND_ENABLE,
8703-
"Return to a previous point in recent gameplay. This causes a severe performance hit when playing."
8704-
)
8705-
MSG_HASH(
8706-
MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
8707-
"Rewind Frames"
8708-
)
8709-
MSG_HASH(
8710-
MENU_ENUM_SUBLABEL_REWIND_GRANULARITY,
8711-
"The number of frames to rewind per step. Higher values increase the rewind speed."
8712-
)
8697+
/* GENERATED REGION: rewind group (see settings_def_rewind.h). */
8698+
#define SETTINGS_DEF_STRINGS_PASS
8699+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
8700+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8701+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8702+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
8703+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8704+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
8705+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8706+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8707+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
8708+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8709+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
8710+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8711+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8712+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
8713+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8714+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
8715+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8716+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8717+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
8718+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8719+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8720+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8721+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8722+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
8723+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8724+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
8725+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8726+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8727+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
8728+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8729+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8730+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8731+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8732+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
8733+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8734+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
8735+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8736+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8737+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
8738+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8739+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
8740+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8741+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8742+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
8743+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8744+
#define S_ACTION(T, n, us, sub) \
8745+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8746+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8747+
#define S_ACTION_NS(T, n, us) \
8748+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8749+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8750+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8751+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8752+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
8753+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8754+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8755+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8756+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8757+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
8758+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8759+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8760+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8761+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8762+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
8763+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8764+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
8765+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8766+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8767+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
8768+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8769+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
8770+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
8771+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
8772+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
8773+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
8774+
#include "../settings/settings_def_rewind.h"
8775+
#undef S_BOOL
8776+
#undef S_BOOL_NS
8777+
#undef S_UINT
8778+
#undef S_UINT_NS
8779+
#undef S_INT
8780+
#undef S_INT_NS
8781+
#undef S_FLOAT
8782+
#undef S_FLOAT_NS
8783+
#undef S_STRING
8784+
#undef S_STRING_NS
8785+
#undef S_DIR
8786+
#undef S_DIR_NS
8787+
#undef S_STRING_P
8788+
#undef S_STRING_P_NS
8789+
#undef S_PATH
8790+
#undef S_PATH_NS
8791+
#undef S_PATH_DS
8792+
#undef S_PATH_DS_NS
8793+
#undef S_ACTION
8794+
#undef S_ACTION_NS
8795+
#undef S_BOOL_EX
8796+
#undef S_BOOL_EX_NS
8797+
#undef S_UINT_EX
8798+
#undef S_UINT_EX_NS
8799+
#undef S_INT_EX
8800+
#undef S_INT_EX_NS
8801+
#undef S_FLOAT_EX
8802+
#undef S_FLOAT_EX_NS
8803+
#undef S_ACTION_EX
8804+
#undef S_ACTION_EX_NS
8805+
#undef SETTINGS_DEF_STRINGS_PASS
87138806
MSG_HASH(
87148807
MENU_ENUM_LABEL_VALUE_REWIND_BUFFER_SIZE,
87158808
"Rewind Buffer Size (MB)"
@@ -13621,14 +13714,115 @@ MSG_HASH(
1362113714
MENU_ENUM_SUBLABEL_PLAYLIST_SHOW_SUBLABELS,
1362213715
"Show additional information for each playlist entry, such as current core association and runtime (if available). Has a variable performance impact."
1362313716
)
13624-
MSG_HASH(
13625-
MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_HISTORY_ICONS,
13626-
"Show Content Specific Icons in History and Favorites"
13627-
)
13628-
MSG_HASH(
13629-
MENU_ENUM_SUBLABEL_PLAYLIST_SHOW_HISTORY_ICONS,
13630-
"Show specific icons for each history and favorites playlist entry. Has a variable performance impact."
13631-
)
13717+
/* GENERATED REGION: history size group (see settings_def_playlist_history.h). */
13718+
#define SETTINGS_DEF_STRINGS_PASS
13719+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
13720+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13721+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13722+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
13723+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13724+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
13725+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13726+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13727+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
13728+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13729+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
13730+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13731+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13732+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
13733+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13734+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
13735+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13736+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13737+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
13738+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13739+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
13740+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13741+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13742+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
13743+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13744+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
13745+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13746+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13747+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
13748+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13749+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
13750+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13751+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13752+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
13753+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13754+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
13755+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13756+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13757+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
13758+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13759+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
13760+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13761+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13762+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
13763+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13764+
#define S_ACTION(T, n, us, sub) \
13765+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13766+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13767+
#define S_ACTION_NS(T, n, us) \
13768+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13769+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
13770+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13771+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13772+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
13773+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13774+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
13775+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13776+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13777+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
13778+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13779+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
13780+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13781+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13782+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
13783+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13784+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
13785+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13786+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13787+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
13788+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13789+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
13790+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
13791+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
13792+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
13793+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
13794+
#include "../settings/settings_def_playlist_history.h"
13795+
#undef S_BOOL
13796+
#undef S_BOOL_NS
13797+
#undef S_UINT
13798+
#undef S_UINT_NS
13799+
#undef S_INT
13800+
#undef S_INT_NS
13801+
#undef S_FLOAT
13802+
#undef S_FLOAT_NS
13803+
#undef S_STRING
13804+
#undef S_STRING_NS
13805+
#undef S_DIR
13806+
#undef S_DIR_NS
13807+
#undef S_STRING_P
13808+
#undef S_STRING_P_NS
13809+
#undef S_PATH
13810+
#undef S_PATH_NS
13811+
#undef S_PATH_DS
13812+
#undef S_PATH_DS_NS
13813+
#undef S_ACTION
13814+
#undef S_ACTION_NS
13815+
#undef S_BOOL_EX
13816+
#undef S_BOOL_EX_NS
13817+
#undef S_UINT_EX
13818+
#undef S_UINT_EX_NS
13819+
#undef S_INT_EX
13820+
#undef S_INT_EX_NS
13821+
#undef S_FLOAT_EX
13822+
#undef S_FLOAT_EX_NS
13823+
#undef S_ACTION_EX
13824+
#undef S_ACTION_EX_NS
13825+
#undef SETTINGS_DEF_STRINGS_PASS
1363213826
MSG_HASH(
1363313827
MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_CORE,
1363413828
"Core:"
@@ -13705,14 +13899,6 @@ MSG_HASH(
1370513899
MENU_ENUM_LABEL_VALUE_TIME_UNIT_AGO,
1370613900
"ago"
1370713901
)
13708-
MSG_HASH(
13709-
MENU_ENUM_LABEL_VALUE_PLAYLIST_SHOW_ENTRY_IDX,
13710-
"Show Playlist Entry Index"
13711-
)
13712-
MSG_HASH(
13713-
MENU_ENUM_SUBLABEL_PLAYLIST_SHOW_ENTRY_IDX,
13714-
"Show entry numbers when viewing playlists. Display format is dependent upon the currently selected menu driver."
13715-
)
1371613902
MSG_HASH(
1371713903
MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_RUNTIME_TYPE,
1371813904
"Playlist Sub-Label Runtime"

0 commit comments

Comments
 (0)