diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-11-27 10:50:48 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-11-27 11:40:45 -0500 |
| commit | 5bc4eabe36b7ef4dcd5ad8db1e944705655be432 (patch) | |
| tree | 285ffb3801aa773cb3537f77153a9e432390f6b8 /src/core/settings.cpp | |
| parent | f397edff0ea6711bac15cfe47a0157e9b790b8bb (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.cpp')
| -rw-r--r-- | src/core/settings.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp index aadbc3932d..e9997a2637 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -4,9 +4,10 @@ #include <string_view> +#include "common/assert.h" #include "common/file_util.h" +#include "common/logging/log.h" #include "core/core.h" -#include "core/gdbstub/gdbstub.h" #include "core/hle/service/hid/hid.h" #include "core/settings.h" #include "video_core/renderer_base.h" @@ -31,13 +32,9 @@ std::string GetTimeZoneString() { return timezones[time_zone_index]; } -void Apply() { - GDBStub::SetServerPort(values.gdbstub_port); - GDBStub::ToggleServer(values.use_gdbstub); - - auto& system_instance = Core::System::GetInstance(); - if (system_instance.IsPoweredOn()) { - system_instance.Renderer().RefreshBaseSettings(); +void Apply(Core::System& system) { + if (system.IsPoweredOn()) { + system.Renderer().RefreshBaseSettings(); } Service::HID::ReloadInputDevices(); @@ -106,9 +103,9 @@ float Volume() { return values.volume.GetValue(); } -void RestoreGlobalState() { +void RestoreGlobalState(bool is_powered_on) { // If a game is running, DO NOT restore the global settings state - if (Core::System::GetInstance().IsPoweredOn()) { + if (is_powered_on) { return; } |