diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/frontend/applets/controller.cpp | 2 | ||||
| -rw-r--r-- | src/core/frontend/applets/controller.h | 4 | ||||
| -rw-r--r-- | src/yuzu/applets/controller.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/applets/controller.h | 8 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp index c5d65f2d0..5582091f4 100644 --- a/src/core/frontend/applets/controller.cpp +++ b/src/core/frontend/applets/controller.cpp | |||
| @@ -19,7 +19,7 @@ DefaultControllerApplet::DefaultControllerApplet(Service::SM::ServiceManager& se | |||
| 19 | DefaultControllerApplet::~DefaultControllerApplet() = default; | 19 | DefaultControllerApplet::~DefaultControllerApplet() = default; |
| 20 | 20 | ||
| 21 | void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback, | 21 | void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback, |
| 22 | ControllerParameters parameters) const { | 22 | const ControllerParameters& parameters) const { |
| 23 | LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); | 23 | LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); |
| 24 | 24 | ||
| 25 | auto& npad = | 25 | auto& npad = |
diff --git a/src/core/frontend/applets/controller.h b/src/core/frontend/applets/controller.h index 3e49cdbb9..dff71d8d9 100644 --- a/src/core/frontend/applets/controller.h +++ b/src/core/frontend/applets/controller.h | |||
| @@ -38,7 +38,7 @@ public: | |||
| 38 | virtual ~ControllerApplet(); | 38 | virtual ~ControllerApplet(); |
| 39 | 39 | ||
| 40 | virtual void ReconfigureControllers(std::function<void()> callback, | 40 | virtual void ReconfigureControllers(std::function<void()> callback, |
| 41 | ControllerParameters parameters) const = 0; | 41 | const ControllerParameters& parameters) const = 0; |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| 44 | class DefaultControllerApplet final : public ControllerApplet { | 44 | class DefaultControllerApplet final : public ControllerApplet { |
| @@ -47,7 +47,7 @@ public: | |||
| 47 | ~DefaultControllerApplet() override; | 47 | ~DefaultControllerApplet() override; |
| 48 | 48 | ||
| 49 | void ReconfigureControllers(std::function<void()> callback, | 49 | void ReconfigureControllers(std::function<void()> callback, |
| 50 | ControllerParameters parameters) const override; | 50 | const ControllerParameters& parameters) const override; |
| 51 | 51 | ||
| 52 | private: | 52 | private: |
| 53 | Service::SM::ServiceManager& service_manager; | 53 | Service::SM::ServiceManager& service_manager; |
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp index d6fbbbf2b..c6fa3e4f6 100644 --- a/src/yuzu/applets/controller.cpp +++ b/src/yuzu/applets/controller.cpp | |||
| @@ -589,7 +589,7 @@ QtControllerSelector::QtControllerSelector(GMainWindow& parent) { | |||
| 589 | QtControllerSelector::~QtControllerSelector() = default; | 589 | QtControllerSelector::~QtControllerSelector() = default; |
| 590 | 590 | ||
| 591 | void QtControllerSelector::ReconfigureControllers( | 591 | void QtControllerSelector::ReconfigureControllers( |
| 592 | std::function<void()> callback, Core::Frontend::ControllerParameters parameters) const { | 592 | std::function<void()> callback, const Core::Frontend::ControllerParameters& parameters) const { |
| 593 | this->callback = std::move(callback); | 593 | this->callback = std::move(callback); |
| 594 | emit MainWindowReconfigureControllers(parameters); | 594 | emit MainWindowReconfigureControllers(parameters); |
| 595 | } | 595 | } |
diff --git a/src/yuzu/applets/controller.h b/src/yuzu/applets/controller.h index 2d6d588c6..729ecc831 100644 --- a/src/yuzu/applets/controller.h +++ b/src/yuzu/applets/controller.h | |||
| @@ -120,11 +120,13 @@ public: | |||
| 120 | explicit QtControllerSelector(GMainWindow& parent); | 120 | explicit QtControllerSelector(GMainWindow& parent); |
| 121 | ~QtControllerSelector() override; | 121 | ~QtControllerSelector() override; |
| 122 | 122 | ||
| 123 | void ReconfigureControllers(std::function<void()> callback, | 123 | void ReconfigureControllers( |
| 124 | Core::Frontend::ControllerParameters parameters) const override; | 124 | std::function<void()> callback, |
| 125 | const Core::Frontend::ControllerParameters& parameters) const override; | ||
| 125 | 126 | ||
| 126 | signals: | 127 | signals: |
| 127 | void MainWindowReconfigureControllers(Core::Frontend::ControllerParameters parameters) const; | 128 | void MainWindowReconfigureControllers( |
| 129 | const Core::Frontend::ControllerParameters& parameters) const; | ||
| 128 | 130 | ||
| 129 | private: | 131 | private: |
| 130 | void MainWindowReconfigureFinished(); | 132 | void MainWindowReconfigureFinished(); |