Skip to content

Commit 4a62790

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 7e59299 commit 4a62790

7 files changed

Lines changed: 322 additions & 65 deletions

File tree

‎configuration.c‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1950,6 +1950,9 @@ static struct config_bool_setting *populate_settings_bool(
19501950
#include "settings/settings_def_video_fullscreen.h"
19511951
#define SETTINGS_DEF_CONFIG_PASS
19521952
#include "settings/settings_def_video_sync.h"
1953+
#ifdef HAVE_MICROPHONE
1954+
#include "settings/settings_def_microphone_general.h"
1955+
#endif
19531956
#ifdef HAVE_MENU
19541957
#include "settings/settings_def_menu_startup.h"
19551958
#endif
@@ -2620,6 +2623,9 @@ static struct config_float_setting *populate_settings_float(
26202623
#include "settings/settings_def_video_fullscreen.h"
26212624
#define SETTINGS_DEF_CONFIG_PASS
26222625
#include "settings/settings_def_video_sync.h"
2626+
#ifdef HAVE_MICROPHONE
2627+
#include "settings/settings_def_microphone_general.h"
2628+
#endif
26232629
#ifdef HAVE_MENU
26242630
#include "settings/settings_def_menu_startup.h"
26252631
#endif
@@ -3186,7 +3192,6 @@ static struct config_uint_setting *populate_settings_uint(
31863192

31873193
#ifdef HAVE_MICROPHONE
31883194
SETTING_UINT("microphone_latency", &settings->uints.microphone_latency, false, 0 /* TODO */, false);
3189-
SETTING_UINT("microphone_resampler_quality", &settings->uints.microphone_resampler_quality, true, DEFAULT_AUDIO_RESAMPLER_QUALITY_LEVEL, false);
31903195
SETTING_UINT("microphone_rate", &settings->uints.microphone_sample_rate, true, DEFAULT_INPUT_RATE, false);
31913196
#endif
31923197

@@ -3249,6 +3254,9 @@ static struct config_uint_setting *populate_settings_uint(
32493254
#include "settings/settings_def_video_fullscreen.h"
32503255
#define SETTINGS_DEF_CONFIG_PASS
32513256
#include "settings/settings_def_video_sync.h"
3257+
#ifdef HAVE_MICROPHONE
3258+
#include "settings/settings_def_microphone_general.h"
3259+
#endif
32523260
#ifdef HAVE_MENU
32533261
#include "settings/settings_def_menu_startup.h"
32543262
#endif
@@ -3871,6 +3879,9 @@ static struct config_int_setting *populate_settings_int(
38713879
#include "settings/settings_def_video_fullscreen.h"
38723880
#define SETTINGS_DEF_CONFIG_PASS
38733881
#include "settings/settings_def_video_sync.h"
3882+
#ifdef HAVE_MICROPHONE
3883+
#include "settings/settings_def_microphone_general.h"
3884+
#endif
38743885
#ifdef HAVE_MENU
38753886
#include "settings/settings_def_menu_startup.h"
38763887
#endif
@@ -4343,6 +4354,9 @@ static struct config_int_setting *populate_settings_int(
43434354
#include "settings/settings_def_video_fullscreen.h"
43444355
#define SETTINGS_DEF_CONFIG_PASS
43454356
#include "settings/settings_def_video_sync.h"
4357+
#ifdef HAVE_MICROPHONE
4358+
#include "settings/settings_def_microphone_general.h"
4359+
#endif
43464360
#ifdef HAVE_MENU
43474361
#include "settings/settings_def_menu_startup.h"
43484362
#endif

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,6 @@ MSG_HASH(
279279
MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_DRIVER,
280280
MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_DRIVER_STR
281281
)
282-
MSG_HASH(
283-
MENU_ENUM_LABEL_MICROPHONE_DEVICE,
284-
MENU_ENUM_LABEL_MICROPHONE_DEVICE_STR
285-
)
286282
MSG_HASH(
287283
MENU_ENUM_LABEL_MICROPHONE_SETTINGS,
288284
MENU_ENUM_LABEL_MICROPHONE_SETTINGS_STR
@@ -291,18 +287,10 @@ MSG_HASH(
291287
MENU_ENUM_LABEL_MICROPHONE_DRIVER,
292288
MENU_ENUM_LABEL_MICROPHONE_DRIVER_STR
293289
)
294-
MSG_HASH(
295-
MENU_ENUM_LABEL_MICROPHONE_INPUT_RATE,
296-
MENU_ENUM_LABEL_MICROPHONE_INPUT_RATE_STR
297-
)
298290
MSG_HASH(
299291
MENU_ENUM_LABEL_MICROPHONE_LATENCY,
300292
MENU_ENUM_LABEL_MICROPHONE_LATENCY_STR
301293
)
302-
MSG_HASH(
303-
MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_QUALITY,
304-
MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_QUALITY_STR
305-
)
306294
#endif
307295
MSG_HASH(
308296
MENU_ENUM_LABEL_AUTOSAVE_INTERVAL,

‎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_microphone_general.h"
562563
#include "../settings/settings_def_menu_startup.h"
563564
#include "../settings/settings_def_accessibility.h"
564565
#include "../settings/settings_def_video_refresh_rate.h"
@@ -850,6 +851,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
850851
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
851852
#include "../settings/settings_def_video_fullscreen.h"
852853
#include "../settings/settings_def_video_sync.h"
854+
#include "../settings/settings_def_microphone_general.h"
853855
#include "../settings/settings_def_menu_startup.h"
854856
#include "../settings/settings_def_accessibility.h"
855857
#include "../settings/settings_def_video_refresh_rate.h"

‎intl/msg_hash_us.h‎

Lines changed: 139 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6785,34 +6785,149 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
67856785
#undef S_FLOAT
67866786
#undef S_FLOAT_NS
67876787
#undef SETTINGS_DEF_STRINGS_PASS
6788-
MSG_HASH(
6789-
MENU_ENUM_LABEL_VALUE_MICROPHONE_DEVICE,
6790-
"Device"
6791-
)
6792-
MSG_HASH(
6793-
MENU_ENUM_SUBLABEL_MICROPHONE_DEVICE,
6794-
"Override the default input device the microphone driver uses. This is driver dependent."
6795-
)
6788+
/* GENERATED REGION: microphone general group (see settings_def_microphone_general.h). */
6789+
#define SETTINGS_DEF_STRINGS_PASS
6790+
#define S_BOOL(f, T, n, d, sd, df, c, us, sub) \
6791+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6792+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6793+
#define S_BOOL_NS(f, T, n, d, sd, df, c, us) \
6794+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6795+
#define S_UINT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
6796+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6797+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6798+
#define S_UINT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
6799+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6800+
#define S_INT(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us, sub) \
6801+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6802+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6803+
#define S_INT_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, us) \
6804+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6805+
#define S_FLOAT(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us, sub) \
6806+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6807+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6808+
#define S_FLOAT_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, us) \
6809+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6810+
#define S_STRING(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
6811+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6812+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6813+
#define S_STRING_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
6814+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6815+
#define S_DIR(f, T, n, d, el, sd, c, sta, us, sub) \
6816+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6817+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6818+
#define S_DIR_NS(f, T, n, d, el, sd, c, sta, us) \
6819+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6820+
#define S_STRING_P(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
6821+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6822+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6823+
#define S_STRING_P_NS(f, T, n, d, sd, c, ok, rp, sta, sel, lf, rt, ui, us) \
6824+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6825+
#define S_PATH(f, T, n, d, sd, c, vals, rp, ui, us, sub) \
6826+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6827+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6828+
#define S_PATH_NS(f, T, n, d, sd, c, vals, rp, ui, us) \
6829+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6830+
#define S_PATH_DS(f, T, n, df2, sd, c, vals, rp, ui, us, sub) \
6831+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6832+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6833+
#define S_PATH_DS_NS(f, T, n, df2, sd, c, vals, rp, ui, us) \
6834+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6835+
#define S_ACTION(T, n, us, sub) \
6836+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6837+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6838+
#define S_ACTION_NS(T, n, us) \
6839+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6840+
#define S_BOOL_EX(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us, sub) \
6841+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6842+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6843+
#define S_BOOL_EX_NS(f, T, n, d, sd, df, c, ok, rp, sta, sel, lf, rt, ui, us) \
6844+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6845+
#define S_UINT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
6846+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6847+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6848+
#define S_UINT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
6849+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6850+
#define S_INT_EX(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us, sub) \
6851+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6852+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6853+
#define S_INT_EX_NS(f, T, n, d, sd, df, c, mn, mx, st, ob, ok, rp, sta, sel, lf, rt, ui, us) \
6854+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6855+
#define S_FLOAT_EX(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us, sub) \
6856+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6857+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6858+
#define S_FLOAT_EX_NS(f, T, n, d, rnd, sd, df, c, mn, mx, st, ok, rp, sta, sel, lf, rt, ui, us) \
6859+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6860+
#define S_ACTION_EX(T, n, sd, ok, rp, c, us, sub) \
6861+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us) \
6862+
MSG_HASH(MENU_ENUM_SUBLABEL_##T, sub)
6863+
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) \
6864+
MSG_HASH(MENU_ENUM_LABEL_VALUE_##T, us)
6865+
#include "../settings/settings_def_microphone_general.h"
6866+
#undef S_BOOL
6867+
#undef S_BOOL_NS
6868+
#undef S_BOOL_H
6869+
#undef S_BOOL_NS_H
6870+
#undef S_UINT
6871+
#undef S_UINT_NS
6872+
#undef S_UINT_H
6873+
#undef S_UINT_NS_H
6874+
#undef S_INT
6875+
#undef S_INT_NS
6876+
#undef S_INT_H
6877+
#undef S_INT_NS_H
6878+
#undef S_FLOAT
6879+
#undef S_FLOAT_NS
6880+
#undef S_FLOAT_H
6881+
#undef S_FLOAT_NS_H
6882+
#undef S_STRING
6883+
#undef S_STRING_NS
6884+
#undef S_STRING_H
6885+
#undef S_STRING_NS_H
6886+
#undef S_DIR
6887+
#undef S_DIR_NS
6888+
#undef S_DIR_H
6889+
#undef S_DIR_NS_H
6890+
#undef S_STRING_P
6891+
#undef S_STRING_P_NS
6892+
#undef S_STRING_P_H
6893+
#undef S_STRING_P_NS_H
6894+
#undef S_PATH
6895+
#undef S_PATH_NS
6896+
#undef S_PATH_H
6897+
#undef S_PATH_NS_H
6898+
#undef S_PATH_DS
6899+
#undef S_PATH_DS_NS
6900+
#undef S_PATH_DS_H
6901+
#undef S_PATH_DS_NS_H
6902+
#undef S_ACTION
6903+
#undef S_ACTION_NS
6904+
#undef S_ACTION_H
6905+
#undef S_ACTION_NS_H
6906+
#undef S_BOOL_EX
6907+
#undef S_BOOL_EX_NS
6908+
#undef S_BOOL_EX_H
6909+
#undef S_BOOL_EX_NS_H
6910+
#undef S_UINT_EX
6911+
#undef S_UINT_EX_NS
6912+
#undef S_UINT_EX_H
6913+
#undef S_UINT_EX_NS_H
6914+
#undef S_INT_EX
6915+
#undef S_INT_EX_NS
6916+
#undef S_INT_EX_H
6917+
#undef S_INT_EX_NS_H
6918+
#undef S_FLOAT_EX
6919+
#undef S_FLOAT_EX_NS
6920+
#undef S_FLOAT_EX_H
6921+
#undef S_FLOAT_EX_NS_H
6922+
#undef S_ACTION_EX
6923+
#undef S_ACTION_EX_NS
6924+
#undef S_ACTION_EX_H
6925+
#undef S_ACTION_EX_NS_H
6926+
#undef SETTINGS_DEF_STRINGS_PASS
67966927
MSG_HASH(
67976928
MENU_ENUM_LABEL_HELP_MICROPHONE_DEVICE,
67986929
"Override the default input device the microphone driver uses. This is driver dependent."
67996930
)
6800-
MSG_HASH(
6801-
MENU_ENUM_LABEL_VALUE_MICROPHONE_RESAMPLER_QUALITY,
6802-
"Resampler Quality"
6803-
)
6804-
MSG_HASH(
6805-
MENU_ENUM_SUBLABEL_MICROPHONE_RESAMPLER_QUALITY,
6806-
"Lower this value to favor performance/lower latency over audio quality, increase for better audio quality at the expense of performance/lower latency."
6807-
)
6808-
MSG_HASH(
6809-
MENU_ENUM_LABEL_VALUE_MICROPHONE_INPUT_RATE,
6810-
"Default Input Rate (Hz)"
6811-
)
6812-
MSG_HASH(
6813-
MENU_ENUM_SUBLABEL_MICROPHONE_INPUT_RATE,
6814-
"Audio input sample rate, used if a core doesn't request a specific number."
6815-
)
68166931
MSG_HASH(
68176932
MENU_ENUM_LABEL_VALUE_MICROPHONE_LATENCY,
68186933
"Audio Input Latency (ms)"

0 commit comments

Comments
 (0)