diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-09-25 19:13:10 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-09-25 19:23:20 -0400 |
| commit | 3e4a0a13cb2f2e02bdb623d763a63a71c2c5da7a (patch) | |
| tree | d9c75f026df874c9f3889bd21a7df45e7afa9221 /src/core/frontend/applets/controller.cpp | |
| parent | 4d4afc150294483e6090626022be55b1dfdfd498 (diff) | |
frontend/controller: Eliminate dependency on the global system instance
Diffstat (limited to 'src/core/frontend/applets/controller.cpp')
| -rw-r--r-- | src/core/frontend/applets/controller.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index 4505da7580..c5d65f2d08 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp @@ -4,7 +4,6 @@ #include "common/assert.h" #include "common/logging/log.h" -#include "core/core.h" #include "core/frontend/applets/controller.h" #include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/hid.h" @@ -14,6 +13,9 @@ namespace Core::Frontend { ControllerApplet::~ControllerApplet() = default; +DefaultControllerApplet::DefaultControllerApplet(Service::SM::ServiceManager& service_manager_) + : service_manager{service_manager_} {} + DefaultControllerApplet::~DefaultControllerApplet() = default; void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback, @@ -21,9 +23,7 @@ void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callb LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); auto& npad = - Core::System::GetInstance() - .ServiceManager() - .GetService<Service::HID::Hid>("hid") + service_manager.GetService<Service::HID::Hid>("hid") ->GetAppletResource() ->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad); |