ソースを参照

Merge branch 'pgc-plus' of github.com:lat9nq/yuzu into pgc-plus

lat9nq 3 年 前
コミット
d90c622549
3 ファイル変更29 行追加11 行削除
  1. 1 1
      src/common/logging/backend.cpp
  2. 5 4
      src/common/settings.h
  3. 23 6
      src/yuzu/uisettings.h

+ 1 - 1
src/common/logging/backend.cpp

@@ -108,7 +108,7 @@ public:
 
         using namespace Common::Literals;
         // Prevent logs from exceeding a set maximum size in the event that log entries are spammed.
-        const auto write_limit = Settings::values.extended_logging ? 1_GiB : 100_MiB;
+        const auto write_limit = Settings::values.extended_logging.GetValue() ? 1_GiB : 100_MiB;
         const bool write_limit_exceeded = bytes_written > write_limit;
         if (entry.log_level >= Level::Error || write_limit_exceeded) {
             if (write_limit_exceeded) {

+ 5 - 4
src/common/settings.h

@@ -134,9 +134,10 @@ struct Values {
                                                 Specialization::RuntimeList};
     Setting<std::string> audio_input_device_id{linkage, "auto", "input_device", Category::Audio,
                                                Specialization::RuntimeList};
-    SwitchableSetting<AudioMode, true> sound_index{linkage,         AudioMode::Stereo,
-                                                   AudioMode::Mono, AudioMode::Surround,
-                                                   "sound_index",   Category::SystemAudio};
+    SwitchableSetting<AudioMode, true> sound_index{
+        linkage,       AudioMode::Stereo,     AudioMode::Mono,         AudioMode::Surround,
+        "sound_index", Category::SystemAudio, Specialization::Default, true,
+        true};
     SwitchableSetting<u8, true> volume{linkage,
                                        100,
                                        0,
@@ -147,7 +148,7 @@ struct Values {
                                        true,
                                        true};
     Setting<bool, false> audio_muted{
-        linkage, false, "audio_muted", Category::Audio, Specialization::Default, false};
+        linkage, false, "audio_muted", Category::Audio, Specialization::Default, false, true};
     Setting<bool, false> dump_audio_commands{
         linkage, false, "dump_audio_commands", Category::Audio, Specialization::Default, false};
 

+ 23 - 6
src/yuzu/uisettings.h

@@ -90,18 +90,35 @@ struct Values {
     Setting<bool> show_filter_bar{linkage, true, "showFilterBar", Category::Ui};
     Setting<bool> show_status_bar{linkage, true, "showStatusBar", Category::Ui};
 
-    Setting<bool> confirm_before_closing{linkage, true, "confirmClose", Category::UiGeneral};
+    Setting<bool> confirm_before_closing{
+        linkage, true, "confirmClose", Category::UiGeneral, Settings::Specialization::Default,
+        true,    true};
     Setting<bool> first_start{linkage, true, "firstStart", Category::Ui};
-    Setting<bool> pause_when_in_background{linkage, false, "pauseWhenInBackground",
-                                           Category::UiGeneral};
-    Setting<bool> mute_when_in_background{linkage, false, "muteWhenInBackground", Category::Ui};
-    Setting<bool> hide_mouse{linkage, true, "hideInactiveMouse", Category::UiGeneral};
+    Setting<bool> pause_when_in_background{linkage,
+                                           false,
+                                           "pauseWhenInBackground",
+                                           Category::UiGeneral,
+                                           Settings::Specialization::Default,
+                                           true,
+                                           true};
+    Setting<bool> mute_when_in_background{
+        linkage, false, "muteWhenInBackground", Category::Ui, Settings::Specialization::Default,
+        true,    true};
+    Setting<bool> hide_mouse{
+        linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default,
+        true,    true};
     Setting<bool> controller_applet_disabled{linkage, false, "disableControllerApplet",
                                              Category::UiGeneral};
     // Set when Vulkan is known to crash the application
     bool has_broken_vulkan = false;
 
-    Setting<bool> select_user_on_boot{linkage, false, "select_user_on_boot", Category::UiGeneral};
+    Setting<bool> select_user_on_boot{linkage,
+                                      false,
+                                      "select_user_on_boot",
+                                      Category::UiGeneral,
+                                      Settings::Specialization::Default,
+                                      true,
+                                      true};
     Setting<bool> disable_web_applet{linkage, true, "disable_web_applet", Category::Ui};
 
     // Discord RPC