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.

Author: libretroadmin

configuration.c

@@ -1954,6 +1954,8 @@ static struct config_bool_setting *populate_settings_bool(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_refresh_autoswitch.h"
+#include "settings/settings_def_audio_skew.h"
 #include "settings/settings_def_wifi.h"
 #ifdef HAVE_MIST
 #include "settings/settings_def_steam_presence.h"
@@ -2581,6 +2583,8 @@ static struct config_float_setting *populate_settings_float(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_refresh_autoswitch.h"
+#include "settings/settings_def_audio_skew.h"
 #include "settings/settings_def_wifi.h"
 #ifdef HAVE_MIST
 #include "settings/settings_def_steam_presence.h"
@@ -3003,15 +3007,13 @@ static struct config_float_setting *populate_settings_float(
    SETTING_FLOAT("fastforward_ratio",            &settings->floats.fastforward_ratio, true, DEFAULT_FASTFORWARD_RATIO, false);
 
    SETTING_FLOAT("audio_rate_control_delta",     &settings->floats.audio_rate_control_delta, true, DEFAULT_RATE_CONTROL_DELTA, false);
-   SETTING_FLOAT("audio_max_timing_skew",        &settings->floats.audio_max_timing_skew, true, DEFAULT_MAX_TIMING_SKEW, false);
    SETTING_FLOAT("audio_volume",                 &settings->floats.audio_volume, true, DEFAULT_AUDIO_VOLUME, false);
 #ifdef HAVE_AUDIOMIXER
    SETTING_FLOAT("audio_mixer_volume",           &settings->floats.audio_mixer_volume, true, DEFAULT_AUDIO_MIXER_VOLUME, false);
 #endif
 
    SETTING_FLOAT("video_aspect_ratio",           &settings->floats.video_aspect_ratio, true, DEFAULT_ASPECT_RATIO, false);
    SETTING_FLOAT("video_refresh_rate",           &settings->floats.video_refresh_rate, true, DEFAULT_REFRESH_RATE, false);
-   SETTING_FLOAT("video_autoswitch_pal_threshold", &settings->floats.video_autoswitch_pal_threshold, true, DEFAULT_AUTOSWITCH_PAL_THRESHOLD, false);
    SETTING_FLOAT("crt_video_refresh_rate",       &settings->floats.crt_video_refresh_rate, true, DEFAULT_CRT_REFRESH_RATE, false);
    SETTING_FLOAT("video_message_pos_x",          &settings->floats.video_msg_pos_x, true, DEFAULT_MESSAGE_POS_OFFSET_X, false);
    SETTING_FLOAT("video_message_pos_y",          &settings->floats.video_msg_pos_y, true, DEFAULT_MESSAGE_POS_OFFSET_Y, false);
@@ -3112,7 +3114,6 @@ static struct config_uint_setting *populate_settings_uint(
 
    SETTING_UINT("audio_out_rate",                &settings->uints.audio_output_sample_rate, true, DEFAULT_OUTPUT_RATE, false);
    SETTING_UINT("audio_latency",                 &settings->uints.audio_latency, false, 0 /* TODO */, false);
-   SETTING_UINT("audio_block_frames",            &settings->uints.audio_block_frames, true, 0, false);
 
 
 #ifdef HAVE_MICROPHONE
@@ -3128,7 +3129,6 @@ static struct config_uint_setting *populate_settings_uint(
    SETTING_UINT("custom_viewport_x",             (unsigned*)&settings->video_vp_custom.x, false, 0 /* TODO */, false);
    SETTING_UINT("custom_viewport_y",             (unsigned*)&settings->video_vp_custom.y, false, 0 /* TODO */, false);
    SETTING_UINT("aspect_ratio_index",            &settings->uints.video_aspect_ratio_idx, true, DEFAULT_ASPECT_RATIO_IDX, false);
-   SETTING_UINT("video_autoswitch_refresh_rate", &settings->uints.video_autoswitch_refresh_rate, true, DEFAULT_AUTOSWITCH_REFRESH_RATE, false);
    SETTING_UINT("video_windowed_position_x",     &settings->uints.window_position_x,    true, 0, false);
    SETTING_UINT("video_windowed_position_y",     &settings->uints.window_position_y,    true, 0, false);
    SETTING_UINT("video_windowed_position_width", &settings->uints.window_position_width,    true, DEFAULT_WINDOW_WIDTH, false);
@@ -3181,6 +3181,8 @@ static struct config_uint_setting *populate_settings_uint(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_refresh_autoswitch.h"
+#include "settings/settings_def_audio_skew.h"
 #include "settings/settings_def_wifi.h"
 #ifdef HAVE_MIST
 #include "settings/settings_def_steam_presence.h"
@@ -3761,6 +3763,8 @@ static struct config_int_setting *populate_settings_int(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_refresh_autoswitch.h"
+#include "settings/settings_def_audio_skew.h"
 #include "settings/settings_def_wifi.h"
 #ifdef HAVE_MIST
 #include "settings/settings_def_steam_presence.h"
@@ -4189,6 +4193,8 @@ static struct config_int_setting *populate_settings_int(
 #include "settings/settings_def_video_fullscreen.h"
 #define SETTINGS_DEF_CONFIG_PASS
 #include "settings/settings_def_video_sync.h"
+#include "settings/settings_def_refresh_autoswitch.h"
+#include "settings/settings_def_audio_skew.h"
 #include "settings/settings_def_wifi.h"
 #ifdef HAVE_MIST
 #include "settings/settings_def_steam_presence.h"

intl/msg_hash_lbl.h

@@ -67,10 +67,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_NETPLAY_TAB,
    MENU_ENUM_LABEL_NETPLAY_TAB_STR
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES,
-   MENU_ENUM_LABEL_AUDIO_BLOCK_FRAMES_STR
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_AUDIO_DEVICE,
    MENU_ENUM_LABEL_AUDIO_DEVICE_STR
@@ -230,10 +226,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_AUDIO_LATENCY,
    MENU_ENUM_LABEL_AUDIO_LATENCY_STR
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW,
-   MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW_STR
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_AUDIO_MUTE,
    MENU_ENUM_LABEL_AUDIO_MUTE_STR
@@ -3431,14 +3423,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_POLLED,
    MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_POLLED_STR
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_REFRESH_RATE,
-   MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_REFRESH_RATE_STR
-   )
-MSG_HASH(
-   MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_PAL_THRESHOLD,
-   MENU_ENUM_LABEL_VIDEO_AUTOSWITCH_PAL_THRESHOLD_STR
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER,
    MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_STR

intl/msg_hash_us.c

@@ -559,6 +559,8 @@ static const char *const msg_hash_us_lbl_strs[] = {
 #define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) n,
 #include "../settings/settings_def_video_fullscreen.h"
 #include "../settings/settings_def_video_sync.h"
+#include "../settings/settings_def_refresh_autoswitch.h"
+#include "../settings/settings_def_audio_skew.h"
 #include "../settings/settings_def_wifi.h"
 #include "../settings/settings_def_steam_presence.h"
 #include "../settings/settings_def_playlist_sorting.h"
@@ -812,6 +814,8 @@ static const uint32_t msg_hash_us_lbl_ids[] = {
 #define S_ACTION_EX_NS(T, n, sd, ok, rp, c, us) (uint32_t)MENU_ENUM_LABEL_##T,
 #include "../settings/settings_def_video_fullscreen.h"
 #include "../settings/settings_def_video_sync.h"
+#include "../settings/settings_def_refresh_autoswitch.h"
+#include "../settings/settings_def_audio_skew.h"
 #include "../settings/settings_def_wifi.h"
 #include "../settings/settings_def_steam_presence.h"
 #include "../settings/settings_def_playlist_sorting.h"