Skip to content

Commit 6712969

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 38dac77 commit 6712969

15 files changed

Lines changed: 3038 additions & 457 deletions

‎configuration.c‎

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,16 @@ static struct config_bool_setting *populate_settings_bool(
19771977
#include "settings/settings_def_video_fullscreen.h"
19781978
#define SETTINGS_DEF_CONFIG_PASS
19791979
#include "settings/settings_def_video_sync.h"
1980+
#include "settings/settings_def_input_touch_scale.h"
1981+
#ifdef GEKKO
1982+
#include "settings/settings_def_input_mouse_scale.h"
1983+
#endif
1984+
#include "settings/settings_def_black_frame_insertion.h"
1985+
#include "settings/settings_def_shader_delay.h"
1986+
#include "settings/settings_def_screen_brightness.h"
1987+
#include "settings/settings_def_video_rotation.h"
1988+
#include "settings/settings_def_video_monitor_index.h"
1989+
#include "settings/settings_def_rewind_step.h"
19801990
#ifdef ANDROID
19811991
#include "settings/settings_def_frame_throttle_slowmotion.h"
19821992
#endif
@@ -2529,6 +2539,16 @@ static struct config_float_setting *populate_settings_float(
25292539
#include "settings/settings_def_video_fullscreen.h"
25302540
#define SETTINGS_DEF_CONFIG_PASS
25312541
#include "settings/settings_def_video_sync.h"
2542+
#include "settings/settings_def_input_touch_scale.h"
2543+
#ifdef GEKKO
2544+
#include "settings/settings_def_input_mouse_scale.h"
2545+
#endif
2546+
#include "settings/settings_def_black_frame_insertion.h"
2547+
#include "settings/settings_def_shader_delay.h"
2548+
#include "settings/settings_def_screen_brightness.h"
2549+
#include "settings/settings_def_video_rotation.h"
2550+
#include "settings/settings_def_video_monitor_index.h"
2551+
#include "settings/settings_def_rewind_step.h"
25322552
#ifdef ANDROID
25332553
#include "settings/settings_def_frame_throttle_slowmotion.h"
25342554
#endif
@@ -2893,7 +2913,6 @@ static struct config_uint_setting *populate_settings_uint(
28932913
SETTING_UINT("autosave_interval", &settings->uints.autosave_interval, true, DEFAULT_AUTOSAVE_INTERVAL, false);
28942914
SETTING_UINT("savestate_automatic_interval", &settings->uints.savestate_automatic_interval, true, DEFAULT_SAVESTATE_AUTOMATIC_INTERVAL, false);
28952915
SETTING_UINT("rewind_granularity", &settings->uints.rewind_granularity, true, DEFAULT_REWIND_GRANULARITY, false);
2896-
SETTING_UINT("rewind_buffer_size_step", &settings->uints.rewind_buffer_size_step, true, DEFAULT_REWIND_BUFFER_SIZE_STEP, false);
28972916
SETTING_UINT("run_ahead_frames", &settings->uints.run_ahead_frames, true, DEFAULT_RUN_AHEAD_FRAMES, false);
28982917
SETTING_UINT("replay_max_keep", &settings->uints.replay_max_keep, true, DEFAULT_REPLAY_MAX_KEEP, false);
28992918
SETTING_UINT("replay_checkpoint_interval", &settings->uints.replay_checkpoint_interval, true, DEFAULT_REPLAY_CHECKPOINT_INTERVAL, false);
@@ -2992,7 +3011,6 @@ static struct config_uint_setting *populate_settings_uint(
29923011
SETTING_UINT("custom_viewport_y", (unsigned*)&settings->video_vp_custom.y, false, 0 /* TODO */, false);
29933012
SETTING_UINT("aspect_ratio_index", &settings->uints.video_aspect_ratio_idx, true, DEFAULT_ASPECT_RATIO_IDX, false);
29943013
SETTING_UINT("video_autoswitch_refresh_rate", &settings->uints.video_autoswitch_refresh_rate, true, DEFAULT_AUTOSWITCH_REFRESH_RATE, false);
2995-
SETTING_UINT("video_monitor_index", &settings->uints.video_monitor_index, true, DEFAULT_MONITOR_INDEX, false);
29963014
SETTING_UINT("video_windowed_position_x", &settings->uints.window_position_x, true, 0, false);
29973015
SETTING_UINT("video_windowed_position_y", &settings->uints.window_position_y, true, 0, false);
29983016
SETTING_UINT("video_windowed_position_width", &settings->uints.window_position_width, true, DEFAULT_WINDOW_WIDTH, false);
@@ -3004,13 +3022,10 @@ static struct config_uint_setting *populate_settings_uint(
30043022
#endif
30053023
SETTING_UINT("video_scale_integer_axis", &settings->uints.video_scale_integer_axis, true, DEFAULT_SCALE_INTEGER_AXIS, false);
30063024
SETTING_UINT("video_scale_integer_scaling", &settings->uints.video_scale_integer_scaling, true, DEFAULT_SCALE_INTEGER_SCALING, false);
3007-
SETTING_UINT("video_shader_delay", &settings->uints.video_shader_delay, true, DEFAULT_SHADER_DELAY, false);
30083025
#ifdef GEKKO
30093026
SETTING_UINT("video_viwidth", &settings->uints.video_viwidth, true, DEFAULT_VIDEO_VI_WIDTH, false);
30103027
#endif
30113028
SETTING_UINT("video_frame_delay", &settings->uints.video_frame_delay, true, DEFAULT_FRAME_DELAY, false);
3012-
SETTING_UINT("video_black_frame_insertion", &settings->uints.video_black_frame_insertion, true, DEFAULT_BLACK_FRAME_INSERTION, false);
3013-
SETTING_UINT("video_bfi_dark_frames", &settings->uints.video_bfi_dark_frames, true, DEFAULT_BFI_DARK_FRAMES, false);
30143029
/* GENERATED: single-source setting rows (uint kind emits here) */
30153030
#define S_BOOL(f, T, n, d, sd, df, c, us, sub)
30163031
#define S_BOOL_NS(f, T, n, d, sd, df, c, us)
@@ -3049,6 +3064,16 @@ static struct config_uint_setting *populate_settings_uint(
30493064
#include "settings/settings_def_video_fullscreen.h"
30503065
#define SETTINGS_DEF_CONFIG_PASS
30513066
#include "settings/settings_def_video_sync.h"
3067+
#include "settings/settings_def_input_touch_scale.h"
3068+
#ifdef GEKKO
3069+
#include "settings/settings_def_input_mouse_scale.h"
3070+
#endif
3071+
#include "settings/settings_def_black_frame_insertion.h"
3072+
#include "settings/settings_def_shader_delay.h"
3073+
#include "settings/settings_def_screen_brightness.h"
3074+
#include "settings/settings_def_video_rotation.h"
3075+
#include "settings/settings_def_video_monitor_index.h"
3076+
#include "settings/settings_def_rewind_step.h"
30523077
#ifdef ANDROID
30533078
#include "settings/settings_def_frame_throttle_slowmotion.h"
30543079
#endif
@@ -3308,8 +3333,6 @@ static struct config_uint_setting *populate_settings_uint(
33083333
#undef S_FLOAT_EX_NS
33093334
#undef S_ACTION_EX
33103335
#undef S_ACTION_EX_NS
3311-
SETTING_UINT("video_rotation", &settings->uints.video_rotation, true, ORIENTATION_NORMAL, false);
3312-
SETTING_UINT("screen_orientation", &settings->uints.screen_orientation, true, ORIENTATION_NORMAL, false);
33133336
SETTING_UINT("video_msg_bgcolor_red", &settings->uints.video_msg_bgcolor_red, true, DEFAULT_MESSAGE_BGCOLOR_RED, false);
33143337
SETTING_UINT("video_msg_bgcolor_green", &settings->uints.video_msg_bgcolor_green, true, DEFAULT_MESSAGE_BGCOLOR_GREEN, false);
33153338
SETTING_UINT("video_msg_bgcolor_blue", &settings->uints.video_msg_bgcolor_blue, true, DEFAULT_MESSAGE_BGCOLOR_BLUE, false);
@@ -3327,7 +3350,6 @@ static struct config_uint_setting *populate_settings_uint(
33273350
#ifdef HAVE_NETWORKING
33283351
SETTING_UINT("streaming_mode", &settings->uints.streaming_mode, true, STREAMING_MODE_TWITCH, false);
33293352
#endif
3330-
SETTING_UINT("screen_brightness", &settings->uints.screen_brightness, true, DEFAULT_SCREEN_BRIGHTNESS, false);
33313353

33323354
SETTING_UINT("input_bind_timeout", &settings->uints.input_bind_timeout, true, DEFAULT_INPUT_BIND_TIMEOUT, false);
33333355
SETTING_UINT("input_bind_hold", &settings->uints.input_bind_hold, true, DEFAULT_INPUT_BIND_HOLD, false);
@@ -3340,10 +3362,6 @@ static struct config_uint_setting *populate_settings_uint(
33403362
SETTING_UINT("input_poll_type_behavior", &settings->uints.input_poll_type_behavior, true, DEFAULT_INPUT_POLL_TYPE_BEHAVIOR, false);
33413363
SETTING_UINT("input_quit_gamepad_combo", &settings->uints.input_quit_gamepad_combo, true, DEFAULT_QUIT_GAMEPAD_COMBO, false);
33423364
SETTING_UINT("input_hotkey_block_delay", &settings->uints.input_hotkey_block_delay, true, DEFAULT_INPUT_HOTKEY_BLOCK_DELAY, false);
3343-
#ifdef GEKKO
3344-
SETTING_UINT("input_mouse_scale", &settings->uints.input_mouse_scale, true, DEFAULT_MOUSE_SCALE, false);
3345-
#endif
3346-
SETTING_UINT("input_touch_scale", &settings->uints.input_touch_scale, true, DEFAULT_TOUCH_SCALE, false);
33473365
SETTING_UINT("input_rumble_gain", &settings->uints.input_rumble_gain, true, DEFAULT_RUMBLE_GAIN, false);
33483366
SETTING_UINT("input_auto_game_focus", &settings->uints.input_auto_game_focus, true, DEFAULT_INPUT_AUTO_GAME_FOCUS, false);
33493367
#ifdef ANDROID
@@ -3534,6 +3552,16 @@ static struct config_int_setting *populate_settings_int(
35343552
#include "settings/settings_def_video_fullscreen.h"
35353553
#define SETTINGS_DEF_CONFIG_PASS
35363554
#include "settings/settings_def_video_sync.h"
3555+
#include "settings/settings_def_input_touch_scale.h"
3556+
#ifdef GEKKO
3557+
#include "settings/settings_def_input_mouse_scale.h"
3558+
#endif
3559+
#include "settings/settings_def_black_frame_insertion.h"
3560+
#include "settings/settings_def_shader_delay.h"
3561+
#include "settings/settings_def_screen_brightness.h"
3562+
#include "settings/settings_def_video_rotation.h"
3563+
#include "settings/settings_def_video_monitor_index.h"
3564+
#include "settings/settings_def_rewind_step.h"
35373565
#ifdef ANDROID
35383566
#include "settings/settings_def_frame_throttle_slowmotion.h"
35393567
#endif
@@ -3830,6 +3858,16 @@ static struct config_int_setting *populate_settings_int(
38303858
#include "settings/settings_def_video_fullscreen.h"
38313859
#define SETTINGS_DEF_CONFIG_PASS
38323860
#include "settings/settings_def_video_sync.h"
3861+
#include "settings/settings_def_input_touch_scale.h"
3862+
#ifdef GEKKO
3863+
#include "settings/settings_def_input_mouse_scale.h"
3864+
#endif
3865+
#include "settings/settings_def_black_frame_insertion.h"
3866+
#include "settings/settings_def_shader_delay.h"
3867+
#include "settings/settings_def_screen_brightness.h"
3868+
#include "settings/settings_def_video_rotation.h"
3869+
#include "settings/settings_def_video_monitor_index.h"
3870+
#include "settings/settings_def_rewind_step.h"
38333871
#ifdef ANDROID
38343872
#include "settings/settings_def_frame_throttle_slowmotion.h"
38353873
#endif

‎intl/msg_hash_lbl.h‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,16 +1690,6 @@ MSG_HASH(
16901690
MENU_ENUM_LABEL_INPUT_SENSOR_GYROSCOPE_SENSITIVITY,
16911691
MENU_ENUM_LABEL_INPUT_SENSOR_GYROSCOPE_SENSITIVITY_STR
16921692
)
1693-
#ifdef GEKKO
1694-
MSG_HASH(
1695-
MENU_ENUM_LABEL_INPUT_MOUSE_SCALE,
1696-
MENU_ENUM_LABEL_INPUT_MOUSE_SCALE_STR
1697-
)
1698-
#endif
1699-
MSG_HASH(
1700-
MENU_ENUM_LABEL_INPUT_TOUCH_SCALE,
1701-
MENU_ENUM_LABEL_INPUT_TOUCH_SCALE_STR
1702-
)
17031693
MSG_HASH(
17041694
MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT,
17051695
MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT_STR
@@ -2912,10 +2902,6 @@ MSG_HASH(
29122902
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE,
29132903
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE_STR
29142904
)
2915-
MSG_HASH(
2916-
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE_STEP,
2917-
MENU_ENUM_LABEL_REWIND_BUFFER_SIZE_STEP_STR
2918-
)
29192905
MSG_HASH(
29202906
MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS,
29212907
MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS_STR
@@ -3517,10 +3503,6 @@ MSG_HASH(
35173503
MENU_ENUM_LABEL_USE_THIS_DIRECTORY,
35183504
MENU_ENUM_LABEL_USE_THIS_DIRECTORY_STR
35193505
)
3520-
MSG_HASH(
3521-
MENU_ENUM_LABEL_BRIGHTNESS_CONTROL,
3522-
MENU_ENUM_LABEL_BRIGHTNESS_CONTROL_STR
3523-
)
35243506
MSG_HASH(
35253507
MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE,
35263508
MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE_STR
@@ -3553,14 +3535,6 @@ MSG_HASH(
35533535
MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX,
35543536
MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX_STR
35553537
)
3556-
MSG_HASH(
3557-
MENU_ENUM_LABEL_VIDEO_BLACK_FRAME_INSERTION,
3558-
MENU_ENUM_LABEL_VIDEO_BLACK_FRAME_INSERTION_STR
3559-
)
3560-
MSG_HASH(
3561-
MENU_ENUM_LABEL_VIDEO_BFI_DARK_FRAMES,
3562-
MENU_ENUM_LABEL_VIDEO_BFI_DARK_FRAMES_STR
3563-
)
35643538
MSG_HASH(
35653539
MENU_ENUM_LABEL_VIDEO_DRIVER,
35663540
MENU_ENUM_LABEL_VIDEO_DRIVER_STR
@@ -3733,10 +3707,6 @@ MSG_HASH(
37333707
MENU_ENUM_LABEL_VIDEO_FRAME_DELAY_AUTO,
37343708
MENU_ENUM_LABEL_VIDEO_FRAME_DELAY_AUTO_STR
37353709
)
3736-
MSG_HASH(
3737-
MENU_ENUM_LABEL_VIDEO_SHADER_DELAY,
3738-
MENU_ENUM_LABEL_VIDEO_SHADER_DELAY_STR
3739-
)
37403710
MSG_HASH(
37413711
MENU_ENUM_LABEL_VIDEO_GAMMA,
37423712
MENU_ENUM_LABEL_VIDEO_GAMMA_STR
@@ -3749,10 +3719,6 @@ MSG_HASH(
37493719
MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y,
37503720
MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y_STR
37513721
)
3752-
MSG_HASH(
3753-
MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX,
3754-
MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX_STR
3755-
)
37563722
MSG_HASH(
37573723
MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_X,
37583724
MENU_ENUM_LABEL_VIDEO_WINDOW_OFFSET_X_STR
@@ -3781,14 +3747,6 @@ MSG_HASH(
37813747
MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_PAL_THRESHOLD,
37823748
MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_PAL_THRESHOLD_STR
37833749
)
3784-
MSG_HASH(
3785-
MENU_ENUM_LABEL_VIDEO_ROTATION,
3786-
MENU_ENUM_LABEL_VIDEO_ROTATION_STR
3787-
)
3788-
MSG_HASH(
3789-
MENU_ENUM_LABEL_SCREEN_ORIENTATION,
3790-
MENU_ENUM_LABEL_SCREEN_ORIENTATION_STR
3791-
)
37923750
MSG_HASH(
37933751
MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER,
37943752
MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_STR

‎intl/msg_hash_us.c‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,14 @@ 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_input_touch_scale.h"
563+
#include "../settings/settings_def_input_mouse_scale.h"
564+
#include "../settings/settings_def_black_frame_insertion.h"
565+
#include "../settings/settings_def_shader_delay.h"
566+
#include "../settings/settings_def_screen_brightness.h"
567+
#include "../settings/settings_def_video_rotation.h"
568+
#include "../settings/settings_def_video_monitor_index.h"
569+
#include "../settings/settings_def_rewind_step.h"
562570
#include "../settings/settings_def_frame_throttle_slowmotion.h"
563571
#include "../settings/settings_def_frame_throttle_fastforward.h"
564572
#include "../settings/settings_def_dingux_rs90.h"
@@ -756,6 +764,14 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
756764
#define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
757765
#include "../settings/settings_def_video_fullscreen.h"
758766
#include "../settings/settings_def_video_sync.h"
767+
#include "../settings/settings_def_input_touch_scale.h"
768+
#include "../settings/settings_def_input_mouse_scale.h"
769+
#include "../settings/settings_def_black_frame_insertion.h"
770+
#include "../settings/settings_def_shader_delay.h"
771+
#include "../settings/settings_def_screen_brightness.h"
772+
#include "../settings/settings_def_video_rotation.h"
773+
#include "../settings/settings_def_video_monitor_index.h"
774+
#include "../settings/settings_def_rewind_step.h"
759775
#include "../settings/settings_def_frame_throttle_slowmotion.h"
760776
#include "../settings/settings_def_frame_throttle_fastforward.h"
761777
#include "../settings/settings_def_dingux_rs90.h"

0 commit comments

Comments
 (0)