summaryrefslogtreecommitdiff
path: root/src/core/frontend/applets/controller.h
diff options
context:
space:
mode:
authorGravatar David2020-09-30 21:22:45 +1000
committerGravatar GitHub2020-09-30 21:22:45 +1000
commitf7808f5658ba7ff0d8ea2b62350b4878ecb13672 (patch)
tree2e5ec11d9a5917399b3ba05a50c1aa711071bf96 /src/core/frontend/applets/controller.h
parentMerge pull request #4733 from ReinUsesLisp/game-list-leak (diff)
parentcore: Mark GetInstance() as deprecated (diff)
downloadyuzu-f7808f5658ba7ff0d8ea2b62350b4878ecb13672.tar.gz
yuzu-f7808f5658ba7ff0d8ea2b62350b4878ecb13672.tar.xz
yuzu-f7808f5658ba7ff0d8ea2b62350b4878ecb13672.zip
Merge pull request #4726 from lioncash/applet
frontend/controller: Eliminate dependency on the global system instance
Diffstat (limited to 'src/core/frontend/applets/controller.h')
-rw-r--r--src/core/frontend/applets/controller.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h
index a227f15cd..3e49cdbb9 100644
--- a/src/core/frontend/applets/controller.h
+++ b/src/core/frontend/applets/controller.h
@@ -8,6 +8,10 @@
8 8
9#include "common/common_types.h" 9#include "common/common_types.h"
10 10
11namespace Service::SM {
12class ServiceManager;
13}
14
11namespace Core::Frontend { 15namespace Core::Frontend {
12 16
13using BorderColor = std::array<u8, 4>; 17using BorderColor = std::array<u8, 4>;
@@ -39,10 +43,14 @@ public:
39 43
40class DefaultControllerApplet final : public ControllerApplet { 44class DefaultControllerApplet final : public ControllerApplet {
41public: 45public:
46 explicit DefaultControllerApplet(Service::SM::ServiceManager& service_manager_);
42 ~DefaultControllerApplet() override; 47 ~DefaultControllerApplet() override;
43 48
44 void ReconfigureControllers(std::function<void()> callback, 49 void ReconfigureControllers(std::function<void()> callback,
45 ControllerParameters parameters) const override; 50 ControllerParameters parameters) const override;
51
52private:
53 Service::SM::ServiceManager& service_manager;
46}; 54};
47 55
48} // namespace Core::Frontend 56} // namespace Core::Frontend