diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-04 17:09:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 17:09:19 -0800 |
| commit | d62d28522b7ac49dcf76b82337d0963152d04feb (patch) | |
| tree | 95f6d17dc15443b9870c03ea7930d9c9866873c2 /src/core/settings.h | |
| parent | 087f52e872840df6801762426c492a25fdcd8a03 (diff) | |
| parent | 7aae6d6d2bd9784cba5df5b98cd29198456dcbeb (diff) | |
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.h | 11 |
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 { DebugMode = 2, }; -extern bool configuring_global; - template <typename Type> class Setting final { public: @@ -198,13 +196,18 @@ struct Values { // Add-Ons std::map<u64, std::vector<std::string>> disabled_addons; -} extern values; +}; -float Volume(); +extern Values values; + +bool IsConfiguringGlobal(); +void SetConfiguringGlobal(bool is_global); bool IsGPULevelExtreme(); bool IsGPULevelHigh(); +float Volume(); + std::string GetTimeZoneString(); void Apply(); |
