summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/logging/backend.cpp2
-rw-r--r--src/common/settings.h9
-rw-r--r--src/yuzu/uisettings.h29
3 files changed, 29 insertions, 11 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 6e8e8eb36..d4f27197c 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -108,7 +108,7 @@ public:
108 108
109 using namespace Common::Literals; 109 using namespace Common::Literals;
110 // Prevent logs from exceeding a set maximum size in the event that log entries are spammed. 110 // Prevent logs from exceeding a set maximum size in the event that log entries are spammed.
111 const auto write_limit = Settings::values.extended_logging ? 1_GiB : 100_MiB; 111 const auto write_limit = Settings::values.extended_logging.GetValue() ? 1_GiB : 100_MiB;
112 const bool write_limit_exceeded = bytes_written > write_limit; 112 const bool write_limit_exceeded = bytes_written > write_limit;
113 if (entry.log_level >= Level::Error || write_limit_exceeded) { 113 if (entry.log_level >= Level::Error || write_limit_exceeded) {
114 if (write_limit_exceeded) { 114 if (write_limit_exceeded) {
diff --git a/src/common/settings.h b/src/common/settings.h
index 43ebeae9e..b0bc6519a 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -134,9 +134,10 @@ struct Values {
134 Specialization::RuntimeList}; 134 Specialization::RuntimeList};
135 Setting<std::string> audio_input_device_id{linkage, "auto", "input_device", Category::Audio, 135 Setting<std::string> audio_input_device_id{linkage, "auto", "input_device", Category::Audio,
136 Specialization::RuntimeList}; 136 Specialization::RuntimeList};
137 SwitchableSetting<AudioMode, true> sound_index{linkage, AudioMode::Stereo, 137 SwitchableSetting<AudioMode, true> sound_index{
138 AudioMode::Mono, AudioMode::Surround, 138 linkage, AudioMode::Stereo, AudioMode::Mono, AudioMode::Surround,
139 "sound_index", Category::SystemAudio}; 139 "sound_index", Category::SystemAudio, Specialization::Default, true,
140 true};
140 SwitchableSetting<u8, true> volume{linkage, 141 SwitchableSetting<u8, true> volume{linkage,
141 100, 142 100,
142 0, 143 0,
@@ -147,7 +148,7 @@ struct Values {
147 true, 148 true,
148 true}; 149 true};
149 Setting<bool, false> audio_muted{ 150 Setting<bool, false> audio_muted{
150 linkage, false, "audio_muted", Category::Audio, Specialization::Default, false}; 151 linkage, false, "audio_muted", Category::Audio, Specialization::Default, false, true};
151 Setting<bool, false> dump_audio_commands{ 152 Setting<bool, false> dump_audio_commands{
152 linkage, false, "dump_audio_commands", Category::Audio, Specialization::Default, false}; 153 linkage, false, "dump_audio_commands", Category::Audio, Specialization::Default, false};
153 154
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h
index ee8c9f214..c9c89cee4 100644
--- a/src/yuzu/uisettings.h
+++ b/src/yuzu/uisettings.h
@@ -90,18 +90,35 @@ struct Values {
90 Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui}; 90 Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};
91 Setting<bool> show_status_bar{linkage, true, "showStatusBar", Category::Ui}; 91 Setting<bool> show_status_bar{linkage, true, "showStatusBar", Category::Ui};
92 92
93 Setting<bool> confirm_before_closing{linkage, true, "confirmClose", Category::UiGeneral}; 93 Setting<bool> confirm_before_closing{
94 linkage, true, "confirmClose", Category::UiGeneral, Settings::Specialization::Default,
95 true, true};
94 Setting<bool> first_start{linkage, true, "firstStart", Category::Ui}; 96 Setting<bool> first_start{linkage, true, "firstStart", Category::Ui};
95 Setting<bool> pause_when_in_background{linkage, false, "pauseWhenInBackground", 97 Setting<bool> pause_when_in_background{linkage,
96 Category::UiGeneral}; 98 false,
97 Setting<bool> mute_when_in_background{linkage, false, "muteWhenInBackground", Category::Ui}; 99 "pauseWhenInBackground",
98 Setting<bool> hide_mouse{linkage, true, "hideInactiveMouse", Category::UiGeneral}; 100 Category::UiGeneral,
101 Settings::Specialization::Default,
102 true,
103 true};
104 Setting<bool> mute_when_in_background{
105 linkage, false, "muteWhenInBackground", Category::Ui, Settings::Specialization::Default,
106 true, true};
107 Setting<bool> hide_mouse{
108 linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default,
109 true, true};
99 Setting<bool> controller_applet_disabled{linkage, false, "disableControllerApplet", 110 Setting<bool> controller_applet_disabled{linkage, false, "disableControllerApplet",
100 Category::UiGeneral}; 111 Category::UiGeneral};
101 // Set when Vulkan is known to crash the application 112 // Set when Vulkan is known to crash the application
102 bool has_broken_vulkan = false; 113 bool has_broken_vulkan = false;
103 114
104 Setting<bool> select_user_on_boot{linkage, false, "select_user_on_boot", Category::UiGeneral}; 115 Setting<bool> select_user_on_boot{linkage,
116 false,
117 "select_user_on_boot",
118 Category::UiGeneral,
119 Settings::Specialization::Default,
120 true,
121 true};
105 Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Ui}; 122 Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Ui};
106 123
107 // Discord RPC 124 // Discord RPC