summaryrefslogtreecommitdiff
path: root/src/input_common/udp/client.h
diff options
context:
space:
mode:
authorGravatar bunnei2021-03-03 15:45:32 -0800
committerGravatar GitHub2021-03-03 15:45:32 -0800
commit394475c4e379699903f34690a6c6fc83e6280d31 (patch)
treea72cd104c7a6d0013d6ad929b024aad9cdcb0e6c /src/input_common/udp/client.h
parentMerge pull request #5815 from comex/net-error-reform (diff)
parentinputCommon: Use an unique client id for each socket instance (diff)
downloadyuzu-394475c4e379699903f34690a6c6fc83e6280d31.tar.gz
yuzu-394475c4e379699903f34690a6c6fc83e6280d31.tar.xz
yuzu-394475c4e379699903f34690a6c6fc83e6280d31.zip
Merge pull request #6004 from german77/udprandom
InputCommon: Use an unique client id for each udp socket instance
Diffstat (limited to 'src/input_common/udp/client.h')
-rw-r--r--src/input_common/udp/client.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/udp/client.h b/src/input_common/udp/client.h
index a523f6124..e9e438e88 100644
--- a/src/input_common/udp/client.h
+++ b/src/input_common/udp/client.h
@@ -126,7 +126,7 @@ private:
126 void OnPortInfo(Response::PortInfo); 126 void OnPortInfo(Response::PortInfo);
127 void OnPadData(Response::PadData, std::size_t client); 127 void OnPadData(Response::PadData, std::size_t client);
128 void StartCommunication(std::size_t client, const std::string& host, u16 port, 128 void StartCommunication(std::size_t client, const std::string& host, u16 port,
129 std::size_t pad_index, u32 client_id); 129 std::size_t pad_index);
130 void UpdateYuzuSettings(std::size_t client, const Common::Vec3<float>& acc, 130 void UpdateYuzuSettings(std::size_t client, const Common::Vec3<float>& acc,
131 const Common::Vec3<float>& gyro); 131 const Common::Vec3<float>& gyro);
132 132
@@ -165,7 +165,7 @@ public:
165 * @param data_callback Called when calibration data is ready 165 * @param data_callback Called when calibration data is ready
166 */ 166 */
167 explicit CalibrationConfigurationJob(const std::string& host, u16 port, std::size_t pad_index, 167 explicit CalibrationConfigurationJob(const std::string& host, u16 port, std::size_t pad_index,
168 u32 client_id, std::function<void(Status)> status_callback, 168 std::function<void(Status)> status_callback,
169 std::function<void(u16, u16, u16, u16)> data_callback); 169 std::function<void(u16, u16, u16, u16)> data_callback);
170 ~CalibrationConfigurationJob(); 170 ~CalibrationConfigurationJob();
171 void Stop(); 171 void Stop();
@@ -174,7 +174,7 @@ private:
174 Common::Event complete_event; 174 Common::Event complete_event;
175}; 175};
176 176
177void TestCommunication(const std::string& host, u16 port, std::size_t pad_index, u32 client_id, 177void TestCommunication(const std::string& host, u16 port, std::size_t pad_index,
178 const std::function<void()>& success_callback, 178 const std::function<void()>& success_callback,
179 const std::function<void()>& failure_callback); 179 const std::function<void()>& failure_callback);
180 180