Skip to content

Commit 48a4ff2

Browse files
libretroadminLibretroAdmin
authored andcommitted
settings: migrate the services actions to a single-source def file
The main menu services table, long parked on mixed string-guard topology and the Lakka Switch pedantic debt; the strings-always emission, parent-matched lane tolerance and null-to-value lookup tolerance together clear it. Performed by tools/settings_migrate_group.py with the standard battery.
1 parent 5a5a95a commit 48a4ff2

8 files changed

Lines changed: 559 additions & 179 deletions

File tree

configuration.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1934,6 +1934,7 @@ static struct config_bool_setting *populate_settings_bool(
19341934
#include "settings/settings_def_video_fullscreen.h"
19351935
#define SETTINGS_DEF_CONFIG_PASS
19361936
#include "settings/settings_def_video_sync.h"
1937+
#include "settings/settings_def_services_actions.h"
19371938
#include "settings/settings_def_video_driver_actions.h"
19381939
#include "settings/settings_def_gpu_index_vulkan.h"
19391940
#include "settings/settings_def_gpu_index_gl.h"
@@ -2640,6 +2641,7 @@ static struct config_float_setting *populate_settings_float(
26402641
#include "settings/settings_def_video_fullscreen.h"
26412642
#define SETTINGS_DEF_CONFIG_PASS
26422643
#include "settings/settings_def_video_sync.h"
2644+
#include "settings/settings_def_services_actions.h"
26432645
#include "settings/settings_def_video_driver_actions.h"
26442646
#include "settings/settings_def_gpu_index_vulkan.h"
26452647
#include "settings/settings_def_gpu_index_gl.h"
@@ -3301,6 +3303,7 @@ static struct config_uint_setting *populate_settings_uint(
33013303
#include "settings/settings_def_video_fullscreen.h"
33023304
#define SETTINGS_DEF_CONFIG_PASS
33033305
#include "settings/settings_def_video_sync.h"
3306+
#include "settings/settings_def_services_actions.h"
33043307
#include "settings/settings_def_video_driver_actions.h"
33053308
#include "settings/settings_def_gpu_index_vulkan.h"
33063309
#include "settings/settings_def_gpu_index_gl.h"
@@ -3998,6 +4001,7 @@ static struct config_int_setting *populate_settings_int(
39984001
#include "settings/settings_def_video_fullscreen.h"
39994002
#define SETTINGS_DEF_CONFIG_PASS
40004003
#include "settings/settings_def_video_sync.h"
4004+
#include "settings/settings_def_services_actions.h"
40014005
#include "settings/settings_def_video_driver_actions.h"
40024006
#include "settings/settings_def_gpu_index_vulkan.h"
40034007
#include "settings/settings_def_gpu_index_gl.h"
@@ -4583,6 +4587,7 @@ static struct config_int_setting *populate_settings_int(
45834587
#include "settings/settings_def_video_fullscreen.h"
45844588
#define SETTINGS_DEF_CONFIG_PASS
45854589
#include "settings/settings_def_video_sync.h"
4590+
#include "settings/settings_def_services_actions.h"
45864591
#include "settings/settings_def_video_driver_actions.h"
45874592
#include "settings/settings_def_gpu_index_vulkan.h"
45884593
#include "settings/settings_def_gpu_index_gl.h"

intl/msg_hash_lbl.h

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,6 @@ MSG_HASH(
224224
MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER,
225225
MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_STR
226226
)
227-
MSG_HASH(
228-
MENU_ENUM_LABEL_AUDIO_SYNCHRONIZATION_SETTINGS,
229-
MENU_ENUM_LABEL_AUDIO_SYNCHRONIZATION_SETTINGS_STR
230-
)
231-
MSG_HASH(
232-
MENU_ENUM_LABEL_AUDIO_OUTPUT_SETTINGS,
233-
MENU_ENUM_LABEL_AUDIO_OUTPUT_SETTINGS_STR
234-
)
235227
MSG_HASH(
236228
MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT,
237229
MENU_ENUM_LABEL_AUDIO_WASAPI_FLOAT_FORMAT_STR
@@ -241,10 +233,6 @@ MSG_HASH(
241233
MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_DRIVER,
242234
MENU_ENUM_LABEL_MICROPHONE_RESAMPLER_DRIVER_STR
243235
)
244-
MSG_HASH(
245-
MENU_ENUM_LABEL_MICROPHONE_SETTINGS,
246-
MENU_ENUM_LABEL_MICROPHONE_SETTINGS_STR
247-
)
248236
MSG_HASH(
249237
MENU_ENUM_LABEL_MICROPHONE_DRIVER,
250238
MENU_ENUM_LABEL_MICROPHONE_DRIVER_STR
@@ -573,10 +561,6 @@ MSG_HASH(
573561
MENU_ENUM_LABEL_CORE_STEAM_UNINSTALL,
574562
MENU_ENUM_LABEL_CORE_STEAM_UNINSTALL_STR
575563
)
576-
MSG_HASH(
577-
MENU_ENUM_LABEL_STEAM_SETTINGS,
578-
MENU_ENUM_LABEL_STEAM_SETTINGS_STR
579-
)
580564
#endif
581565
MSG_HASH(
582566
MENU_ENUM_LABEL_CPU_ARCHITECTURE,
@@ -1184,10 +1168,6 @@ MSG_HASH(
11841168
MENU_ENUM_LABEL_FAVORITES,
11851169
MENU_ENUM_LABEL_FAVORITES_STR
11861170
)
1187-
MSG_HASH(
1188-
MENU_ENUM_LABEL_DIRECTORY_SETTINGS,
1189-
MENU_ENUM_LABEL_DIRECTORY_SETTINGS_STR
1190-
)
11911171
MSG_HASH(
11921172
MENU_ENUM_LABEL_DISK_TRAY_EJECT,
11931173
MENU_ENUM_LABEL_DISK_TRAY_EJECT_STR
@@ -1580,10 +1560,6 @@ MSG_HASH(
15801560
MENU_ENUM_LABEL_JOYPAD_DRIVER,
15811561
MENU_ENUM_LABEL_JOYPAD_DRIVER_STR
15821562
)
1583-
MSG_HASH(
1584-
MENU_ENUM_LABEL_LAKKA_SERVICES,
1585-
MENU_ENUM_LABEL_LAKKA_SERVICES_STR
1586-
)
15871563
MSG_HASH(
15881564
MENU_ENUM_LABEL_FRONTEND_LOG_LEVEL,
15891565
MENU_ENUM_LABEL_FRONTEND_LOG_LEVEL_STR
@@ -1700,10 +1676,6 @@ MSG_HASH(
17001676
MENU_ENUM_LABEL_NETWORK_HOSTING_SETTINGS,
17011677
MENU_ENUM_LABEL_NETWORK_HOSTING_SETTINGS_STR
17021678
)
1703-
MSG_HASH(
1704-
MENU_ENUM_LABEL_NETWORK_SETTINGS,
1705-
MENU_ENUM_LABEL_NETWORK_SETTINGS_STR
1706-
)
17071679
MSG_HASH(
17081680
MENU_ENUM_LABEL_NETPLAY_LOBBY_FILTERS,
17091681
MENU_ENUM_LABEL_NETPLAY_LOBBY_FILTERS_STR
@@ -1836,10 +1808,6 @@ MSG_HASH(
18361808
MENU_ENUM_LABEL_PLAYLIST_ENTRY,
18371809
MENU_ENUM_LABEL_PLAYLIST_ENTRY_STR
18381810
)
1839-
MSG_HASH(
1840-
MENU_ENUM_LABEL_PLAYLIST_SETTINGS,
1841-
MENU_ENUM_LABEL_PLAYLIST_SETTINGS_STR
1842-
)
18431811
MSG_HASH(
18441812
MENU_ENUM_LABEL_PLAYLIST_MANAGER_LIST,
18451813
MENU_ENUM_LABEL_PLAYLIST_MANAGER_LIST_STR
@@ -1884,10 +1852,6 @@ MSG_HASH(
18841852
MENU_ENUM_LABEL_PLAYLIST_SETTINGS_BEGIN,
18851853
MENU_ENUM_LABEL_PLAYLIST_SETTINGS_BEGIN_STR
18861854
)
1887-
MSG_HASH(
1888-
MENU_ENUM_LABEL_PRIVACY_SETTINGS,
1889-
MENU_ENUM_LABEL_PRIVACY_SETTINGS_STR
1890-
)
18911855
MSG_HASH(
18921856
MENU_ENUM_LABEL_RDB_ENTRY,
18931857
MENU_ENUM_LABEL_RDB_ENTRY_STR
@@ -2442,10 +2406,6 @@ MSG_HASH(
24422406
MENU_ENUM_LABEL_DEFERRED_LAKKA_SWITCH_OPTIONS_LIST,
24432407
MENU_ENUM_LABEL_DEFERRED_LAKKA_SWITCH_OPTIONS_LIST_STR
24442408
)
2445-
MSG_HASH(
2446-
MENU_ENUM_LABEL_LAKKA_SWITCH_OPTIONS,
2447-
MENU_ENUM_LABEL_LAKKA_SWITCH_OPTIONS_STR
2448-
)
24492409
MSG_HASH(
24502410
MENU_ENUM_LABEL_SWITCH_OC_ENABLE,
24512411
MENU_ENUM_LABEL_SWITCH_OC_ENABLE_STR
@@ -2551,10 +2511,6 @@ MSG_HASH(
25512511
MENU_ENUM_LABEL_USER_LANGUAGE,
25522512
MENU_ENUM_LABEL_USER_LANGUAGE_STR
25532513
)
2554-
MSG_HASH(
2555-
MENU_ENUM_LABEL_USER_SETTINGS,
2556-
MENU_ENUM_LABEL_USER_SETTINGS_STR
2557-
)
25582514
MSG_HASH(
25592515
MENU_ENUM_LABEL_USE_THIS_DIRECTORY,
25602516
MENU_ENUM_LABEL_USE_THIS_DIRECTORY_STR

intl/msg_hash_us.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ static const char *const msg_hash_us_lbl_strs[] = {
571571
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
572572
#include "../settings/settings_def_video_fullscreen.h"
573573
#include "../settings/settings_def_video_sync.h"
574+
#include "../settings/settings_def_services_actions.h"
574575
#include "../settings/settings_def_video_driver_actions.h"
575576
#include "../settings/settings_def_gpu_index_vulkan.h"
576577
#include "../settings/settings_def_gpu_index_gl.h"
@@ -943,6 +944,7 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
943944
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
944945
#include "../settings/settings_def_video_fullscreen.h"
945946
#include "../settings/settings_def_video_sync.h"
947+
#include "../settings/settings_def_services_actions.h"
946948
#include "../settings/settings_def_video_driver_actions.h"
947949
#include "../settings/settings_def_gpu_index_vulkan.h"
948950
#include "../settings/settings_def_gpu_index_gl.h"

0 commit comments

Comments
 (0)