diff options
| author | 2020-11-27 10:50:48 -0500 | |
|---|---|---|
| committer | 2020-11-27 11:40:45 -0500 | |
| commit | 5bc4eabe36b7ef4dcd5ad8db1e944705655be432 (patch) | |
| tree | 285ffb3801aa773cb3537f77153a9e432390f6b8 /src/core/settings.h | |
| parent | Merge pull request #5023 from lioncash/save-global (diff) | |
| download | yuzu-5bc4eabe36b7ef4dcd5ad8db1e944705655be432.tar.gz yuzu-5bc4eabe36b7ef4dcd5ad8db1e944705655be432.tar.xz yuzu-5bc4eabe36b7ef4dcd5ad8db1e944705655be432.zip | |
core: Eliminate remaining usages of the global system instance
Removes all remaining usages of the global system instance. After this,
migration can begin to migrate to being constructed and managed entirely
by the various frontends.
Diffstat (limited to 'src/core/settings.h')
| -rw-r--r-- | src/core/settings.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 1143aba5d..3df611d5b 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -14,6 +14,10 @@ | |||
| 14 | #include "common/common_types.h" | 14 | #include "common/common_types.h" |
| 15 | #include "input_common/settings.h" | 15 | #include "input_common/settings.h" |
| 16 | 16 | ||
| 17 | namespace Core { | ||
| 18 | class System; | ||
| 19 | } | ||
| 20 | |||
| 17 | namespace Settings { | 21 | namespace Settings { |
| 18 | 22 | ||
| 19 | enum class RendererBackend { | 23 | enum class RendererBackend { |
| @@ -247,11 +251,11 @@ float Volume(); | |||
| 247 | 251 | ||
| 248 | std::string GetTimeZoneString(); | 252 | std::string GetTimeZoneString(); |
| 249 | 253 | ||
| 250 | void Apply(); | 254 | void Apply(Core::System& system); |
| 251 | void LogSettings(); | 255 | void LogSettings(); |
| 252 | 256 | ||
| 253 | // Restore the global state of all applicable settings in the Values struct | 257 | // Restore the global state of all applicable settings in the Values struct |
| 254 | void RestoreGlobalState(); | 258 | void RestoreGlobalState(bool is_powered_on); |
| 255 | 259 | ||
| 256 | // Fixes settings that are known to cause issues with the emulator | 260 | // Fixes settings that are known to cause issues with the emulator |
| 257 | void Sanitize(); | 261 | void Sanitize(); |