@@ -1816,10 +1816,6 @@ static struct config_bool_setting *populate_settings_bool(
18161816 SETTING_BOOL ("builtin_mediaplayer_enable" , & settings -> bools .multimedia_builtin_mediaplayer_enable , true, DEFAULT_BUILTIN_MEDIAPLAYER_ENABLE , false);
18171817 SETTING_BOOL ("builtin_imageviewer_enable" , & settings -> bools .multimedia_builtin_imageviewer_enable , true, DEFAULT_BUILTIN_IMAGEVIEWER_ENABLE , false);
18181818 SETTING_BOOL ("bundle_assets_extract_enable" , & settings -> bools .bundle_assets_extract_enable , true, DEFAULT_BUNDLE_ASSETS_EXTRACT_ENABLE , false);
1819- SETTING_BOOL ("fps_show" , & settings -> bools .video_fps_show , true, DEFAULT_FPS_SHOW , false);
1820- SETTING_BOOL ("statistics_show" , & settings -> bools .video_statistics_show , true, DEFAULT_STATISTICS_SHOW , false);
1821- SETTING_BOOL ("framecount_show" , & settings -> bools .video_framecount_show , true, DEFAULT_FRAMECOUNT_SHOW , false);
1822- SETTING_BOOL ("memory_show" , & settings -> bools .video_memory_show , true, DEFAULT_MEMORY_SHOW , false);
18231819 SETTING_BOOL ("auto_screenshot_filename" , & settings -> bools .auto_screenshot_filename , true, DEFAULT_AUTO_SCREENSHOT_FILENAME , false);
18241820 SETTING_BOOL ("video_filter_enable" , & settings -> bools .video_filter_enable , true, true, false);
18251821 SETTING_BOOL ("apply_cheats_after_toggle" , & settings -> bools .apply_cheats_after_toggle , true, DEFAULT_APPLY_CHEATS_AFTER_TOGGLE , false);
@@ -1932,6 +1928,10 @@ static struct config_bool_setting *populate_settings_bool(
19321928#include "settings/settings_def_video_fullscreen.h"
19331929#define SETTINGS_DEF_CONFIG_PASS
19341930#include "settings/settings_def_video_sync.h"
1931+ #ifdef HAVE_OVERLAY
1932+ #include "settings/settings_def_overlay_appearance.h"
1933+ #endif
1934+ #include "settings/settings_def_notification_views.h"
19351935#ifdef HAVE_MENU
19361936#ifdef HAVE_OZONE
19371937#include "settings/settings_def_ozone_typography.h"
@@ -2414,27 +2414,6 @@ static struct config_bool_setting *populate_settings_bool(
24142414 SETTING_BOOL ("video_window_save_positions" , & settings -> bools .video_window_save_positions , true, DEFAULT_WINDOW_SAVE_POSITIONS , false);
24152415
24162416 SETTING_BOOL ("menu_enable_widgets" , & settings -> bools .menu_enable_widgets , true, DEFAULT_MENU_ENABLE_WIDGETS , false);
2417- SETTING_BOOL ("menu_show_load_content_animation" , & settings -> bools .menu_show_load_content_animation , true, DEFAULT_MENU_SHOW_LOAD_CONTENT_ANIMATION , false);
2418- SETTING_BOOL ("notification_show_autoconfig" , & settings -> bools .notification_show_autoconfig , true, DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG , false);
2419- SETTING_BOOL ("notification_show_autoconfig_fails" , & settings -> bools .notification_show_autoconfig_fails , true, DEFAULT_NOTIFICATION_SHOW_AUTOCONFIG_FAILS , false);
2420- SETTING_BOOL ("notification_show_cheats_applied" , & settings -> bools .notification_show_cheats_applied , true, DEFAULT_NOTIFICATION_SHOW_CHEATS_APPLIED , false);
2421- SETTING_BOOL ("notification_show_patch_applied" , & settings -> bools .notification_show_patch_applied , true, DEFAULT_NOTIFICATION_SHOW_PATCH_APPLIED , false);
2422- SETTING_BOOL ("notification_show_remap_load" , & settings -> bools .notification_show_remap_load , true, DEFAULT_NOTIFICATION_SHOW_REMAP_LOAD , false);
2423- SETTING_BOOL ("notification_show_config_override_load" , & settings -> bools .notification_show_config_override_load , true, DEFAULT_NOTIFICATION_SHOW_CONFIG_OVERRIDE_LOAD , false);
2424- SETTING_BOOL ("notification_show_set_initial_disk" , & settings -> bools .notification_show_set_initial_disk , true, DEFAULT_NOTIFICATION_SHOW_SET_INITIAL_DISK , false);
2425- SETTING_BOOL ("notification_show_disk_control" , & settings -> bools .notification_show_disk_control , true, DEFAULT_NOTIFICATION_SHOW_DISK_CONTROL , false);
2426- SETTING_BOOL ("notification_show_save_state" , & settings -> bools .notification_show_save_state , true, DEFAULT_NOTIFICATION_SHOW_SAVE_STATE , false);
2427- SETTING_BOOL ("notification_show_fast_forward" , & settings -> bools .notification_show_fast_forward , true, DEFAULT_NOTIFICATION_SHOW_FAST_FORWARD , false);
2428- #ifdef HAVE_SCREENSHOTS
2429- SETTING_BOOL ("notification_show_screenshot" , & settings -> bools .notification_show_screenshot , true, DEFAULT_NOTIFICATION_SHOW_SCREENSHOT , false);
2430- #endif
2431- SETTING_BOOL ("notification_show_refresh_rate" , & settings -> bools .notification_show_refresh_rate , true, DEFAULT_NOTIFICATION_SHOW_REFRESH_RATE , false);
2432- #ifdef HAVE_NETWORKING
2433- SETTING_BOOL ("notification_show_netplay_extra" , & settings -> bools .notification_show_netplay_extra , true, DEFAULT_NOTIFICATION_SHOW_NETPLAY_EXTRA , false);
2434- #endif
2435- #ifdef HAVE_MENU
2436- SETTING_BOOL ("notification_show_when_menu_is_alive" , & settings -> bools .notification_show_when_menu_is_alive , true, DEFAULT_NOTIFICATION_SHOW_WHEN_MENU_IS_ALIVE , false);
2437- #endif
24382417
24392418#ifdef HAVE_MENU
24402419 SETTING_BOOL ("menu_unified_controls" , & settings -> bools .menu_unified_controls , true, false, false);
@@ -2488,7 +2467,6 @@ static struct config_bool_setting *populate_settings_bool(
24882467 SETTING_BOOL ("input_overlay_show_mouse_cursor" , & settings -> bools .input_overlay_show_mouse_cursor , true, DEFAULT_OVERLAY_SHOW_MOUSE_CURSOR , false);
24892468 SETTING_BOOL ("input_overlay_auto_rotate" , & settings -> bools .input_overlay_auto_rotate , true, DEFAULT_OVERLAY_AUTO_ROTATE , false);
24902469 SETTING_BOOL ("input_osk_overlay_auto_scale" , & settings -> bools .input_osk_overlay_auto_scale , true, DEFAULT_INPUT_OVERLAY_AUTO_SCALE , false);
2491- SETTING_BOOL ("input_overlay_pointer_enable" , & settings -> bools .input_overlay_pointer_enable , true, DEFAULT_INPUT_OVERLAY_POINTER_ENABLE , false);
24922470#endif
24932471#if defined(VITA )
24942472 SETTING_BOOL ("input_backtouch_enable" , & settings -> bools .input_backtouch_enable , false, DEFAULT_INPUT_BACKTOUCH_ENABLE , false);
@@ -2536,7 +2514,6 @@ static struct config_bool_setting *populate_settings_bool(
25362514 SETTING_BOOL ("netplay_request_device_p14" , & settings -> bools .netplay_request_devices [13 ], true, false, false);
25372515 SETTING_BOOL ("netplay_request_device_p15" , & settings -> bools .netplay_request_devices [14 ], true, false, false);
25382516 SETTING_BOOL ("netplay_request_device_p16" , & settings -> bools .netplay_request_devices [15 ], true, false, false);
2539- SETTING_BOOL ("netplay_ping_show" , & settings -> bools .netplay_ping_show , true, DEFAULT_NETPLAY_PING_SHOW , false);
25402517#endif
25412518
25422519
@@ -2606,6 +2583,10 @@ static struct config_float_setting *populate_settings_float(
26062583#include "settings/settings_def_video_fullscreen.h"
26072584#define SETTINGS_DEF_CONFIG_PASS
26082585#include "settings/settings_def_video_sync.h"
2586+ #ifdef HAVE_OVERLAY
2587+ #include "settings/settings_def_overlay_appearance.h"
2588+ #endif
2589+ #include "settings/settings_def_notification_views.h"
26092590#ifdef HAVE_MENU
26102591#ifdef HAVE_OZONE
26112592#include "settings/settings_def_ozone_typography.h"
@@ -3106,18 +3087,6 @@ static struct config_float_setting *populate_settings_float(
31063087 SETTING_FLOAT ("input_sensor_gyroscope_sensitivity" , & settings -> floats .input_sensor_gyroscope_sensitivity , true, DEFAULT_SENSOR_GYROSCOPE_SENSITIVITY , false);
31073088#ifdef HAVE_OVERLAY
31083089 SETTING_FLOAT ("input_osk_overlay_opacity" , & settings -> floats .input_osk_overlay_opacity , true, DEFAULT_INPUT_OVERLAY_OPACITY , false);
3109- SETTING_FLOAT ("input_overlay_scale_landscape" , & settings -> floats .input_overlay_scale_landscape , true, DEFAULT_INPUT_OVERLAY_SCALE_LANDSCAPE , false);
3110- SETTING_FLOAT ("input_overlay_aspect_adjust_landscape" , & settings -> floats .input_overlay_aspect_adjust_landscape , true, DEFAULT_INPUT_OVERLAY_ASPECT_ADJUST_LANDSCAPE , false);
3111- SETTING_FLOAT ("input_overlay_x_separation_landscape" , & settings -> floats .input_overlay_x_separation_landscape , true, DEFAULT_INPUT_OVERLAY_X_SEPARATION_LANDSCAPE , false);
3112- SETTING_FLOAT ("input_overlay_y_separation_landscape" , & settings -> floats .input_overlay_y_separation_landscape , true, DEFAULT_INPUT_OVERLAY_Y_SEPARATION_LANDSCAPE , false);
3113- SETTING_FLOAT ("input_overlay_x_offset_landscape" , & settings -> floats .input_overlay_x_offset_landscape , true, DEFAULT_INPUT_OVERLAY_X_OFFSET_LANDSCAPE , false);
3114- SETTING_FLOAT ("input_overlay_y_offset_landscape" , & settings -> floats .input_overlay_y_offset_landscape , true, DEFAULT_INPUT_OVERLAY_Y_OFFSET_LANDSCAPE , false);
3115- SETTING_FLOAT ("input_overlay_scale_portrait" , & settings -> floats .input_overlay_scale_portrait , true, DEFAULT_INPUT_OVERLAY_SCALE_PORTRAIT , false);
3116- SETTING_FLOAT ("input_overlay_aspect_adjust_portrait" , & settings -> floats .input_overlay_aspect_adjust_portrait , true, DEFAULT_INPUT_OVERLAY_ASPECT_ADJUST_PORTRAIT , false);
3117- SETTING_FLOAT ("input_overlay_x_separation_portrait" , & settings -> floats .input_overlay_x_separation_portrait , true, DEFAULT_INPUT_OVERLAY_X_SEPARATION_PORTRAIT , false);
3118- SETTING_FLOAT ("input_overlay_y_separation_portrait" , & settings -> floats .input_overlay_y_separation_portrait , true, DEFAULT_INPUT_OVERLAY_Y_SEPARATION_PORTRAIT , false);
3119- SETTING_FLOAT ("input_overlay_x_offset_portrait" , & settings -> floats .input_overlay_x_offset_portrait , true, DEFAULT_INPUT_OVERLAY_X_OFFSET_PORTRAIT , false);
3120- SETTING_FLOAT ("input_overlay_y_offset_portrait" , & settings -> floats .input_overlay_y_offset_portrait , true, DEFAULT_INPUT_OVERLAY_Y_OFFSET_PORTRAIT , false);
31213090#endif
31223091
31233092
@@ -3136,9 +3105,6 @@ static struct config_uint_setting *populate_settings_uint(
31363105 return NULL ;
31373106
31383107 SETTING_UINT ("frontend_log_level" , & settings -> uints .frontend_log_level , true, DEFAULT_FRONTEND_LOG_LEVEL , false);
3139- SETTING_UINT ("fps_update_interval" , & settings -> uints .fps_update_interval , true, DEFAULT_FPS_UPDATE_INTERVAL , false);
3140- SETTING_UINT ("memory_update_interval" , & settings -> uints .memory_update_interval , true, DEFAULT_MEMORY_UPDATE_INTERVAL , false);
3141- SETTING_UINT ("time_show" , & settings -> uints .video_time_show , true, DEFAULT_TIME_SHOW , false);
31423108 SETTING_UINT ("core_updater_auto_backup_history_size" , & settings -> uints .core_updater_auto_backup_history_size , true, DEFAULT_CORE_UPDATER_AUTO_BACKUP_HISTORY_SIZE , false);
31433109 SETTING_UINT ("run_ahead_frames" , & settings -> uints .run_ahead_frames , true, DEFAULT_RUN_AHEAD_FRAMES , false);
31443110#ifdef HAVE_MENU
@@ -3224,6 +3190,10 @@ static struct config_uint_setting *populate_settings_uint(
32243190#include "settings/settings_def_video_fullscreen.h"
32253191#define SETTINGS_DEF_CONFIG_PASS
32263192#include "settings/settings_def_video_sync.h"
3193+ #ifdef HAVE_OVERLAY
3194+ #include "settings/settings_def_overlay_appearance.h"
3195+ #endif
3196+ #include "settings/settings_def_notification_views.h"
32273197#ifdef HAVE_MENU
32283198#ifdef HAVE_OZONE
32293199#include "settings/settings_def_ozone_typography.h"
@@ -3735,10 +3705,6 @@ static struct config_uint_setting *populate_settings_uint(
37353705 SETTING_UINT ("split_joycon_p8" , & settings -> uints .input_split_joycon [7 ], true, 0 , false);
37363706#endif
37373707
3738- #ifdef HAVE_SCREENSHOTS
3739- SETTING_UINT ("notification_show_screenshot_duration" , & settings -> uints .notification_show_screenshot_duration , true, DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_DURATION , false);
3740- SETTING_UINT ("notification_show_screenshot_flash" , & settings -> uints .notification_show_screenshot_flash , true, DEFAULT_NOTIFICATION_SHOW_SCREENSHOT_FLASH , false);
3741- #endif
37423708
37433709#ifdef HAVE_NETWORKING
37443710 SETTING_UINT ("netplay_ip_port" , & settings -> uints .netplay_port , true, RARCH_DEFAULT_PORT , false);
@@ -3863,6 +3829,10 @@ static struct config_int_setting *populate_settings_int(
38633829#include "settings/settings_def_video_fullscreen.h"
38643830#define SETTINGS_DEF_CONFIG_PASS
38653831#include "settings/settings_def_video_sync.h"
3832+ #ifdef HAVE_OVERLAY
3833+ #include "settings/settings_def_overlay_appearance.h"
3834+ #endif
3835+ #include "settings/settings_def_notification_views.h"
38663836#ifdef HAVE_MENU
38673837#ifdef HAVE_OZONE
38683838#include "settings/settings_def_ozone_typography.h"
@@ -4374,6 +4344,10 @@ static struct config_int_setting *populate_settings_int(
43744344#include "settings/settings_def_video_fullscreen.h"
43754345#define SETTINGS_DEF_CONFIG_PASS
43764346#include "settings/settings_def_video_sync.h"
4347+ #ifdef HAVE_OVERLAY
4348+ #include "settings/settings_def_overlay_appearance.h"
4349+ #endif
4350+ #include "settings/settings_def_notification_views.h"
43774351#ifdef HAVE_MENU
43784352#ifdef HAVE_OZONE
43794353#include "settings/settings_def_ozone_typography.h"
0 commit comments