notsoyuzu
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4834 from lioncash/copy-fn 

controller: Pass ControllerParameters by reference in ReconfigureControllers()
This commit is contained in:
bunnei 2020-10-26 18:49:26 -07:00 committed by GitHub
parent 2f6ba54483 6b5f565324
commit 9f08cea2c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/frontend/applets/controller.cpp
View File

@ -19,7 +19,7 @@ DefaultControllerApplet::DefaultControllerApplet(Service::SM::ServiceManager& se
DefaultControllerApplet::~DefaultControllerApplet() = default; DefaultControllerApplet::~DefaultControllerApplet() = default;
void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback, void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callback,
ControllerParameters parameters) const { const ControllerParameters& parameters) const {
LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!"); LOG_INFO(Service_HID, "called, deducing the best configuration based on the given parameters!");
auto& npad = auto& npad =

4
src/core/frontend/applets/controller.h
View File

@ -38,7 +38,7 @@ public:
virtual ~ControllerApplet(); virtual ~ControllerApplet();
virtual void ReconfigureControllers(std::function<void()> callback, virtual void ReconfigureControllers(std::function<void()> callback,
ControllerParameters parameters) const = 0; const ControllerParameters& parameters) const = 0;
}; };
class DefaultControllerApplet final : public ControllerApplet { class DefaultControllerApplet final : public ControllerApplet {
@ -47,7 +47,7 @@ public:
~DefaultControllerApplet() override; ~DefaultControllerApplet() override;
void ReconfigureControllers(std::function<void()> callback, void ReconfigureControllers(std::function<void()> callback,
ControllerParameters parameters) const override; const ControllerParameters& parameters) const override;
private: private:
Service::SM::ServiceManager& service_manager; Service::SM::ServiceManager& service_manager;

2
src/yuzu/applets/controller.cpp
View File

@ -589,7 +589,7 @@ QtControllerSelector::QtControllerSelector(GMainWindow& parent) {
QtControllerSelector::~QtControllerSelector() = default; QtControllerSelector::~QtControllerSelector() = default;
void QtControllerSelector::ReconfigureControllers( void QtControllerSelector::ReconfigureControllers(
std::function<void()> callback, Core::Frontend::ControllerParameters parameters) const { std::function<void()> callback, const Core::Frontend::ControllerParameters& parameters) const {
this->callback = std::move(callback); this->callback = std::move(callback);
emit MainWindowReconfigureControllers(parameters); emit MainWindowReconfigureControllers(parameters);
} }

8
src/yuzu/applets/controller.h
View File

@ -120,11 +120,13 @@ public:
explicit QtControllerSelector(GMainWindow& parent); explicit QtControllerSelector(GMainWindow& parent);
~QtControllerSelector() override; ~QtControllerSelector() override;
void ReconfigureControllers(std::function<void()> callback, void ReconfigureControllers(
Core::Frontend::ControllerParameters parameters) const override; std::function<void()> callback,
const Core::Frontend::ControllerParameters& parameters) const override;
signals: signals:
void MainWindowReconfigureControllers(Core::Frontend::ControllerParameters parameters) const; void MainWindowReconfigureControllers(
const Core::Frontend::ControllerParameters& parameters) const;
private: private:
void MainWindowReconfigureFinished(); void MainWindowReconfigureFinished();