Skip to content

Commit 11cc9fe

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 b5e5a03 commit 11cc9fe

10 files changed

Lines changed: 1068 additions & 118 deletions

‎configuration.c‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,15 +1869,11 @@ static struct config_bool_setting *populate_settings_bool(
18691869
SETTING_BOOL("cloud_sync_sync_configs", &settings->bools.cloud_sync_sync_configs, true, true, false);
18701870
SETTING_BOOL("cloud_sync_sync_thumbs", &settings->bools.cloud_sync_sync_thumbs, true, false, false);
18711871
SETTING_BOOL("cloud_sync_sync_system", &settings->bools.cloud_sync_sync_system, true, false, false);
1872-
#ifdef HAVE_MIST
1873-
SETTING_BOOL("steam_rich_presence_enable", &settings->bools.steam_rich_presence_enable, true, false, false);
1874-
#endif
18751872
SETTING_BOOL("log_to_file", &settings->bools.log_to_file, true, DEFAULT_LOG_TO_FILE, false);
18761873
SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_LOG_TO_FILE);
18771874
SETTING_BOOL("log_to_file_timestamp", &settings->bools.log_to_file_timestamp, true, DEFAULT_LOG_TO_FILE_TIMESTAMP, false);
18781875
SETTING_BOOL("ai_service_enable", &settings->bools.ai_service_enable, true, DEFAULT_AI_SERVICE_ENABLE, false);
18791876
SETTING_BOOL("ai_service_pause", &settings->bools.ai_service_pause, true, DEFAULT_AI_SERVICE_PAUSE, false);
1880-
SETTING_BOOL("wifi_enabled", &settings->bools.wifi_enabled, true, DEFAULT_WIFI_ENABLE, false);
18811877
#ifndef HAVE_LAKKA
18821878
SETTING_BOOL("gamemode_enable", &settings->bools.gamemode_enable, true, DEFAULT_GAMEMODE_ENABLE, false);
18831879
#endif
@@ -1958,6 +1954,11 @@ static struct config_bool_setting *populate_settings_bool(
19581954
#include "settings/settings_def_video_fullscreen.h"
19591955
#define SETTINGS_DEF_CONFIG_PASS
19601956
#include "settings/settings_def_video_sync.h"
1957+
#include "settings/settings_def_wifi.h"
1958+
#ifdef HAVE_MIST
1959+
#include "settings/settings_def_steam_presence.h"
1960+
#endif
1961+
#include "settings/settings_def_playlist_sorting.h"
19611962
#ifdef HAVE_MENU
19621963
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
19631964
#include "settings/settings_def_playlist_flags.h"
@@ -2468,7 +2469,6 @@ static struct config_bool_setting *populate_settings_bool(
24682469

24692470
SETTING_BOOL("content_runtime_log", &settings->bools.content_runtime_log, true, DEFAULT_CONTENT_RUNTIME_LOG, false);
24702471
SETTING_BOOL("content_runtime_log_aggregate", &settings->bools.content_runtime_log_aggregate, true, DEFAULT_CONTENT_RUNTIME_LOG_AGGREGATE, false);
2471-
SETTING_BOOL("history_list_enable", &settings->bools.history_list_enable, true, DEFAULT_HISTORY_LIST_ENABLE, false);
24722472
SETTING_BOOL("playlist_entry_rename", &settings->bools.playlist_entry_rename, true, DEFAULT_PLAYLIST_ENTRY_RENAME, false);
24732473
SETTING_BOOL("playlist_use_old_format", &settings->bools.playlist_use_old_format, true, DEFAULT_PLAYLIST_USE_OLD_FORMAT, false);
24742474
SETTING_BOOL("playlist_compression", &settings->bools.playlist_compression, true, DEFAULT_PLAYLIST_COMPRESSION, false);
@@ -2581,6 +2581,11 @@ static struct config_float_setting *populate_settings_float(
25812581
#include "settings/settings_def_video_fullscreen.h"
25822582
#define SETTINGS_DEF_CONFIG_PASS
25832583
#include "settings/settings_def_video_sync.h"
2584+
#include "settings/settings_def_wifi.h"
2585+
#ifdef HAVE_MIST
2586+
#include "settings/settings_def_steam_presence.h"
2587+
#endif
2588+
#include "settings/settings_def_playlist_sorting.h"
25842589
#ifdef HAVE_MENU
25852590
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
25862591
#include "settings/settings_def_playlist_flags.h"
@@ -3067,7 +3072,6 @@ static struct config_uint_setting *populate_settings_uint(
30673072
SETTING_UINT("replay_checkpoint_interval", &settings->uints.replay_checkpoint_interval, true, DEFAULT_REPLAY_CHECKPOINT_INTERVAL, false);
30683073
SETTING_UINT("savestate_max_keep", &settings->uints.savestate_max_keep, true, DEFAULT_SAVESTATE_MAX_KEEP, false);
30693074
#ifdef HAVE_MENU
3070-
SETTING_UINT("content_history_size", &settings->uints.content_history_size, true, DEFAULT_CONTENT_HISTORY_SIZE, false);
30713075
SETTING_UINT("playlist_entry_remove_enable", &settings->uints.playlist_entry_remove_enable, true, DEFAULT_PLAYLIST_ENTRY_REMOVE_ENABLE, false);
30723076
SETTING_UINT("menu_thumbnails", &settings->uints.gfx_thumbnails, true, DEFAULT_GFX_THUMBNAILS_DEFAULT, false);
30733077
SETTING_UINT("menu_left_thumbnails", &settings->uints.menu_left_thumbnails, true, DEFAULT_MENU_LEFT_THUMBNAILS_DEFAULT, false);
@@ -3177,6 +3181,11 @@ static struct config_uint_setting *populate_settings_uint(
31773181
#include "settings/settings_def_video_fullscreen.h"
31783182
#define SETTINGS_DEF_CONFIG_PASS
31793183
#include "settings/settings_def_video_sync.h"
3184+
#include "settings/settings_def_wifi.h"
3185+
#ifdef HAVE_MIST
3186+
#include "settings/settings_def_steam_presence.h"
3187+
#endif
3188+
#include "settings/settings_def_playlist_sorting.h"
31803189
#ifdef HAVE_MENU
31813190
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
31823191
#include "settings/settings_def_playlist_flags.h"
@@ -3660,9 +3669,6 @@ static struct config_uint_setting *populate_settings_uint(
36603669
SETTING_UINT("cpu_max_freq", &settings->uints.cpu_max_freq, true, ~0U, false);
36613670
#endif
36623671

3663-
#ifdef HAVE_MIST
3664-
SETTING_UINT("steam_rich_presence_format", &settings->uints.steam_rich_presence_format, true, DEFAULT_STEAM_RICH_PRESENCE_FORMAT, false);
3665-
#endif
36663672

36673673
#ifdef HAVE_OVERLAY
36683674
SETTING_UINT("input_overlay_lightgun_trigger_delay", &settings->uints.input_overlay_lightgun_trigger_delay, true, DEFAULT_INPUT_OVERLAY_LIGHTGUN_TRIGGER_DELAY, false);
@@ -3755,6 +3761,11 @@ static struct config_int_setting *populate_settings_int(
37553761
#include "settings/settings_def_video_fullscreen.h"
37563762
#define SETTINGS_DEF_CONFIG_PASS
37573763
#include "settings/settings_def_video_sync.h"
3764+
#include "settings/settings_def_wifi.h"
3765+
#ifdef HAVE_MIST
3766+
#include "settings/settings_def_steam_presence.h"
3767+
#endif
3768+
#include "settings/settings_def_playlist_sorting.h"
37583769
#ifdef HAVE_MENU
37593770
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
37603771
#include "settings/settings_def_playlist_flags.h"
@@ -4178,6 +4189,11 @@ static struct config_int_setting *populate_settings_int(
41784189
#include "settings/settings_def_video_fullscreen.h"
41794190
#define SETTINGS_DEF_CONFIG_PASS
41804191
#include "settings/settings_def_video_sync.h"
4192+
#include "settings/settings_def_wifi.h"
4193+
#ifdef HAVE_MIST
4194+
#include "settings/settings_def_steam_presence.h"
4195+
#endif
4196+
#include "settings/settings_def_playlist_sorting.h"
41814197
#ifdef HAVE_MENU
41824198
#if defined(HAVE_OZONE) || defined(HAVE_XMB)
41834199
#include "settings/settings_def_playlist_flags.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -554,22 +554,10 @@ MSG_HASH(
554554
MENU_ENUM_LABEL_CONNECT_WIFI,
555555
MENU_ENUM_LABEL_CONNECT_WIFI_STR
556556
)
557-
MSG_HASH(
558-
MENU_ENUM_LABEL_WIFI_DISCONNECT,
559-
MENU_ENUM_LABEL_WIFI_DISCONNECT_STR
560-
)
561557
MSG_HASH(
562558
MENU_ENUM_LABEL_WIFI_NETWORKS,
563559
MENU_ENUM_LABEL_WIFI_NETWORKS_STR
564560
)
565-
MSG_HASH(
566-
MENU_ENUM_LABEL_WIFI_ENABLED,
567-
MENU_ENUM_LABEL_WIFI_ENABLED_STR
568-
)
569-
MSG_HASH(
570-
MENU_ENUM_LABEL_WIFI_NETWORK_SCAN,
571-
MENU_ENUM_LABEL_WIFI_NETWORK_SCAN_STR
572-
)
573561
MSG_HASH(
574562
MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
575563
MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM_STR
@@ -582,10 +570,6 @@ MSG_HASH(
582570
MENU_ENUM_LABEL_BROWSE_URL_LIST,
583571
MENU_ENUM_LABEL_BROWSE_URL_LIST_STR
584572
)
585-
MSG_HASH(
586-
MENU_ENUM_LABEL_CONTENT_HISTORY_SIZE,
587-
MENU_ENUM_LABEL_CONTENT_HISTORY_SIZE_STR
588-
)
589573
MSG_HASH(
590574
MENU_ENUM_LABEL_CONTENT_FAVORITES_SIZE,
591575
MENU_ENUM_LABEL_CONTENT_FAVORITES_SIZE_STR
@@ -711,14 +695,6 @@ MSG_HASH(
711695
MENU_ENUM_LABEL_STEAM_SETTINGS,
712696
MENU_ENUM_LABEL_STEAM_SETTINGS_STR
713697
)
714-
MSG_HASH(
715-
MENU_ENUM_LABEL_STEAM_RICH_PRESENCE_ENABLE,
716-
MENU_ENUM_LABEL_STEAM_RICH_PRESENCE_ENABLE_STR
717-
)
718-
MSG_HASH(
719-
MENU_ENUM_LABEL_STEAM_RICH_PRESENCE_FORMAT,
720-
MENU_ENUM_LABEL_STEAM_RICH_PRESENCE_FORMAT_STR
721-
)
722698
#endif
723699
MSG_HASH(
724700
MENU_ENUM_LABEL_CPU_ARCHITECTURE,
@@ -1540,10 +1516,6 @@ MSG_HASH(
15401516
MENU_ENUM_LABEL_HELP_LIST,
15411517
MENU_ENUM_LABEL_HELP_LIST_STR
15421518
)
1543-
MSG_HASH(
1544-
MENU_ENUM_LABEL_HISTORY_LIST_ENABLE,
1545-
MENU_ENUM_LABEL_HISTORY_LIST_ENABLE_STR
1546-
)
15471519
MSG_HASH(
15481520
MENU_ENUM_LABEL_HISTORY_TAB,
15491521
MENU_ENUM_LABEL_HISTORY_TAB_STR

‎intl/msg_hash_us.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,9 @@ 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_wifi.h"
563+
#include "../settings/settings_def_steam_presence.h"
564+
#include "../settings/settings_def_playlist_sorting.h"
562565
#include "../settings/settings_def_playlist_flags.h"
563566
#include "../settings/settings_def_notification_enable.h"
564567
#include "../settings/settings_def_rgui_particle_effect.h"
@@ -809,6 +812,9 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
809812
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
810813
#include "../settings/settings_def_video_fullscreen.h"
811814
#include "../settings/settings_def_video_sync.h"
815+
#include "../settings/settings_def_wifi.h"
816+
#include "../settings/settings_def_steam_presence.h"
817+
#include "../settings/settings_def_playlist_sorting.h"
812818
#include "../settings/settings_def_playlist_flags.h"
813819
#include "../settings/settings_def_notification_enable.h"
814820
#include "../settings/settings_def_rgui_particle_effect.h"

0 commit comments

Comments
 (0)