aboutsummaryrefslogtreecommitdiff
path: root/src/core/settings.h
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-11-27 10:50:48 -0500
committerLioncash <mathew1800@gmail.com>2020-11-27 11:40:45 -0500
commit5bc4eabe36b7ef4dcd5ad8db1e944705655be432 (patch)
tree285ffb3801aa773cb3537f77153a9e432390f6b8 /src/core/settings.h
parentf397edff0ea6711bac15cfe47a0157e9b790b8bb (diff)
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.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/settings.h b/src/core/settings.h
index 1143aba5d9..3df611d5b9 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -14,6 +14,10 @@
#include "common/common_types.h"
#include "input_common/settings.h"
+namespace Core {
+class System;
+}
+
namespace Settings {
enum class RendererBackend {
@@ -247,11 +251,11 @@ float Volume();
std::string GetTimeZoneString();
-void Apply();
+void Apply(Core::System& system);
void LogSettings();
// Restore the global state of all applicable settings in the Values struct
-void RestoreGlobalState();
+void RestoreGlobalState(bool is_powered_on);
// Fixes settings that are known to cause issues with the emulator
void Sanitize();