Преглед изворни кода

common: Move global configuration state modifiers back to settings

lat9nq пре 3 година
родитељ
комит
3211623192

+ 10 - 0
src/common/settings.cpp

@@ -287,4 +287,14 @@ void RestoreGlobalState(bool is_powered_on) {
     }
 }
 
+static bool configuring_global = true;
+
+bool IsConfiguringGlobal() {
+    return configuring_global;
+}
+
+void SetConfiguringGlobal(bool is_global) {
+    configuring_global = is_global;
+}
+
 } // namespace Settings

+ 3 - 0
src/common/settings.h

@@ -529,4 +529,7 @@ void UpdateRescalingInfo();
 // Restore the global state of all applicable settings in the Values struct
 void RestoreGlobalState(bool is_powered_on);
 
+bool IsConfiguringGlobal();
+void SetConfiguringGlobal(bool is_global);
+
 } // namespace Settings

+ 0 - 10
src/common/settings_common.cpp

@@ -52,14 +52,4 @@ const std::string& BasicSetting::GetLabel() const {
     return label;
 }
 
-static bool configuring_global = true;
-
-bool IsConfiguringGlobal() {
-    return configuring_global;
-}
-
-void SetConfiguringGlobal(bool is_global) {
-    configuring_global = is_global;
-}
-
 } // namespace Settings

+ 0 - 3
src/common/settings_common.h

@@ -60,9 +60,6 @@ enum Specialization : u8 {
     Percentage = (1 << SpecializationAttributeOffset),
 };
 
-bool IsConfiguringGlobal();
-void SetConfiguringGlobal(bool is_global);
-
 class BasicSetting;
 
 class Linkage {

+ 1 - 0
src/yuzu/configuration/shared_widget.cpp

@@ -39,6 +39,7 @@
 #include "common/assert.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
+#include "common/settings.h"
 #include "common/settings_common.h"
 #include "yuzu/configuration/shared_translation.h"