summaryrefslogtreecommitdiff
path: root/src/input_common/input_poller.cpp
diff options
context:
space:
mode:
authorGravatar german772021-10-15 19:07:47 -0500
committerGravatar Narr the Reg2021-11-24 20:30:24 -0600
commite0da5c1bbcdf85676f968b63c8ae2587f0464193 (patch)
tree588837d1181d6b9d3bd4536fd4d2c5877335632d /src/input_common/input_poller.cpp
parentcore/hid: Add output devices (diff)
downloadyuzu-e0da5c1bbcdf85676f968b63c8ae2587f0464193.tar.gz
yuzu-e0da5c1bbcdf85676f968b63c8ae2587f0464193.tar.xz
yuzu-e0da5c1bbcdf85676f968b63c8ae2587f0464193.zip
kraken: Fix errors from rebase and format files
Diffstat (limited to 'src/input_common/input_poller.cpp')
-rw-r--r--src/input_common/input_poller.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp
index 781012886..62ade951c 100644
--- a/src/input_common/input_poller.cpp
+++ b/src/input_common/input_poller.cpp
@@ -597,7 +597,7 @@ public:
597 explicit OutputFromIdentifier(PadIdentifier identifier_, InputEngine* input_engine_) 597 explicit OutputFromIdentifier(PadIdentifier identifier_, InputEngine* input_engine_)
598 : identifier(identifier_), input_engine(input_engine_) {} 598 : identifier(identifier_), input_engine(input_engine_) {}
599 599
600 virtual void SetLED( Input::LedStatus led_status) { 600 virtual void SetLED(Input::LedStatus led_status) {
601 input_engine->SetLeds(identifier, led_status); 601 input_engine->SetLeds(identifier, led_status);
602 } 602 }
603 603
@@ -847,8 +847,7 @@ std::unique_ptr<Input::InputDevice> InputFactory::CreateMotionDevice(Common::Par
847InputFactory::InputFactory(std::shared_ptr<InputEngine> input_engine_) 847InputFactory::InputFactory(std::shared_ptr<InputEngine> input_engine_)
848 : input_engine(std::move(input_engine_)) {} 848 : input_engine(std::move(input_engine_)) {}
849 849
850std::unique_ptr<Input::InputDevice> InputFactory::Create( 850std::unique_ptr<Input::InputDevice> InputFactory::Create(const Common::ParamPackage& params) {
851 const Common::ParamPackage& params) {
852 if (params.Has("button") && params.Has("axis")) { 851 if (params.Has("button") && params.Has("axis")) {
853 return CreateTriggerDevice(params); 852 return CreateTriggerDevice(params);
854 } 853 }
@@ -883,8 +882,7 @@ std::unique_ptr<Input::InputDevice> InputFactory::Create(
883OutputFactory::OutputFactory(std::shared_ptr<InputEngine> input_engine_) 882OutputFactory::OutputFactory(std::shared_ptr<InputEngine> input_engine_)
884 : input_engine(std::move(input_engine_)) {} 883 : input_engine(std::move(input_engine_)) {}
885 884
886std::unique_ptr<Input::OutputDevice> OutputFactory::Create( 885std::unique_ptr<Input::OutputDevice> OutputFactory::Create(const Common::ParamPackage& params) {
887 const Common::ParamPackage& params) {
888 const PadIdentifier identifier = { 886 const PadIdentifier identifier = {
889 .guid = Common::UUID{params.Get("guid", "")}, 887 .guid = Common::UUID{params.Get("guid", "")},
890 .port = static_cast<std::size_t>(params.Get("port", 0)), 888 .port = static_cast<std::size_t>(params.Get("port", 0)),