diff options
Diffstat (limited to 'src/input_common/udp/udp.cpp')
| -rw-r--r-- | src/input_common/udp/udp.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/input_common/udp/udp.cpp b/src/input_common/udp/udp.cpp index 343c3985e..8c6ef1394 100644 --- a/src/input_common/udp/udp.cpp +++ b/src/input_common/udp/udp.cpp | |||
| @@ -16,10 +16,7 @@ namespace InputCommon::CemuhookUDP { | |||
| 16 | 16 | ||
| 17 | class UDPTouchDevice final : public Input::TouchDevice { | 17 | class UDPTouchDevice final : public Input::TouchDevice { |
| 18 | public: | 18 | public: |
| 19 | explicit UDPTouchDevice(std::shared_ptr<DeviceStatus> status_) | 19 | explicit UDPTouchDevice(std::shared_ptr<DeviceStatus> status_) : status(std::move(status_)) {} |
| 20 | : status(std::move(status_)) { | ||
| 21 | } | ||
| 22 | |||
| 23 | std::tuple<float, float, bool> GetStatus() const override { | 20 | std::tuple<float, float, bool> GetStatus() const override { |
| 24 | std::lock_guard guard(status->update_mutex); | 21 | std::lock_guard guard(status->update_mutex); |
| 25 | return status->touch_status; | 22 | return status->touch_status; |
| @@ -31,10 +28,7 @@ private: | |||
| 31 | 28 | ||
| 32 | class UDPMotionDevice final : public Input::MotionDevice { | 29 | class UDPMotionDevice final : public Input::MotionDevice { |
| 33 | public: | 30 | public: |
| 34 | explicit UDPMotionDevice(std::shared_ptr<DeviceStatus> status_) | 31 | explicit UDPMotionDevice(std::shared_ptr<DeviceStatus> status_) : status(std::move(status_)) {} |
| 35 | : status(std::move(status_)) { | ||
| 36 | } | ||
| 37 | |||
| 38 | std::tuple<Common::Vec3<float>, Common::Vec3<float>> GetStatus() const override { | 32 | std::tuple<Common::Vec3<float>, Common::Vec3<float>> GetStatus() const override { |
| 39 | std::lock_guard guard(status->update_mutex); | 33 | std::lock_guard guard(status->update_mutex); |
| 40 | return status->motion_status; | 34 | return status->motion_status; |
| @@ -46,9 +40,7 @@ private: | |||
| 46 | 40 | ||
| 47 | class UDPTouchFactory final : public Input::Factory<Input::TouchDevice> { | 41 | class UDPTouchFactory final : public Input::Factory<Input::TouchDevice> { |
| 48 | public: | 42 | public: |
| 49 | explicit UDPTouchFactory(std::shared_ptr<DeviceStatus> status_) | 43 | explicit UDPTouchFactory(std::shared_ptr<DeviceStatus> status_) : status(std::move(status_)) {} |
| 50 | : status(std::move(status_)) { | ||
| 51 | } | ||
| 52 | 44 | ||
| 53 | std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage& params) override { | 45 | std::unique_ptr<Input::TouchDevice> Create(const Common::ParamPackage& params) override { |
| 54 | { | 46 | { |
| @@ -69,9 +61,7 @@ private: | |||
| 69 | 61 | ||
| 70 | class UDPMotionFactory final : public Input::Factory<Input::MotionDevice> { | 62 | class UDPMotionFactory final : public Input::Factory<Input::MotionDevice> { |
| 71 | public: | 63 | public: |
| 72 | explicit UDPMotionFactory(std::shared_ptr<DeviceStatus> status_) | 64 | explicit UDPMotionFactory(std::shared_ptr<DeviceStatus> status_) : status(std::move(status_)) {} |
| 73 | : status(std::move(status_)) { | ||
| 74 | } | ||
| 75 | 65 | ||
| 76 | std::unique_ptr<Input::MotionDevice> Create(const Common::ParamPackage& params) override { | 66 | std::unique_ptr<Input::MotionDevice> Create(const Common::ParamPackage& params) override { |
| 77 | return std::make_unique<UDPMotionDevice>(status); | 67 | return std::make_unique<UDPMotionDevice>(status); |