diff options
| author | 2021-10-15 19:07:47 -0500 | |
|---|---|---|
| committer | 2021-11-24 20:30:24 -0600 | |
| commit | e0da5c1bbcdf85676f968b63c8ae2587f0464193 (patch) | |
| tree | 588837d1181d6b9d3bd4536fd4d2c5877335632d /src/input_common/helpers | |
| parent | core/hid: Add output devices (diff) | |
| download | yuzu-e0da5c1bbcdf85676f968b63c8ae2587f0464193.tar.gz yuzu-e0da5c1bbcdf85676f968b63c8ae2587f0464193.tar.xz yuzu-e0da5c1bbcdf85676f968b63c8ae2587f0464193.zip | |
kraken: Fix errors from rebase and format files
Diffstat (limited to 'src/input_common/helpers')
| -rw-r--r-- | src/input_common/helpers/stick_from_buttons.cpp | 3 | ||||
| -rw-r--r-- | src/input_common/helpers/stick_from_buttons.h | 3 | ||||
| -rw-r--r-- | src/input_common/helpers/touch_from_buttons.cpp | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/input_common/helpers/stick_from_buttons.cpp b/src/input_common/helpers/stick_from_buttons.cpp index 89ba4aeb1..38f150746 100644 --- a/src/input_common/helpers/stick_from_buttons.cpp +++ b/src/input_common/helpers/stick_from_buttons.cpp | |||
| @@ -251,8 +251,7 @@ private: | |||
| 251 | std::chrono::time_point<std::chrono::steady_clock> last_update; | 251 | std::chrono::time_point<std::chrono::steady_clock> last_update; |
| 252 | }; | 252 | }; |
| 253 | 253 | ||
| 254 | std::unique_ptr<Input::InputDevice> StickFromButton::Create( | 254 | std::unique_ptr<Input::InputDevice> StickFromButton::Create(const Common::ParamPackage& params) { |
| 255 | const Common::ParamPackage& params) { | ||
| 256 | const std::string null_engine = Common::ParamPackage{{"engine", "null"}}.Serialize(); | 255 | const std::string null_engine = Common::ParamPackage{{"engine", "null"}}.Serialize(); |
| 257 | auto up = Input::CreateDeviceFromString<Input::InputDevice>(params.Get("up", null_engine)); | 256 | auto up = Input::CreateDeviceFromString<Input::InputDevice>(params.Get("up", null_engine)); |
| 258 | auto down = Input::CreateDeviceFromString<Input::InputDevice>(params.Get("down", null_engine)); | 257 | auto down = Input::CreateDeviceFromString<Input::InputDevice>(params.Get("down", null_engine)); |
diff --git a/src/input_common/helpers/stick_from_buttons.h b/src/input_common/helpers/stick_from_buttons.h index 87165e022..1d6e24c98 100644 --- a/src/input_common/helpers/stick_from_buttons.h +++ b/src/input_common/helpers/stick_from_buttons.h | |||
| @@ -25,8 +25,7 @@ public: | |||
| 25 | * - "modifier": a serialized ParamPackage for creating a button device as the modifier | 25 | * - "modifier": a serialized ParamPackage for creating a button device as the modifier |
| 26 | * - "modifier_scale": a float for the multiplier the modifier gives to the position | 26 | * - "modifier_scale": a float for the multiplier the modifier gives to the position |
| 27 | */ | 27 | */ |
| 28 | std::unique_ptr<Input::InputDevice> Create( | 28 | std::unique_ptr<Input::InputDevice> Create(const Common::ParamPackage& params) override; |
| 29 | const Common::ParamPackage& params) override; | ||
| 30 | }; | 29 | }; |
| 31 | 30 | ||
| 32 | } // namespace InputCommon | 31 | } // namespace InputCommon |
diff --git a/src/input_common/helpers/touch_from_buttons.cpp b/src/input_common/helpers/touch_from_buttons.cpp index 6c9046ffb..2abfaf841 100644 --- a/src/input_common/helpers/touch_from_buttons.cpp +++ b/src/input_common/helpers/touch_from_buttons.cpp | |||
| @@ -57,9 +57,7 @@ private: | |||
| 57 | const Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false}; | 57 | const Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false}; |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | 60 | std::unique_ptr<Input::InputDevice> TouchFromButton::Create(const Common::ParamPackage& params) { | |
| 61 | std::unique_ptr<Input::InputDevice> TouchFromButton::Create( | ||
| 62 | const Common::ParamPackage& params) { | ||
| 63 | const std::string null_engine = Common::ParamPackage{{"engine", "null"}}.Serialize(); | 61 | const std::string null_engine = Common::ParamPackage{{"engine", "null"}}.Serialize(); |
| 64 | auto button = | 62 | auto button = |
| 65 | Input::CreateDeviceFromString<Input::InputDevice>(params.Get("button", null_engine)); | 63 | Input::CreateDeviceFromString<Input::InputDevice>(params.Get("button", null_engine)); |