diff options
author | bunnei <bunneidev@gmail.com> | 2020-02-03 11:41:04 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-03 11:41:04 -0500 |
commit | 2cd51fc9fd11cce6aeea44dc0158f6bfde5456ec (patch) | |
tree | dfd9cc0b10283da66259842b584e920697d6196b /src/input_common/udp/udp.cpp | |
parent | 157eb375a59029d9d515d37bc9dc4370890bb3e9 (diff) | |
parent | c7678c3044165d9e15ae6a8e0d996f8b793f3c0f (diff) |
Merge pull request #3374 from lioncash/udp
input_common/udp: Minor changes
Diffstat (limited to 'src/input_common/udp/udp.cpp')
-rw-r--r-- | src/input_common/udp/udp.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/input_common/udp/udp.cpp b/src/input_common/udp/udp.cpp index a80f38614..ca99cc22f 100644 --- a/src/input_common/udp/udp.cpp +++ b/src/input_common/udp/udp.cpp @@ -2,7 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "common/logging/log.h" +#include <mutex> +#include <tuple> + #include "common/param_package.h" #include "core/frontend/input.h" #include "core/settings.h" @@ -14,7 +16,7 @@ namespace InputCommon::CemuhookUDP { class UDPTouchDevice final : public Input::TouchDevice { public: explicit UDPTouchDevice(std::shared_ptr<DeviceStatus> status_) : status(std::move(status_)) {} - std::tuple<float, float, bool> GetStatus() const { + std::tuple<float, float, bool> GetStatus() const override { std::lock_guard guard(status->update_mutex); return status->touch_status; } @@ -26,7 +28,7 @@ private: class UDPMotionDevice final : public Input::MotionDevice { public: explicit UDPMotionDevice(std::shared_ptr<DeviceStatus> status_) : status(std::move(status_)) {} - std::tuple<Common::Vec3<float>, Common::Vec3<float>> GetStatus() const { + std::tuple<Common::Vec3<float>, Common::Vec3<float>> GetStatus() const override { std::lock_guard guard(status->update_mutex); return status->motion_status; } |