diff options
| author | 2021-04-14 16:07:40 -0700 | |
|---|---|---|
| committer | 2021-04-14 16:24:03 -0700 | |
| commit | a4c6712a4be249bf668df7f0ff83a0a5236283b2 (patch) | |
| tree | f05e183692b6b1e4096d285fb77db50f048ae82d /src/core/core.cpp | |
| parent | core: settings: Add setting for debug assertions and disable by default. (diff) | |
| download | yuzu-a4c6712a4be249bf668df7f0ff83a0a5236283b2.tar.gz yuzu-a4c6712a4be249bf668df7f0ff83a0a5236283b2.tar.xz yuzu-a4c6712a4be249bf668df7f0ff83a0a5236283b2.zip | |
common: Move settings to common from core.
- Removes a dependency on core and input_common from common.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 56b47e671..d459d6c34 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include "common/file_util.h" | 9 | #include "common/file_util.h" |
| 10 | #include "common/logging/log.h" | 10 | #include "common/logging/log.h" |
| 11 | #include "common/microprofile.h" | 11 | #include "common/microprofile.h" |
| 12 | #include "common/settings.h" | ||
| 12 | #include "common/string_util.h" | 13 | #include "common/string_util.h" |
| 13 | #include "core/arm/exclusive_monitor.h" | 14 | #include "core/arm/exclusive_monitor.h" |
| 14 | #include "core/core.h" | 15 | #include "core/core.h" |
| @@ -36,6 +37,7 @@ | |||
| 36 | #include "core/hle/service/apm/controller.h" | 37 | #include "core/hle/service/apm/controller.h" |
| 37 | #include "core/hle/service/filesystem/filesystem.h" | 38 | #include "core/hle/service/filesystem/filesystem.h" |
| 38 | #include "core/hle/service/glue/manager.h" | 39 | #include "core/hle/service/glue/manager.h" |
| 40 | #include "core/hle/service/hid/hid.h" | ||
| 39 | #include "core/hle/service/service.h" | 41 | #include "core/hle/service/service.h" |
| 40 | #include "core/hle/service/sm/sm.h" | 42 | #include "core/hle/service/sm/sm.h" |
| 41 | #include "core/hle/service/time/time_manager.h" | 43 | #include "core/hle/service/time/time_manager.h" |
| @@ -45,7 +47,6 @@ | |||
| 45 | #include "core/network/network.h" | 47 | #include "core/network/network.h" |
| 46 | #include "core/perf_stats.h" | 48 | #include "core/perf_stats.h" |
| 47 | #include "core/reporter.h" | 49 | #include "core/reporter.h" |
| 48 | #include "core/settings.h" | ||
| 49 | #include "core/telemetry_session.h" | 50 | #include "core/telemetry_session.h" |
| 50 | #include "core/tools/freezer.h" | 51 | #include "core/tools/freezer.h" |
| 51 | #include "video_core/renderer_base.h" | 52 | #include "video_core/renderer_base.h" |
| @@ -774,4 +775,12 @@ void System::ExecuteProgram(std::size_t program_index) { | |||
| 774 | } | 775 | } |
| 775 | } | 776 | } |
| 776 | 777 | ||
| 778 | void System::ApplySettings() { | ||
| 779 | if (IsPoweredOn()) { | ||
| 780 | Renderer().RefreshBaseSettings(); | ||
| 781 | } | ||
| 782 | |||
| 783 | Service::HID::ReloadInputDevices(); | ||
| 784 | } | ||
| 785 | |||
| 777 | } // namespace Core | 786 | } // namespace Core |