Skip to content

Commit d284244

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 df20fa3 commit d284244

11 files changed

Lines changed: 1474 additions & 200 deletions

‎configuration.c‎

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1827,8 +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("fastforward_frameskip", &settings->bools.fastforward_frameskip, true, DEFAULT_FASTFORWARD_FRAMESKIP, false);
1831-
SETTING_BOOL("vrr_runloop_enable", &settings->bools.vrr_runloop_enable, true, DEFAULT_VRR_RUNLOOP_ENABLE, false);
18321830
SETTING_BOOL("menu_throttle_framerate", &settings->bools.menu_throttle_framerate, true, true, false);
18331831
SETTING_BOOL("run_ahead_enabled", &settings->bools.run_ahead_enabled, true, false, false);
18341832
SETTING_BOOL("run_ahead_secondary_instance", &settings->bools.run_ahead_secondary_instance, true, DEFAULT_RUN_AHEAD_SECONDARY_INSTANCE, false);
@@ -1869,9 +1867,7 @@ static struct config_bool_setting *populate_settings_bool(
18691867
SETTING_BOOL("cloud_sync_sync_configs", &settings->bools.cloud_sync_sync_configs, true, true, false);
18701868
SETTING_BOOL("cloud_sync_sync_thumbs", &settings->bools.cloud_sync_sync_thumbs, true, false, false);
18711869
SETTING_BOOL("cloud_sync_sync_system", &settings->bools.cloud_sync_sync_system, true, false, false);
1872-
SETTING_BOOL("log_to_file", &settings->bools.log_to_file, true, DEFAULT_LOG_TO_FILE, false);
18731870
SETTING_OVERRIDE(RARCH_OVERRIDE_SETTING_LOG_TO_FILE);
1874-
SETTING_BOOL("log_to_file_timestamp", &settings->bools.log_to_file_timestamp, true, DEFAULT_LOG_TO_FILE_TIMESTAMP, false);
18751871
SETTING_BOOL("ai_service_enable", &settings->bools.ai_service_enable, true, DEFAULT_AI_SERVICE_ENABLE, false);
18761872
SETTING_BOOL("ai_service_pause", &settings->bools.ai_service_pause, true, DEFAULT_AI_SERVICE_PAUSE, false);
18771873
#ifndef HAVE_LAKKA
@@ -1954,6 +1950,14 @@ static struct config_bool_setting *populate_settings_bool(
19541950
#include "settings/settings_def_video_fullscreen.h"
19551951
#define SETTINGS_DEF_CONFIG_PASS
19561952
#include "settings/settings_def_video_sync.h"
1953+
#include "settings/settings_def_video_refresh_rate.h"
1954+
#ifdef HAVE_MENU
1955+
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
1956+
#include "settings/settings_def_menu_header_footer.h"
1957+
#endif
1958+
#endif
1959+
#include "settings/settings_def_logging.h"
1960+
#include "settings/settings_def_frame_throttle_general.h"
19571961
#include "settings/settings_def_refresh_autoswitch.h"
19581962
#include "settings/settings_def_audio_skew.h"
19591963
#include "settings/settings_def_wifi.h"
@@ -2583,6 +2587,14 @@ static struct config_float_setting *populate_settings_float(
25832587
#include "settings/settings_def_video_fullscreen.h"
25842588
#define SETTINGS_DEF_CONFIG_PASS
25852589
#include "settings/settings_def_video_sync.h"
2590+
#include "settings/settings_def_video_refresh_rate.h"
2591+
#ifdef HAVE_MENU
2592+
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
2593+
#include "settings/settings_def_menu_header_footer.h"
2594+
#endif
2595+
#endif
2596+
#include "settings/settings_def_logging.h"
2597+
#include "settings/settings_def_frame_throttle_general.h"
25862598
#include "settings/settings_def_refresh_autoswitch.h"
25872599
#include "settings/settings_def_audio_skew.h"
25882600
#include "settings/settings_def_wifi.h"
@@ -2983,9 +2995,6 @@ static struct config_float_setting *populate_settings_float(
29832995
#ifdef HAVE_RGUI
29842996
SETTING_FLOAT("rgui_particle_effect_speed", &settings->floats.menu_rgui_particle_effect_speed, true, DEFAULT_RGUI_PARTICLE_EFFECT_SPEED, false);
29852997
#endif
2986-
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
2987-
SETTING_FLOAT("menu_screensaver_animation_speed", &settings->floats.menu_screensaver_animation_speed, true, DEFAULT_MENU_SCREENSAVER_ANIMATION_SPEED, false);
2988-
#endif
29892998
#ifdef HAVE_OZONE
29902999
SETTING_FLOAT("ozone_thumbnail_scale_factor", &settings->floats.ozone_thumbnail_scale_factor, true, DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR, false);
29913000
SETTING_FLOAT("ozone_padding_factor", &settings->floats.ozone_padding_factor, true, DEFAULT_OZONE_PADDING_FACTOR, false);
@@ -3004,7 +3013,6 @@ static struct config_float_setting *populate_settings_float(
30043013
SETTING_FLOAT("cheevos_appearance_padding_v", &settings->floats.cheevos_appearance_padding_v, true, DEFAULT_CHEEVOS_APPEARANCE_PADDING_V, false);
30053014
#endif
30063015

3007-
SETTING_FLOAT("fastforward_ratio", &settings->floats.fastforward_ratio, true, DEFAULT_FASTFORWARD_RATIO, false);
30083016

30093017
SETTING_FLOAT("audio_rate_control_delta", &settings->floats.audio_rate_control_delta, true, DEFAULT_RATE_CONTROL_DELTA, false);
30103018
SETTING_FLOAT("audio_volume", &settings->floats.audio_volume, true, DEFAULT_AUDIO_VOLUME, false);
@@ -3013,7 +3021,6 @@ static struct config_float_setting *populate_settings_float(
30133021
#endif
30143022

30153023
SETTING_FLOAT("video_aspect_ratio", &settings->floats.video_aspect_ratio, true, DEFAULT_ASPECT_RATIO, false);
3016-
SETTING_FLOAT("video_refresh_rate", &settings->floats.video_refresh_rate, true, DEFAULT_REFRESH_RATE, false);
30173024
SETTING_FLOAT("crt_video_refresh_rate", &settings->floats.crt_video_refresh_rate, true, DEFAULT_CRT_REFRESH_RATE, false);
30183025
SETTING_FLOAT("video_message_pos_x", &settings->floats.video_msg_pos_x, true, DEFAULT_MESSAGE_POS_OFFSET_X, false);
30193026
SETTING_FLOAT("video_message_pos_y", &settings->floats.video_msg_pos_y, true, DEFAULT_MESSAGE_POS_OFFSET_Y, false);
@@ -3062,7 +3069,6 @@ static struct config_uint_setting *populate_settings_uint(
30623069
return NULL;
30633070

30643071
SETTING_UINT("frontend_log_level", &settings->uints.frontend_log_level, true, DEFAULT_FRONTEND_LOG_LEVEL, false);
3065-
SETTING_UINT("libretro_log_level", &settings->uints.libretro_log_level, true, DEFAULT_LIBRETRO_LOG_LEVEL, false);
30663072
SETTING_UINT("fps_update_interval", &settings->uints.fps_update_interval, true, DEFAULT_FPS_UPDATE_INTERVAL, false);
30673073
SETTING_UINT("memory_update_interval", &settings->uints.memory_update_interval, true, DEFAULT_MEMORY_UPDATE_INTERVAL, false);
30683074
SETTING_UINT("time_show", &settings->uints.video_time_show, true, DEFAULT_TIME_SHOW, false);
@@ -3082,9 +3088,6 @@ static struct config_uint_setting *populate_settings_uint(
30823088
SETTING_UINT("menu_timedate_date_separator", &settings->uints.menu_timedate_date_separator, true, DEFAULT_MENU_TIMEDATE_DATE_SEPARATOR, false);
30833089
SETTING_UINT("menu_ticker_type", &settings->uints.menu_ticker_type, true, DEFAULT_MENU_TICKER_TYPE, false);
30843090
SETTING_UINT("menu_scroll_delay", &settings->uints.menu_scroll_delay, true, DEFAULT_MENU_SCROLL_DELAY, false);
3085-
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
3086-
SETTING_UINT("menu_screensaver_animation", &settings->uints.menu_screensaver_animation, true, DEFAULT_MENU_SCREENSAVER_ANIMATION, false);
3087-
#endif
30883091
#ifdef HAVE_RGUI
30893092
SETTING_UINT("rgui_particle_effect", &settings->uints.menu_rgui_particle_effect, true, DEFAULT_RGUI_PARTICLE_EFFECT, false);
30903093
#endif
@@ -3181,6 +3184,14 @@ static struct config_uint_setting *populate_settings_uint(
31813184
#include "settings/settings_def_video_fullscreen.h"
31823185
#define SETTINGS_DEF_CONFIG_PASS
31833186
#include "settings/settings_def_video_sync.h"
3187+
#include "settings/settings_def_video_refresh_rate.h"
3188+
#ifdef HAVE_MENU
3189+
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
3190+
#include "settings/settings_def_menu_header_footer.h"
3191+
#endif
3192+
#endif
3193+
#include "settings/settings_def_logging.h"
3194+
#include "settings/settings_def_frame_throttle_general.h"
31843195
#include "settings/settings_def_refresh_autoswitch.h"
31853196
#include "settings/settings_def_audio_skew.h"
31863197
#include "settings/settings_def_wifi.h"
@@ -3763,6 +3774,14 @@ static struct config_int_setting *populate_settings_int(
37633774
#include "settings/settings_def_video_fullscreen.h"
37643775
#define SETTINGS_DEF_CONFIG_PASS
37653776
#include "settings/settings_def_video_sync.h"
3777+
#include "settings/settings_def_video_refresh_rate.h"
3778+
#ifdef HAVE_MENU
3779+
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
3780+
#include "settings/settings_def_menu_header_footer.h"
3781+
#endif
3782+
#endif
3783+
#include "settings/settings_def_logging.h"
3784+
#include "settings/settings_def_frame_throttle_general.h"
37663785
#include "settings/settings_def_refresh_autoswitch.h"
37673786
#include "settings/settings_def_audio_skew.h"
37683787
#include "settings/settings_def_wifi.h"
@@ -4193,6 +4212,14 @@ static struct config_int_setting *populate_settings_int(
41934212
#include "settings/settings_def_video_fullscreen.h"
41944213
#define SETTINGS_DEF_CONFIG_PASS
41954214
#include "settings/settings_def_video_sync.h"
4215+
#include "settings/settings_def_video_refresh_rate.h"
4216+
#ifdef HAVE_MENU
4217+
#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
4218+
#include "settings/settings_def_menu_header_footer.h"
4219+
#endif
4220+
#endif
4221+
#include "settings/settings_def_logging.h"
4222+
#include "settings/settings_def_frame_throttle_general.h"
41964223
#include "settings/settings_def_refresh_autoswitch.h"
41974224
#include "settings/settings_def_audio_skew.h"
41984225
#include "settings/settings_def_wifi.h"

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,14 +1380,6 @@ MSG_HASH(
13801380
MENU_ENUM_LABEL_ALWAYS_RELOAD_CORE_ON_RUN_CONTENT_STR
13811381
)
13821382
#endif
1383-
MSG_HASH(
1384-
MENU_ENUM_LABEL_FASTFORWARD_RATIO,
1385-
MENU_ENUM_LABEL_FASTFORWARD_RATIO_STR
1386-
)
1387-
MSG_HASH(
1388-
MENU_ENUM_LABEL_FASTFORWARD_FRAMESKIP,
1389-
MENU_ENUM_LABEL_FASTFORWARD_FRAMESKIP_STR
1390-
)
13911383
MSG_HASH(
13921384
MENU_ENUM_LABEL_FILE_BROWSER_CORE,
13931385
MENU_ENUM_LABEL_FILE_BROWSER_CORE_STR
@@ -1830,10 +1822,6 @@ MSG_HASH(
18301822
MENU_ENUM_LABEL_FRONTEND_LOG_LEVEL,
18311823
MENU_ENUM_LABEL_FRONTEND_LOG_LEVEL_STR
18321824
)
1833-
MSG_HASH(
1834-
MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL,
1835-
MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL_STR
1836-
)
18371825
MSG_HASH(
18381826
MENU_ENUM_LABEL_LOAD_ARCHIVE,
18391827
MENU_ENUM_LABEL_LOAD_ARCHIVE_STR
@@ -1862,14 +1850,6 @@ MSG_HASH(
18621850
MENU_ENUM_LABEL_LOG_VERBOSITY,
18631851
MENU_ENUM_LABEL_LOG_VERBOSITY_STR
18641852
)
1865-
MSG_HASH(
1866-
MENU_ENUM_LABEL_LOG_TO_FILE,
1867-
MENU_ENUM_LABEL_LOG_TO_FILE_STR
1868-
)
1869-
MSG_HASH(
1870-
MENU_ENUM_LABEL_LOG_TO_FILE_TIMESTAMP,
1871-
MENU_ENUM_LABEL_LOG_TO_FILE_TIMESTAMP_STR
1872-
)
18731853
MSG_HASH(
18741854
MENU_ENUM_LABEL_MAIN_MENU,
18751855
MENU_ENUM_LABEL_MAIN_MENU_STR
@@ -2228,14 +2208,6 @@ MSG_HASH(
22282208
MENU_ENUM_LABEL_PARENT_DIRECTORY,
22292209
MENU_ENUM_LABEL_PARENT_DIRECTORY_STR
22302210
)
2231-
MSG_HASH(
2232-
MENU_ENUM_LABEL_MENU_SCREENSAVER_ANIMATION,
2233-
MENU_ENUM_LABEL_MENU_SCREENSAVER_ANIMATION_STR
2234-
)
2235-
MSG_HASH(
2236-
MENU_ENUM_LABEL_MENU_SCREENSAVER_ANIMATION_SPEED,
2237-
MENU_ENUM_LABEL_MENU_SCREENSAVER_ANIMATION_SPEED_STR
2238-
)
22392211
MSG_HASH(
22402212
MENU_ENUM_LABEL_PERFCNT_ENABLE,
22412213
MENU_ENUM_LABEL_PERFCNT_ENABLE_STR
@@ -2642,10 +2614,6 @@ MSG_HASH(
26422614
MENU_ENUM_LABEL_FRAME_TIME_COUNTER_SETTINGS,
26432615
MENU_ENUM_LABEL_FRAME_TIME_COUNTER_SETTINGS_STR
26442616
)
2645-
MSG_HASH(
2646-
MENU_ENUM_LABEL_VRR_RUNLOOP_ENABLE,
2647-
MENU_ENUM_LABEL_VRR_RUNLOOP_ENABLE_STR
2648-
)
26492617
MSG_HASH(
26502618
MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE,
26512619
MENU_ENUM_LABEL_MENU_THROTTLE_FRAMERATE_STR
@@ -3411,14 +3379,6 @@ MSG_HASH(
34113379
MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y,
34123380
MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y_STR
34133381
)
3414-
MSG_HASH(
3415-
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE,
3416-
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_STR
3417-
)
3418-
MSG_HASH(
3419-
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO,
3420-
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO_STR
3421-
)
34223382
MSG_HASH(
34233383
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_POLLED,
34243384
MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_POLLED_STR

‎intl/msg_hash_us.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,10 @@ 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_video_refresh_rate.h"
563+
#include "../settings/settings_def_menu_header_footer.h"
564+
#include "../settings/settings_def_logging.h"
565+
#include "../settings/settings_def_frame_throttle_general.h"
562566
#include "../settings/settings_def_refresh_autoswitch.h"
563567
#include "../settings/settings_def_audio_skew.h"
564568
#include "../settings/settings_def_wifi.h"
@@ -814,6 +818,10 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
814818
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
815819
#include "../settings/settings_def_video_fullscreen.h"
816820
#include "../settings/settings_def_video_sync.h"
821+
#include "../settings/settings_def_video_refresh_rate.h"
822+
#include "../settings/settings_def_menu_header_footer.h"
823+
#include "../settings/settings_def_logging.h"
824+
#include "../settings/settings_def_frame_throttle_general.h"
817825
#include "../settings/settings_def_refresh_autoswitch.h"
818826
#include "../settings/settings_def_audio_skew.h"
819827
#include "../settings/settings_def_wifi.h"

0 commit comments

Comments
 (0)