summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2020-10-16 06:22:26 -0400
committerGravatar Lioncash2020-10-16 06:22:29 -0400
commit36cfb234d5f867a59f102ac2ffd71dc1c669cf46 (patch)
tree9e0e54a038cca0500c07d4583d74be1b7430c34c /src
parentMerge pull request #4790 from lioncash/input-common (diff)
downloadyuzu-36cfb234d5f867a59f102ac2ffd71dc1c669cf46.tar.gz
yuzu-36cfb234d5f867a59f102ac2ffd71dc1c669cf46.tar.xz
yuzu-36cfb234d5f867a59f102ac2ffd71dc1c669cf46.zip
udp/client: Take std::function by const reference with TestCommunication()
Avoids redundant copies.
Diffstat (limited to 'src')
-rw-r--r--src/input_common/udp/client.cpp6
-rw-r--r--src/input_common/udp/client.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/input_common/udp/client.cpp b/src/input_common/udp/client.cpp
index bb109562c..e3dd8a4be 100644
--- a/src/input_common/udp/client.cpp
+++ b/src/input_common/udp/client.cpp
@@ -333,15 +333,15 @@ const std::array<Common::SPSCQueue<UDPPadStatus>, 4>& Client::GetPadQueue() cons
333} 333}
334 334
335void TestCommunication(const std::string& host, u16 port, std::size_t pad_index, u32 client_id, 335void TestCommunication(const std::string& host, u16 port, std::size_t pad_index, u32 client_id,
336 std::function<void()> success_callback, 336 const std::function<void()>& success_callback,
337 std::function<void()> failure_callback) { 337 const std::function<void()>& failure_callback) {
338 std::thread([=] { 338 std::thread([=] {
339 Common::Event success_event; 339 Common::Event success_event;
340 SocketCallback callback{[](Response::Version version) {}, [](Response::PortInfo info) {}, 340 SocketCallback callback{[](Response::Version version) {}, [](Response::PortInfo info) {},
341 [&](Response::PadData data) { success_event.Set(); }}; 341 [&](Response::PadData data) { success_event.Set(); }};
342 Socket socket{host, port, pad_index, client_id, std::move(callback)}; 342 Socket socket{host, port, pad_index, client_id, std::move(callback)};
343 std::thread worker_thread{SocketLoop, &socket}; 343 std::thread worker_thread{SocketLoop, &socket};
344 bool result = success_event.WaitFor(std::chrono::seconds(8)); 344 const bool result = success_event.WaitFor(std::chrono::seconds(8));
345 socket.Stop(); 345 socket.Stop();
346 worker_thread.join(); 346 worker_thread.join();
347 if (result) { 347 if (result) {
diff --git a/src/input_common/udp/client.h b/src/input_common/udp/client.h
index 2491a03a2..747e0c0a2 100644
--- a/src/input_common/udp/client.h
+++ b/src/input_common/udp/client.h
@@ -150,7 +150,7 @@ private:
150}; 150};
151 151
152void TestCommunication(const std::string& host, u16 port, std::size_t pad_index, u32 client_id, 152void TestCommunication(const std::string& host, u16 port, std::size_t pad_index, u32 client_id,
153 std::function<void()> success_callback, 153 const std::function<void()>& success_callback,
154 std::function<void()> failure_callback); 154 const std::function<void()>& failure_callback);
155 155
156} // namespace InputCommon::CemuhookUDP 156} // namespace InputCommon::CemuhookUDP