summaryrefslogtreecommitdiff
path: root/src/core/settings.h
diff options
context:
space:
mode:
authorGravatar bunnei2020-11-04 17:09:19 -0800
committerGravatar GitHub2020-11-04 17:09:19 -0800
commitd62d28522b7ac49dcf76b82337d0963152d04feb (patch)
tree95f6d17dc15443b9870c03ea7930d9c9866873c2 /src/core/settings.h
parentMerge pull request #4858 from lioncash/initializer (diff)
parentcore/settings: Move configuring_global behind an API (diff)
downloadyuzu-d62d28522b7ac49dcf76b82337d0963152d04feb.tar.gz
yuzu-d62d28522b7ac49dcf76b82337d0963152d04feb.tar.xz
yuzu-d62d28522b7ac49dcf76b82337d0963152d04feb.zip
Merge pull request #4889 from lioncash/setting-global
core/settings: Move configuring_global behind an API
Diffstat (limited to 'src/core/settings.h')
-rw-r--r--src/core/settings.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/settings.h b/src/core/settings.h
index 604805615..dcb1dbb31 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -33,8 +33,6 @@ enum class CPUAccuracy {
33 DebugMode = 2, 33 DebugMode = 2,
34}; 34};
35 35
36extern bool configuring_global;
37
38template <typename Type> 36template <typename Type>
39class Setting final { 37class Setting final {
40public: 38public:
@@ -198,13 +196,18 @@ struct Values {
198 196
199 // Add-Ons 197 // Add-Ons
200 std::map<u64, std::vector<std::string>> disabled_addons; 198 std::map<u64, std::vector<std::string>> disabled_addons;
201} extern values; 199};
202 200
203float Volume(); 201extern Values values;
202
203bool IsConfiguringGlobal();
204void SetConfiguringGlobal(bool is_global);
204 205
205bool IsGPULevelExtreme(); 206bool IsGPULevelExtreme();
206bool IsGPULevelHigh(); 207bool IsGPULevelHigh();
207 208
209float Volume();
210
208std::string GetTimeZoneString(); 211std::string GetTimeZoneString();
209 212
210void Apply(); 213void Apply();