diff options
Diffstat (limited to 'src/input_common/udp')
-rw-r--r-- | src/input_common/udp/client.cpp | 7 | ||||
-rw-r--r-- | src/input_common/udp/udp.cpp | 14 | ||||
-rw-r--r-- | src/input_common/udp/udp.h | 7 |
3 files changed, 19 insertions, 9 deletions
diff --git a/src/input_common/udp/client.cpp b/src/input_common/udp/client.cpp index e63c73c4f..3f4eaf448 100644 --- a/src/input_common/udp/client.cpp +++ b/src/input_common/udp/client.cpp @@ -9,7 +9,6 @@ #include <functional> #include <thread> #include <boost/asio.hpp> -#include <boost/bind.hpp> #include "common/logging/log.h" #include "input_common/udp/client.h" #include "input_common/udp/protocol.h" @@ -225,8 +224,7 @@ void TestCommunication(const std::string& host, u16 port, u8 pad_index, u32 clie } else { failure_callback(); } - }) - .detach(); + }).detach(); } CalibrationConfigurationJob::CalibrationConfigurationJob( @@ -280,8 +278,7 @@ CalibrationConfigurationJob::CalibrationConfigurationJob( complete_event.Wait(); socket.Stop(); worker_thread.join(); - }) - .detach(); + }).detach(); } CalibrationConfigurationJob::~CalibrationConfigurationJob() { diff --git a/src/input_common/udp/udp.cpp b/src/input_common/udp/udp.cpp index 8c6ef1394..4b347e47e 100644 --- a/src/input_common/udp/udp.cpp +++ b/src/input_common/udp/udp.cpp @@ -77,10 +77,11 @@ State::State() { std::make_unique<Client>(status, Settings::values.udp_input_address, Settings::values.udp_input_port, Settings::values.udp_pad_index); - Input::RegisterFactory<Input::TouchDevice>("cemuhookudp", - std::make_shared<UDPTouchFactory>(status)); - Input::RegisterFactory<Input::MotionDevice>("cemuhookudp", - std::make_shared<UDPMotionFactory>(status)); + motion_factory = std::make_shared<UDPMotionFactory>(status); + touch_factory = std::make_shared<UDPTouchFactory>(status); + + Input::RegisterFactory<Input::MotionDevice>("cemuhookudp", motion_factory); + Input::RegisterFactory<Input::TouchDevice>("cemuhookudp", touch_factory); } State::~State() { @@ -88,6 +89,11 @@ State::~State() { Input::UnregisterFactory<Input::MotionDevice>("cemuhookudp"); } +std::vector<Common::ParamPackage> State::GetInputDevices() const { + // TODO support binding udp devices + return {}; +} + void State::ReloadUDPClient() { client->ReloadSocket(Settings::values.udp_input_address, Settings::values.udp_input_port, Settings::values.udp_pad_index); diff --git a/src/input_common/udp/udp.h b/src/input_common/udp/udp.h index 4f83f0441..672a5c812 100644 --- a/src/input_common/udp/udp.h +++ b/src/input_common/udp/udp.h @@ -5,19 +5,26 @@ #pragma once #include <memory> +#include <vector> +#include "common/param_package.h" namespace InputCommon::CemuhookUDP { class Client; +class UDPMotionFactory; +class UDPTouchFactory; class State { public: State(); ~State(); void ReloadUDPClient(); + std::vector<Common::ParamPackage> GetInputDevices() const; private: std::unique_ptr<Client> client; + std::shared_ptr<UDPMotionFactory> motion_factory; + std::shared_ptr<UDPTouchFactory> touch_factory; }; std::unique_ptr<State> Init(); |