From 81bb4b5951a3233a8b15bb362780b1ea4a726cd0 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 14 Nov 2024 21:54:05 +0100 Subject: [PATCH] overlays: remove unnecessary text logging --- .../HomeMenu/overlay_home_menu_settings.cpp | 100 +++++++++--------- .../HomeMenu/overlay_home_menu_settings.h | 32 +++--- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp index c2d607bc53..c440ca4fb9 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp @@ -26,14 +26,14 @@ namespace rsx home_menu_settings_audio::home_menu_settings_audio(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_AUDIO)) { - add_signed_slider(&g_cfg.audio.volume, "Master Volume", localized_string_id::HOME_MENU_SETTINGS_AUDIO_MASTER_VOLUME, " %", 1); - add_dropdown(&g_cfg.audio.renderer, "Audio Backend", localized_string_id::HOME_MENU_SETTINGS_AUDIO_BACKEND); + add_signed_slider(&g_cfg.audio.volume, localized_string_id::HOME_MENU_SETTINGS_AUDIO_MASTER_VOLUME, " %", 1); + add_dropdown(&g_cfg.audio.renderer, localized_string_id::HOME_MENU_SETTINGS_AUDIO_BACKEND); - add_checkbox(&g_cfg.audio.enable_buffering, "Enable Buffering", localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFERING); - add_signed_slider(&g_cfg.audio.desired_buffer_duration, "Desired Audio Buffer Duration", localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFER_DURATION, " ms", 1); + add_checkbox(&g_cfg.audio.enable_buffering, localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFERING); + add_signed_slider(&g_cfg.audio.desired_buffer_duration, localized_string_id::HOME_MENU_SETTINGS_AUDIO_BUFFER_DURATION, " ms", 1); - add_checkbox(&g_cfg.audio.enable_time_stretching, "Enable Time Stretching", localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING); - add_signed_slider(&g_cfg.audio.time_stretching_threshold, "Time Stretching Threshold", localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING_THRESHOLD, " %", 1); + add_checkbox(&g_cfg.audio.enable_time_stretching, localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING); + add_signed_slider(&g_cfg.audio.time_stretching_threshold, localized_string_id::HOME_MENU_SETTINGS_AUDIO_TIME_STRETCHING_THRESHOLD, " %", 1); apply_layout(); } @@ -41,16 +41,16 @@ namespace rsx home_menu_settings_video::home_menu_settings_video(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_VIDEO)) { - add_dropdown(&g_cfg.video.frame_limit, "Frame Limit", localized_string_id::HOME_MENU_SETTINGS_VIDEO_FRAME_LIMIT); - add_unsigned_slider(&g_cfg.video.anisotropic_level_override, "Anisotropic Filter Override", localized_string_id::HOME_MENU_SETTINGS_VIDEO_ANISOTROPIC_OVERRIDE, "x", 2, {{0, "Auto"}}, {14}); + add_dropdown(&g_cfg.video.frame_limit, localized_string_id::HOME_MENU_SETTINGS_VIDEO_FRAME_LIMIT); + add_unsigned_slider(&g_cfg.video.anisotropic_level_override, localized_string_id::HOME_MENU_SETTINGS_VIDEO_ANISOTROPIC_OVERRIDE, "x", 2, {{0, "Auto"}}, {14}); - add_dropdown(&g_cfg.video.output_scaling, "Output Scaling", localized_string_id::HOME_MENU_SETTINGS_VIDEO_OUTPUT_SCALING); + add_dropdown(&g_cfg.video.output_scaling, localized_string_id::HOME_MENU_SETTINGS_VIDEO_OUTPUT_SCALING); if (g_cfg.video.renderer == video_renderer::vulkan && g_cfg.video.output_scaling == output_scaling_mode::fsr) { - add_unsigned_slider(&g_cfg.video.vk.rcas_sharpening_intensity, "FidelityFX CAS Sharpening Intensity", localized_string_id::HOME_MENU_SETTINGS_VIDEO_RCAS_SHARPENING, " %", 1); + add_unsigned_slider(&g_cfg.video.vk.rcas_sharpening_intensity, localized_string_id::HOME_MENU_SETTINGS_VIDEO_RCAS_SHARPENING, " %", 1); } - add_checkbox(&g_cfg.video.stretch_to_display_area, "Stretch To Display Area", localized_string_id::HOME_MENU_SETTINGS_VIDEO_STRETCH_TO_DISPLAY); + add_checkbox(&g_cfg.video.stretch_to_display_area, localized_string_id::HOME_MENU_SETTINGS_VIDEO_STRETCH_TO_DISPLAY); apply_layout(); } @@ -58,15 +58,15 @@ namespace rsx home_menu_settings_advanced::home_menu_settings_advanced(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_ADVANCED)) { - add_signed_slider(&g_cfg.core.preferred_spu_threads, "Preferred SPU Threads", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_PREFERRED_SPU_THREADS, "", 1); - add_unsigned_slider(&g_cfg.core.max_cpu_preempt_count_per_frame, "Max Power Saving CPU-Preemptions", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_CPU_PREEMPTIONS, "", 1); - add_checkbox(&g_cfg.core.rsx_accurate_res_access, "Accurate RSX reservation access", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_ACCURATE_RSX_RESERVATION_ACCESS); - add_dropdown(&g_cfg.core.sleep_timers_accuracy, "Sleep Timers Accuracy", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_SLEEP_TIMERS_ACCURACY); - add_signed_slider(&g_cfg.core.max_spurs_threads, "Max SPURS Threads", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_SPURS_THREADS, "", 1); + add_signed_slider(&g_cfg.core.preferred_spu_threads, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_PREFERRED_SPU_THREADS, "", 1); + add_unsigned_slider(&g_cfg.core.max_cpu_preempt_count_per_frame, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_CPU_PREEMPTIONS, "", 1); + add_checkbox(&g_cfg.core.rsx_accurate_res_access, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_ACCURATE_RSX_RESERVATION_ACCESS); + add_dropdown(&g_cfg.core.sleep_timers_accuracy, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_SLEEP_TIMERS_ACCURACY); + add_signed_slider(&g_cfg.core.max_spurs_threads, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_MAX_SPURS_THREADS, "", 1); - add_unsigned_slider(&g_cfg.video.driver_wakeup_delay, "Driver Wake-Up Delay", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_DRIVER_WAKE_UP_DELAY, " µs", 20, {}, {}, g_cfg.video.driver_wakeup_delay.min, 800); - add_signed_slider(&g_cfg.video.vblank_rate, "VBlank Frequency", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_FREQUENCY, " Hz", 30); - add_checkbox(&g_cfg.video.vblank_ntsc, "VBlank NTSC Fixup", localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_NTSC); + add_unsigned_slider(&g_cfg.video.driver_wakeup_delay, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_DRIVER_WAKE_UP_DELAY, " µs", 20, {}, {}, g_cfg.video.driver_wakeup_delay.min, 800); + add_signed_slider(&g_cfg.video.vblank_rate, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_FREQUENCY, " Hz", 30); + add_checkbox(&g_cfg.video.vblank_ntsc, localized_string_id::HOME_MENU_SETTINGS_ADVANCED_VBLANK_NTSC); apply_layout(); } @@ -74,17 +74,17 @@ namespace rsx home_menu_settings_input::home_menu_settings_input(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_INPUT)) { - add_checkbox(&g_cfg.io.background_input_enabled, "Background Input Enabled", localized_string_id::HOME_MENU_SETTINGS_INPUT_BACKGROUND_INPUT); - add_checkbox(&g_cfg.io.keep_pads_connected, "Keep Pads Connected", localized_string_id::HOME_MENU_SETTINGS_INPUT_KEEP_PADS_CONNECTED); - add_checkbox(&g_cfg.io.show_move_cursor, "Show PS Move Cursor", localized_string_id::HOME_MENU_SETTINGS_INPUT_SHOW_PS_MOVE_CURSOR); + add_checkbox(&g_cfg.io.background_input_enabled, localized_string_id::HOME_MENU_SETTINGS_INPUT_BACKGROUND_INPUT); + add_checkbox(&g_cfg.io.keep_pads_connected, localized_string_id::HOME_MENU_SETTINGS_INPUT_KEEP_PADS_CONNECTED); + add_checkbox(&g_cfg.io.show_move_cursor, localized_string_id::HOME_MENU_SETTINGS_INPUT_SHOW_PS_MOVE_CURSOR); if (g_cfg.io.camera == camera_handler::qt) { - add_dropdown(&g_cfg.io.camera_flip_option, "Camera Flip", localized_string_id::HOME_MENU_SETTINGS_INPUT_CAMERA_FLIP); + add_dropdown(&g_cfg.io.camera_flip_option, localized_string_id::HOME_MENU_SETTINGS_INPUT_CAMERA_FLIP); } - add_dropdown(&g_cfg.io.pad_mode, "Pad Handler Mode", localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_MODE); - add_unsigned_slider(&g_cfg.io.pad_sleep, "Pad Handler Sleep", localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_SLEEP, " µs", 100); + add_dropdown(&g_cfg.io.pad_mode, localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_MODE); + add_unsigned_slider(&g_cfg.io.pad_sleep, localized_string_id::HOME_MENU_SETTINGS_INPUT_PAD_SLEEP, " µs", 100); apply_layout(); } @@ -92,11 +92,11 @@ namespace rsx home_menu_settings_overlays::home_menu_settings_overlays(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_OVERLAYS)) { - add_checkbox(&g_cfg.misc.show_trophy_popups, "Show Trophy Popups", localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_TROPHY_POPUPS); - add_checkbox(&g_cfg.misc.show_rpcn_popups, "Show RPCN Popups", localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_RPCN_POPUPS); - add_checkbox(&g_cfg.misc.show_shader_compilation_hint, "Show Shader Compilation Hint", localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_SHADER_COMPILATION_HINT); - add_checkbox(&g_cfg.misc.show_ppu_compilation_hint, "Show PPU Compilation Hint", localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PPU_COMPILATION_HINT); - add_checkbox(&g_cfg.misc.show_autosave_autoload_hint, "Show Autosave/Autoload Hint", localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_AUTO_SAVE_LOAD_HINT); + add_checkbox(&g_cfg.misc.show_trophy_popups, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_TROPHY_POPUPS); + add_checkbox(&g_cfg.misc.show_rpcn_popups, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_RPCN_POPUPS); + add_checkbox(&g_cfg.misc.show_shader_compilation_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_SHADER_COMPILATION_HINT); + add_checkbox(&g_cfg.misc.show_ppu_compilation_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PPU_COMPILATION_HINT); + add_checkbox(&g_cfg.misc.show_autosave_autoload_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_AUTO_SAVE_LOAD_HINT); apply_layout(); } @@ -104,25 +104,25 @@ namespace rsx home_menu_settings_performance_overlay::home_menu_settings_performance_overlay(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY)) { - add_checkbox(&g_cfg.video.perf_overlay.perf_overlay_enabled, "Enable Performance Overlay", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE); - add_checkbox(&g_cfg.video.perf_overlay.framerate_graph_enabled, "Enable Framerate Graph", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMERATE_GRAPH); - add_checkbox(&g_cfg.video.perf_overlay.frametime_graph_enabled, "Enable Frametime Graph", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMETIME_GRAPH); + add_checkbox(&g_cfg.video.perf_overlay.perf_overlay_enabled, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE); + add_checkbox(&g_cfg.video.perf_overlay.framerate_graph_enabled, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMERATE_GRAPH); + add_checkbox(&g_cfg.video.perf_overlay.frametime_graph_enabled, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE_FRAMETIME_GRAPH); - add_dropdown(&g_cfg.video.perf_overlay.level, "Detail level", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_DETAIL_LEVEL); - add_dropdown(&g_cfg.video.perf_overlay.framerate_graph_detail_level, "Framerate Graph Detail Level", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DETAIL_LEVEL); - add_dropdown(&g_cfg.video.perf_overlay.frametime_graph_detail_level, "Frametime Graph Detail Level", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DETAIL_LEVEL); + add_dropdown(&g_cfg.video.perf_overlay.level, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_DETAIL_LEVEL); + add_dropdown(&g_cfg.video.perf_overlay.framerate_graph_detail_level, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DETAIL_LEVEL); + add_dropdown(&g_cfg.video.perf_overlay.frametime_graph_detail_level, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DETAIL_LEVEL); - add_unsigned_slider(&g_cfg.video.perf_overlay.framerate_datapoint_count, "Framerate Datapoints", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DATAPOINT_COUNT, "", 1); - add_unsigned_slider(&g_cfg.video.perf_overlay.frametime_datapoint_count, "Frametime Datapoints", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DATAPOINT_COUNT, "", 1); - add_unsigned_slider(&g_cfg.video.perf_overlay.update_interval, "Metrics Update Interval", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_UPDATE_INTERVAL, " ms", 1); + add_unsigned_slider(&g_cfg.video.perf_overlay.framerate_datapoint_count, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMERATE_DATAPOINT_COUNT, "", 1); + add_unsigned_slider(&g_cfg.video.perf_overlay.frametime_datapoint_count, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FRAMETIME_DATAPOINT_COUNT, "", 1); + add_unsigned_slider(&g_cfg.video.perf_overlay.update_interval, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_UPDATE_INTERVAL, " ms", 1); - add_dropdown(&g_cfg.video.perf_overlay.position, "Position", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_POSITION); - add_checkbox(&g_cfg.video.perf_overlay.center_x, "Center Horizontally", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_X); - add_checkbox(&g_cfg.video.perf_overlay.center_y, "Center Vertically", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_Y); - add_unsigned_slider(&g_cfg.video.perf_overlay.margin_x, "Horizontal Margin", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_X, " px", 1); - add_unsigned_slider(&g_cfg.video.perf_overlay.margin_y, "Vertical Margin", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_Y, " px", 1); - add_unsigned_slider(&g_cfg.video.perf_overlay.font_size, "Font Size", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE, " px", 1); - add_unsigned_slider(&g_cfg.video.perf_overlay.opacity, "Opacity", localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY, " %", 1); + add_dropdown(&g_cfg.video.perf_overlay.position, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_POSITION); + add_checkbox(&g_cfg.video.perf_overlay.center_x, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_X); + add_checkbox(&g_cfg.video.perf_overlay.center_y, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_CENTER_Y); + add_unsigned_slider(&g_cfg.video.perf_overlay.margin_x, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_X, " px", 1); + add_unsigned_slider(&g_cfg.video.perf_overlay.margin_y, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_MARGIN_Y, " px", 1); + add_unsigned_slider(&g_cfg.video.perf_overlay.font_size, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_FONT_SIZE, " px", 1); + add_unsigned_slider(&g_cfg.video.perf_overlay.opacity, localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_OPACITY, " %", 1); apply_layout(); } @@ -130,10 +130,10 @@ namespace rsx home_menu_settings_debug::home_menu_settings_debug(s16 x, s16 y, u16 width, u16 height, bool use_separators, home_menu_page* parent) : home_menu_settings_page(x, y, width, height, use_separators, parent, get_localized_string(localized_string_id::HOME_MENU_SETTINGS_DEBUG)) { - add_checkbox(&g_cfg.video.overlay, "Debug Overlay", localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY); - add_checkbox(&g_cfg.io.debug_overlay, "Input Debug Overlay", localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY); - add_checkbox(&g_cfg.video.disable_video_output, "Disable Video Output", localized_string_id::HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT); - add_float_slider(&g_cfg.video.texture_lod_bias, "Texture LOD Bias Addend", localized_string_id::HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS, "", 0.25f); + add_checkbox(&g_cfg.video.overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY); + add_checkbox(&g_cfg.io.debug_overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY); + add_checkbox(&g_cfg.video.disable_video_output, localized_string_id::HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT); + add_float_slider(&g_cfg.video.texture_lod_bias, localized_string_id::HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS, "", 0.25f); apply_layout(); } diff --git a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h index 07a11f41c7..fbd241efcd 100644 --- a/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h +++ b/rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.h @@ -21,21 +21,21 @@ namespace rsx { using home_menu_page::home_menu_page; - void add_checkbox(cfg::_bool* setting, const std::string& text, localized_string_id loc_id) + void add_checkbox(cfg::_bool* setting, localized_string_id loc_id) { ensure(setting && setting->get_is_dynamic()); const std::string localized_text = get_localized_string(loc_id); std::unique_ptr elem = std::make_unique(setting, localized_text); - add_item(elem, [this, setting, _text = text](pad_button btn) -> page_navigation + add_item(elem, [this, setting](pad_button btn) -> page_navigation { if (btn != pad_button::cross) return page_navigation::stay; if (setting) { const bool value = !setting->get(); - rsx_log.notice("User toggled '%s' in '%s'. Setting '%s' to %d", _text, title, setting->get_name(), value); + rsx_log.notice("User toggled checkbox in '%s'. Setting '%s' to %d", title, setting->get_name(), value); setting->set(value); Emu.GetCallbacks().update_emu_settings(); if (m_config_changed) *m_config_changed = true; @@ -47,14 +47,14 @@ namespace rsx } template - void add_dropdown(cfg::_enum* setting, const std::string& text, localized_string_id loc_id) + void add_dropdown(cfg::_enum* setting, localized_string_id loc_id) { ensure(setting && setting->get_is_dynamic()); const std::string localized_text = get_localized_string(loc_id); std::unique_ptr elem = std::make_unique>(setting, localized_text); - add_item(elem, [this, setting, _text = text](pad_button btn) -> page_navigation + add_item(elem, [this, setting](pad_button btn) -> page_navigation { if (btn != pad_button::cross) return page_navigation::stay; @@ -76,11 +76,11 @@ namespace rsx } if (const std::string& next_value = ::at32(list, new_index); setting->from_string(next_value)) { - rsx_log.notice("User toggled '%s' in '%s'. Setting '%s' to %s", _text, title, setting->get_name(), next_value); + rsx_log.notice("User toggled dropdown in '%s'. Setting '%s' to %s", title, setting->get_name(), next_value); } else { - rsx_log.error("Can't toggle '%s' in '%s'. Setting '%s' to '%s' failed", _text, title, setting->get_name(), next_value); + rsx_log.error("Can't toggle dropdown in '%s'. Setting '%s' to '%s' failed", title, setting->get_name(), next_value); } Emu.GetCallbacks().update_emu_settings(); if (m_config_changed) *m_config_changed = true; @@ -92,14 +92,14 @@ namespace rsx } template - void add_signed_slider(cfg::_int* setting, const std::string& text, localized_string_id loc_id, const std::string& suffix, s64 step_size, std::map special_labels = {}, s64 minimum = Min, s64 maximum = Max) + void add_signed_slider(cfg::_int* setting, localized_string_id loc_id, const std::string& suffix, s64 step_size, std::map special_labels = {}, s64 minimum = Min, s64 maximum = Max) { ensure(setting && setting->get_is_dynamic()); const std::string localized_text = get_localized_string(loc_id); std::unique_ptr elem = std::make_unique>(setting, localized_text, suffix, special_labels, minimum, maximum); - add_item(elem, [this, setting, _text = text, step_size, minimum, maximum](pad_button btn) -> page_navigation + add_item(elem, [this, setting, step_size, minimum, maximum](pad_button btn) -> page_navigation { if (setting) { @@ -120,7 +120,7 @@ namespace rsx if (value != setting->get()) { - rsx_log.notice("User toggled '%s' in '%s'. Setting '%s' to %d", _text, title, setting->get_name(), value); + rsx_log.notice("User toggled signed slider in '%s'. Setting '%s' to %d", title, setting->get_name(), value); setting->set(value); Emu.GetCallbacks().update_emu_settings(); if (m_config_changed) *m_config_changed = true; @@ -133,7 +133,7 @@ namespace rsx } template - void add_unsigned_slider(cfg::uint* setting, const std::string& text, localized_string_id loc_id, const std::string& suffix, u64 step_size, std::map special_labels = {}, const std::set& exceptions = {}, u64 minimum = Min, u64 maximum = Max) + void add_unsigned_slider(cfg::uint* setting, localized_string_id loc_id, const std::string& suffix, u64 step_size, std::map special_labels = {}, const std::set& exceptions = {}, u64 minimum = Min, u64 maximum = Max) { ensure(setting && setting->get_is_dynamic()); ensure(!exceptions.contains(minimum) && !exceptions.contains(maximum)); @@ -141,7 +141,7 @@ namespace rsx const std::string localized_text = get_localized_string(loc_id); std::unique_ptr elem = std::make_unique>(setting, localized_text, suffix, special_labels, minimum, maximum); - add_item(elem, [this, setting, _text = text, step_size, minimum, maximum, exceptions](pad_button btn) -> page_navigation + add_item(elem, [this, setting, step_size, minimum, maximum, exceptions](pad_button btn) -> page_navigation { if (setting) { @@ -170,7 +170,7 @@ namespace rsx if (value != setting->get()) { - rsx_log.notice("User toggled '%s' in '%s'. Setting '%s' to %d", _text, title, setting->get_name(), value); + rsx_log.notice("User toggled unsigned slider in '%s'. Setting '%s' to %d", title, setting->get_name(), value); setting->set(value); Emu.GetCallbacks().update_emu_settings(); if (m_config_changed) *m_config_changed = true; @@ -183,14 +183,14 @@ namespace rsx } template - void add_float_slider(cfg::_float* setting, const std::string& text, localized_string_id loc_id, const std::string& suffix, f32 step_size, std::map special_labels = {}, s32 minimum = Min, s32 maximum = Max) + void add_float_slider(cfg::_float* setting, localized_string_id loc_id, const std::string& suffix, f32 step_size, std::map special_labels = {}, s32 minimum = Min, s32 maximum = Max) { ensure(setting && setting->get_is_dynamic()); const std::string localized_text = get_localized_string(loc_id); std::unique_ptr elem = std::make_unique>(setting, localized_text, suffix, special_labels, minimum, maximum); - add_item(elem, [this, setting, _text = text, step_size, minimum, maximum](pad_button btn) -> page_navigation + add_item(elem, [this, setting, step_size, minimum, maximum](pad_button btn) -> page_navigation { if (setting) { @@ -211,7 +211,7 @@ namespace rsx if (value != setting->get()) { - rsx_log.notice("User toggled '%s' in '%s'. Setting '%s' to %.2f", _text, title, setting->get_name(), value); + rsx_log.notice("User toggled slider in '%s'. Setting '%s' to %.2f", title, setting->get_name(), value); setting->set(value); Emu.GetCallbacks().update_emu_settings(); if (m_config_changed) *m_config_changed = true;