From 07ae7ff7f12e96acac1a8d7da7673cd56a21c945 Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Tue, 18 Oct 2022 13:39:21 +0200 Subject: [PATCH] Turn more static const variables in config.def.h into define macros --- config.def.h | 34 +++++++++++++------------- configuration.c | 59 ++++++++++++++++++++++++--------------------- menu/menu_setting.c | 34 +++++++++++++------------- 3 files changed, 66 insertions(+), 61 deletions(-) diff --git a/config.def.h b/config.def.h index 81226ac128..fed662e391 100644 --- a/config.def.h +++ b/config.def.h @@ -698,9 +698,9 @@ static const bool menu_show_core_updater = true; static const bool menu_show_core_manager_steam = true; #endif static const bool menu_show_legacy_thumbnail_updater = false; -static const bool menu_show_sublabels = true; -static const bool menu_dynamic_wallpaper_enable = true; -static const bool menu_scroll_fast = false; +#define DEFAULT_MENU_SHOW_SUBLABELS true +#define DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE true +#define DEFAULT_MENU_SCROLL_FAST false #define DEFAULT_MENU_SCROLL_DELAY 256 @@ -710,9 +710,9 @@ static const float menu_ticker_speed = 2.0f; #define DEFAULT_MENU_TICKER_SMOOTH true #if defined(HAVE_THREADS) -static const bool menu_savestate_resume = true; +#define DEFAULT_MENU_SAVESTATE_RESUME true #else -static const bool menu_savestate_resume = false; +#define DEFAULT_MENU_SAVESTATE_RESUME false #endif #define DEFAULT_MENU_INSERT_DISK_RESUME true @@ -809,8 +809,8 @@ static const float menu_header_opacity = 1.000; #define DEFAULT_RGUI_COLOR_THEME RGUI_THEME_CLASSIC_GREEN #define DEFAULT_RGUI_TRANSPARENCY true -static const bool rgui_inline_thumbnails = false; -static const bool rgui_swap_thumbnails = false; +#define DEFAULT_RGUI_INLINE_THUMBNAILS false +#define DEFAULT_RGUI_SWAP_THUMBNAILS false static const unsigned rgui_thumbnail_downscaler = RGUI_THUMB_SCALE_POINT; static const unsigned rgui_thumbnail_delay = 0; static const unsigned rgui_internal_upscale_level = RGUI_UPSCALE_NONE; @@ -919,18 +919,18 @@ static const unsigned input_backtouch_toggle = false; /* Offset for where messages will be placed on-screen. * Values are in range [0.0, 1.0]. */ -static const float message_pos_offset_x = 0.05; -static const float message_pos_offset_y = 0.05; +#define DEFAULT_MESSAGE_POS_OFFSET_X 0.05f +#define DEFAULT_MESSAGE_POS_OFFSET_Y 0.05f /* Color of the message. * RGB hex value. */ -static const uint32_t message_color = 0xffff00; +#define DEFAULT_MESSAGE_COLOR 0xffff00 -static const bool message_bgcolor_enable = false; -static const uint32_t message_bgcolor_red = 0; -static const uint32_t message_bgcolor_green = 0; -static const uint32_t message_bgcolor_blue = 0; -static const float message_bgcolor_opacity = 1.0f; +#define DEFAULT_MESSAGE_BGCOLOR_ENABLE false +#define DEFAULT_MESSAGE_BGCOLOR_RED 0 +#define DEFAULT_MESSAGE_BGCOLOR_GREEN 0 +#define DEFAULT_MESSAGE_BGCOLOR_BLUE 0 +#define DEFAULT_MESSAGE_BGCOLOR_OPACITY 1.0f /* Record post-filtered (CPU filter) video, * rather than raw game output. */ @@ -1473,9 +1473,9 @@ static const unsigned netplay_share_analog = RARCH_NETPLAY_SHARE_ANALOG_NO_SHAR #define DEFAULT_INPUT_DESCRIPTOR_HIDE_UNBOUND false #if defined(DINGUX) -static const unsigned input_max_users = 1; +#define DEFAULT_INPUT_MAX_USERS 1 #else -static const unsigned input_max_users = 5; +#define DEFAULT_INPUT_MAX_USERS 5 #endif #define DEFAULT_INPUT_BIND_TIMEOUT 5 diff --git a/configuration.c b/configuration.c index 66b3707ee0..ac4779b2d7 100644 --- a/configuration.c +++ b/configuration.c @@ -1772,17 +1772,22 @@ static struct config_bool_setting *populate_settings_bool( SETTING_BOOL("menu_linear_filter", &settings->bools.menu_linear_filter, true, DEFAULT_VIDEO_SMOOTH, false); SETTING_BOOL("menu_horizontal_animation", &settings->bools.menu_horizontal_animation, true, DEFAULT_MENU_HORIZONTAL_ANIMATION, false); SETTING_BOOL("menu_pause_libretro", &settings->bools.menu_pause_libretro, true, true, false); - SETTING_BOOL("menu_savestate_resume", &settings->bools.menu_savestate_resume, true, menu_savestate_resume, false); + SETTING_BOOL("menu_savestate_resume", +&settings->bools.menu_savestate_resume, true, DEFAULT_MENU_SAVESTATE_RESUME, false); SETTING_BOOL("menu_insert_disk_resume", &settings->bools.menu_insert_disk_resume, true, DEFAULT_MENU_INSERT_DISK_RESUME, false); SETTING_BOOL("menu_mouse_enable", &settings->bools.menu_mouse_enable, true, DEFAULT_MOUSE_ENABLE, false); SETTING_BOOL("menu_pointer_enable", &settings->bools.menu_pointer_enable, true, DEFAULT_POINTER_ENABLE, false); SETTING_BOOL("menu_timedate_enable", &settings->bools.menu_timedate_enable, true, DEFAULT_MENU_TIMEDATE_ENABLE, false); SETTING_BOOL("menu_battery_level_enable", &settings->bools.menu_battery_level_enable, true, true, false); SETTING_BOOL("menu_core_enable", &settings->bools.menu_core_enable, true, true, false); - SETTING_BOOL("menu_show_sublabels", &settings->bools.menu_show_sublabels, true, menu_show_sublabels, false); - SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, menu_dynamic_wallpaper_enable, false); + SETTING_BOOL("menu_show_sublabels", +&settings->bools.menu_show_sublabels, true, DEFAULT_MENU_SHOW_SUBLABELS, false); + SETTING_BOOL("menu_dynamic_wallpaper_enable", + &settings->bools.menu_dynamic_wallpaper_enable, true, + DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE, false); SETTING_BOOL("menu_ticker_smooth", &settings->bools.menu_ticker_smooth, true, DEFAULT_MENU_TICKER_SMOOTH, false); - SETTING_BOOL("menu_scroll_fast", &settings->bools.menu_scroll_fast, true, false, false); + SETTING_BOOL("menu_scroll_fast", +&settings->bools.menu_scroll_fast, true, DEFAULT_MENU_SCROLL_FAST, false); SETTING_BOOL("settings_show_drivers", &settings->bools.settings_show_drivers, true, DEFAULT_SETTINGS_SHOW_DRIVERS, false); SETTING_BOOL("settings_show_video", &settings->bools.settings_show_video, true, DEFAULT_SETTINGS_SHOW_VIDEO, false); @@ -1905,8 +1910,11 @@ static struct config_bool_setting *populate_settings_bool( SETTING_BOOL("menu_rgui_transparency", &settings->bools.menu_rgui_transparency, true, DEFAULT_RGUI_TRANSPARENCY, false); SETTING_BOOL("menu_rgui_shadows", &settings->bools.menu_rgui_shadows, true, DEFAULT_RGUI_SHADOWS, false); SETTING_BOOL("menu_rgui_full_width_layout", &settings->bools.menu_rgui_full_width_layout, true, rgui_full_width_layout, false); - SETTING_BOOL("rgui_inline_thumbnails", &settings->bools.menu_rgui_inline_thumbnails, true, rgui_inline_thumbnails, false); - SETTING_BOOL("rgui_swap_thumbnails", &settings->bools.menu_rgui_swap_thumbnails, true, rgui_swap_thumbnails, false); + SETTING_BOOL("rgui_inline_thumbnails", + &settings->bools.menu_rgui_inline_thumbnails, true, + DEFAULT_RGUI_INLINE_THUMBNAILS, false); + SETTING_BOOL("rgui_swap_thumbnails", + &settings->bools.menu_rgui_swap_thumbnails, true, DEFAULT_RGUI_SWAP_THUMBNAILS, false); SETTING_BOOL("rgui_extended_ascii", &settings->bools.menu_rgui_extended_ascii, true, DEFAULT_RGUI_EXTENDED_ASCII, false); SETTING_BOOL("rgui_switch_icons", &settings->bools.menu_rgui_switch_icons, true, DEFAULT_RGUI_SWITCH_ICONS, false); SETTING_BOOL("rgui_particle_effect_screensaver", &settings->bools.menu_rgui_particle_effect_screensaver, true, DEFAULT_RGUI_PARTICLE_EFFECT_SCREENSAVER, false); @@ -1993,7 +2001,8 @@ static struct config_bool_setting *populate_settings_bool( SETTING_BOOL("systemfiles_in_content_dir", &settings->bools.systemfiles_in_content_dir, true, default_systemfiles_in_content_dir, false); SETTING_BOOL("screenshots_in_content_dir", &settings->bools.screenshots_in_content_dir, true, default_screenshots_in_content_dir, false); - SETTING_BOOL("video_msg_bgcolor_enable", &settings->bools.video_msg_bgcolor_enable, true, message_bgcolor_enable, false); + SETTING_BOOL("video_msg_bgcolor_enable", +&settings->bools.video_msg_bgcolor_enable, true, DEFAULT_MESSAGE_BGCOLOR_ENABLE, false); SETTING_BOOL("video_window_show_decorations", &settings->bools.video_window_show_decorations, true, DEFAULT_WINDOW_DECORATIONS, false); SETTING_BOOL("video_window_save_positions", &settings->bools.video_window_save_positions, true, DEFAULT_WINDOW_SAVE_POSITIONS, false); SETTING_BOOL("video_window_custom_size_enable", &settings->bools.video_window_custom_size_enable, true, DEFAULT_WINDOW_CUSTOM_SIZE_ENABLE, false); @@ -2100,16 +2109,15 @@ static struct config_float_setting *populate_settings_float( SETTING_FLOAT("ozone_thumbnail_scale_factor", &settings->floats.ozone_thumbnail_scale_factor, true, DEFAULT_OZONE_THUMBNAIL_SCALE_FACTOR, false); #endif #endif - SETTING_FLOAT("video_message_pos_x", &settings->floats.video_msg_pos_x, true, message_pos_offset_x, false); - SETTING_FLOAT("video_message_pos_y", &settings->floats.video_msg_pos_y, true, message_pos_offset_y, false); - SETTING_FLOAT("video_font_size", &settings->floats.video_font_size, true, DEFAULT_FONT_SIZE, false); - SETTING_FLOAT("fastforward_ratio", &settings->floats.fastforward_ratio, true, DEFAULT_FASTFORWARD_RATIO, false); - SETTING_FLOAT("slowmotion_ratio", &settings->floats.slowmotion_ratio, true, DEFAULT_SLOWMOTION_RATIO, false); - SETTING_FLOAT("input_axis_threshold", &settings->floats.input_axis_threshold, true, DEFAULT_AXIS_THRESHOLD, false); - SETTING_FLOAT("input_analog_deadzone", &settings->floats.input_analog_deadzone, true, DEFAULT_ANALOG_DEADZONE, false); - SETTING_FLOAT("input_analog_sensitivity", &settings->floats.input_analog_sensitivity, true, DEFAULT_ANALOG_SENSITIVITY, false); - SETTING_FLOAT("video_msg_bgcolor_opacity", &settings->floats.video_msg_bgcolor_opacity, true, message_bgcolor_opacity, 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); + SETTING_FLOAT("video_font_size", &settings->floats.video_font_size, true, DEFAULT_FONT_SIZE, false); + SETTING_FLOAT("fastforward_ratio", &settings->floats.fastforward_ratio, true, DEFAULT_FASTFORWARD_RATIO, false); + SETTING_FLOAT("slowmotion_ratio", &settings->floats.slowmotion_ratio, true, DEFAULT_SLOWMOTION_RATIO, false); + SETTING_FLOAT("input_axis_threshold", &settings->floats.input_axis_threshold, true, DEFAULT_AXIS_THRESHOLD, false); + SETTING_FLOAT("input_analog_deadzone", &settings->floats.input_analog_deadzone, true, DEFAULT_ANALOG_DEADZONE, false); + SETTING_FLOAT("input_analog_sensitivity", &settings->floats.input_analog_sensitivity, true, DEFAULT_ANALOG_SENSITIVITY, false); + SETTING_FLOAT("video_msg_bgcolor_opacity",&settings->floats.video_msg_bgcolor_opacity, true, DEFAULT_MESSAGE_BGCOLOR_OPACITY, false); SETTING_FLOAT("video_hdr_max_nits", &settings->floats.video_hdr_max_nits, true, DEFAULT_VIDEO_HDR_MAX_NITS, false); SETTING_FLOAT("video_hdr_paper_white_nits", &settings->floats.video_hdr_paper_white_nits, true, DEFAULT_VIDEO_HDR_PAPER_WHITE_NITS, false); SETTING_FLOAT("video_hdr_display_contrast", &settings->floats.video_hdr_display_contrast, true, DEFAULT_VIDEO_HDR_CONTRAST, false); @@ -2143,7 +2151,7 @@ static struct config_uint_setting *populate_settings_uint( SETTING_UINT("input_duty_cycle", &settings->uints.input_turbo_duty_cycle, true, DEFAULT_TURBO_DUTY_CYCLE, false); SETTING_UINT("input_turbo_mode", &settings->uints.input_turbo_mode, true, DEFAULT_TURBO_MODE, false); SETTING_UINT("input_turbo_default_button", &settings->uints.input_turbo_default_button, true, DEFAULT_TURBO_DEFAULT_BTN, false); - SETTING_UINT("input_max_users", &settings->uints.input_max_users, true, input_max_users, false); + SETTING_UINT("input_max_users", &settings->uints.input_max_users, true, DEFAULT_INPUT_MAX_USERS, false); SETTING_UINT("fps_update_interval", &settings->uints.fps_update_interval, true, DEFAULT_FPS_UPDATE_INTERVAL, false); SETTING_UINT("memory_update_interval", &settings->uints.memory_update_interval, true, DEFAULT_MEMORY_UPDATE_INTERVAL, false); SETTING_UINT("input_menu_toggle_gamepad_combo", &settings->uints.input_menu_toggle_gamepad_combo, true, DEFAULT_MENU_TOGGLE_GAMEPAD_COMBO, false); @@ -2299,14 +2307,11 @@ static struct config_uint_setting *populate_settings_uint( SETTING_UINT("input_overlay_show_inputs_port", &settings->uints.input_overlay_show_inputs_port, true, DEFAULT_OVERLAY_SHOW_INPUTS_PORT, false); #endif - SETTING_UINT("video_msg_bgcolor_red", &settings->uints.video_msg_bgcolor_red, true, message_bgcolor_red, false); - SETTING_UINT("video_msg_bgcolor_green", &settings->uints.video_msg_bgcolor_green, true, message_bgcolor_green, false); - SETTING_UINT("video_msg_bgcolor_blue", &settings->uints.video_msg_bgcolor_blue, true, message_bgcolor_blue, false); - + SETTING_UINT("video_msg_bgcolor_red", &settings->uints.video_msg_bgcolor_red, true, DEFAULT_MESSAGE_BGCOLOR_RED, false); + SETTING_UINT("video_msg_bgcolor_green", &settings->uints.video_msg_bgcolor_green, true, DEFAULT_MESSAGE_BGCOLOR_GREEN, false); + SETTING_UINT("video_msg_bgcolor_blue", &settings->uints.video_msg_bgcolor_blue, true, DEFAULT_MESSAGE_BGCOLOR_BLUE, false); SETTING_UINT("run_ahead_frames", &settings->uints.run_ahead_frames, true, 1, false); - SETTING_UINT("midi_volume", &settings->uints.midi_volume, true, DEFAULT_MIDI_VOLUME, false); - SETTING_UINT("video_stream_port", &settings->uints.video_stream_port, true, RARCH_STREAM_DEFAULT_PORT, false); SETTING_UINT("video_record_quality", &settings->uints.video_record_quality, true, RECORD_CONFIG_TYPE_RECORDING_MED_QUALITY, false); SETTING_UINT("video_stream_quality", &settings->uints.video_stream_quality, true, RECORD_CONFIG_TYPE_STREAMING_MED_QUALITY, false); @@ -2629,9 +2634,9 @@ void config_set_defaults(void *data) video_driver_set_threaded(DEFAULT_VIDEO_THREADED); - settings->floats.video_msg_color_r = ((message_color >> 16) & 0xff) / 255.0f; - settings->floats.video_msg_color_g = ((message_color >> 8) & 0xff) / 255.0f; - settings->floats.video_msg_color_b = ((message_color >> 0) & 0xff) / 255.0f; + settings->floats.video_msg_color_r = ((DEFAULT_MESSAGE_COLOR >> 16) & 0xff) / 255.0f; + settings->floats.video_msg_color_g = ((DEFAULT_MESSAGE_COLOR >> 8) & 0xff) / 255.0f; + settings->floats.video_msg_color_b = ((DEFAULT_MESSAGE_COLOR >> 0) & 0xff) / 255.0f; if (g_defaults.settings_video_refresh_rate > 0.0 && g_defaults.settings_video_refresh_rate != DEFAULT_REFRESH_RATE) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 09580a1ade..9a6da6ff16 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -13410,7 +13410,7 @@ static bool setting_append_list( &settings->uints.input_max_users, MENU_ENUM_LABEL_INPUT_MAX_USERS, MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS, - input_max_users, + DEFAULT_INPUT_MAX_USERS, &group_info, &subgroup_info, parent_group, @@ -14714,7 +14714,7 @@ static bool setting_append_list( &settings->floats.video_msg_pos_x, MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_X, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X, - message_pos_offset_x, + DEFAULT_MESSAGE_POS_OFFSET_X, "%.3f", &group_info, &subgroup_info, @@ -14729,7 +14729,7 @@ static bool setting_append_list( &settings->floats.video_msg_pos_y, MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y, - message_pos_offset_y, + DEFAULT_MESSAGE_POS_OFFSET_Y, "%.3f", &group_info, &subgroup_info, @@ -14744,7 +14744,7 @@ static bool setting_append_list( &settings->floats.video_msg_color_r, MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_RED, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_RED, - ((message_color >> 16) & 0xff) / 255.0f, + ((DEFAULT_MESSAGE_COLOR >> 16) & 0xff) / 255.0f, "%.3f", &group_info, &subgroup_info, @@ -14763,7 +14763,7 @@ static bool setting_append_list( &settings->floats.video_msg_color_g, MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_GREEN, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_GREEN, - ((message_color >> 8) & 0xff) / 255.0f, + ((DEFAULT_MESSAGE_COLOR >> 8) & 0xff) / 255.0f, "%.3f", &group_info, &subgroup_info, @@ -14779,7 +14779,7 @@ static bool setting_append_list( &settings->floats.video_msg_color_b, MENU_ENUM_LABEL_VIDEO_MESSAGE_COLOR_BLUE, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_BLUE, - ((message_color >> 0) & 0xff) / 255.0f, + ((DEFAULT_MESSAGE_COLOR >> 0) & 0xff) / 255.0f, "%.3f", &group_info, &subgroup_info, @@ -14795,7 +14795,7 @@ static bool setting_append_list( &settings->bools.video_msg_bgcolor_enable, MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_ENABLE, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_ENABLE, - message_bgcolor_enable, + DEFAULT_MESSAGE_BGCOLOR_ENABLE, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -14814,7 +14814,7 @@ static bool setting_append_list( &settings->uints.video_msg_bgcolor_red, MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_RED, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_RED, - message_bgcolor_red, + DEFAULT_MESSAGE_BGCOLOR_RED, &group_info, &subgroup_info, parent_group, @@ -14827,7 +14827,7 @@ static bool setting_append_list( &settings->uints.video_msg_bgcolor_green, MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_GREEN, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_GREEN, - message_bgcolor_green, + DEFAULT_MESSAGE_BGCOLOR_GREEN, &group_info, &subgroup_info, parent_group, @@ -14840,7 +14840,7 @@ static bool setting_append_list( &settings->uints.video_msg_bgcolor_blue, MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_BLUE, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_BLUE, - message_bgcolor_blue, + DEFAULT_MESSAGE_BGCOLOR_BLUE, &group_info, &subgroup_info, parent_group, @@ -14854,7 +14854,7 @@ static bool setting_append_list( &settings->floats.video_msg_bgcolor_opacity, MENU_ENUM_LABEL_VIDEO_MESSAGE_BGCOLOR_OPACITY, MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_OPACITY, - message_bgcolor_opacity, + DEFAULT_MESSAGE_BGCOLOR_OPACITY, "%.2f", &group_info, &subgroup_info, @@ -15772,7 +15772,7 @@ static bool setting_append_list( &settings->bools.menu_dynamic_wallpaper_enable, MENU_ENUM_LABEL_DYNAMIC_WALLPAPER, MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER, - menu_dynamic_wallpaper_enable, + DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -15808,7 +15808,7 @@ static bool setting_append_list( &settings->bools.menu_savestate_resume, MENU_ENUM_LABEL_MENU_SAVESTATE_RESUME, MENU_ENUM_LABEL_VALUE_MENU_SAVESTATE_RESUME, - menu_savestate_resume, + DEFAULT_MENU_SAVESTATE_RESUME, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -17537,7 +17537,7 @@ static bool setting_append_list( &settings->bools.menu_rgui_inline_thumbnails, MENU_ENUM_LABEL_MENU_RGUI_INLINE_THUMBNAILS, MENU_ENUM_LABEL_VALUE_MENU_RGUI_INLINE_THUMBNAILS, - rgui_inline_thumbnails, + DEFAULT_RGUI_INLINE_THUMBNAILS, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -17552,7 +17552,7 @@ static bool setting_append_list( &settings->bools.menu_rgui_swap_thumbnails, MENU_ENUM_LABEL_MENU_RGUI_SWAP_THUMBNAILS, MENU_ENUM_LABEL_VALUE_MENU_RGUI_SWAP_THUMBNAILS, - rgui_swap_thumbnails, + DEFAULT_RGUI_SWAP_THUMBNAILS, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -17794,7 +17794,7 @@ static bool setting_append_list( &settings->bools.menu_show_sublabels, MENU_ENUM_LABEL_MENU_SHOW_SUBLABELS, MENU_ENUM_LABEL_VALUE_MENU_SHOW_SUBLABELS, - menu_show_sublabels, + DEFAULT_MENU_SHOW_SUBLABELS, MENU_ENUM_LABEL_VALUE_OFF, MENU_ENUM_LABEL_VALUE_ON, &group_info, @@ -19145,7 +19145,7 @@ static bool setting_append_list( &settings->bools.menu_scroll_fast, MENU_ENUM_LABEL_MENU_SCROLL_FAST, MENU_ENUM_LABEL_VALUE_MENU_SCROLL_FAST, - menu_scroll_fast, + DEFAULT_MENU_SCROLL_FAST, MENU_ENUM_LABEL_VALUE_SCROLL_NORMAL, MENU_ENUM_LABEL_VALUE_SCROLL_FAST, &group_info,