diff options
| author | 2021-12-18 13:57:14 +0800 | |
|---|---|---|
| committer | 2021-12-18 13:57:14 +0800 | |
| commit | e49184e6069a9d791d2df3c1958f5c4b1187e124 (patch) | |
| tree | b776caf722e0be0e680f67b0ad0842628162ef1c /src/core/frontend/applets/controller.h | |
| parent | Implement convert legacy to generic (diff) | |
| parent | Merge pull request #7570 from ameerj/favorites-expanded (diff) | |
| download | yuzu-e49184e6069a9d791d2df3c1958f5c4b1187e124.tar.gz yuzu-e49184e6069a9d791d2df3c1958f5c4b1187e124.tar.xz yuzu-e49184e6069a9d791d2df3c1958f5c4b1187e124.zip | |
Merge branch 'yuzu-emu:master' into convert_legacy
Diffstat (limited to 'src/core/frontend/applets/controller.h')
| -rw-r--r-- | src/core/frontend/applets/controller.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h index b0626a0f9..014bc8901 100644 --- a/src/core/frontend/applets/controller.h +++ b/src/core/frontend/applets/controller.h | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | 8 | ||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | 10 | ||
| 11 | namespace Service::SM { | 11 | namespace Core::HID { |
| 12 | class ServiceManager; | 12 | class HIDCore; |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | namespace Core::Frontend { | 15 | namespace Core::Frontend { |
| @@ -44,14 +44,14 @@ public: | |||
| 44 | 44 | ||
| 45 | class DefaultControllerApplet final : public ControllerApplet { | 45 | class DefaultControllerApplet final : public ControllerApplet { |
| 46 | public: | 46 | public: |
| 47 | explicit DefaultControllerApplet(Service::SM::ServiceManager& service_manager_); | 47 | explicit DefaultControllerApplet(HID::HIDCore& hid_core_); |
| 48 | ~DefaultControllerApplet() override; | 48 | ~DefaultControllerApplet() override; |
| 49 | 49 | ||
| 50 | void ReconfigureControllers(std::function<void()> callback, | 50 | void ReconfigureControllers(std::function<void()> callback, |
| 51 | const ControllerParameters& parameters) const override; | 51 | const ControllerParameters& parameters) const override; |
| 52 | 52 | ||
| 53 | private: | 53 | private: |
| 54 | Service::SM::ServiceManager& service_manager; | 54 | HID::HIDCore& hid_core; |
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | } // namespace Core::Frontend | 57 | } // namespace Core::Frontend |