From 94e60d4e8b9f4be71d3e4fb1ca121fcb4420106e Mon Sep 17 00:00:00 2001 From: Patrick Nicolas Date: Thu, 23 Nov 2023 22:04:10 +0100 Subject: [PATCH] Use same packet definitions for both sockets --- client/scenes/lobby.cpp | 5 ----- client/scenes/lobby.h | 1 - client/scenes/stream.h | 5 ----- client/wivrn_client.h | 4 ++-- common/wivrn_packets.h | 6 ++---- server/driver/wivrn_connection.cpp | 2 +- server/driver/wivrn_connection.h | 6 +++--- server/driver/wivrn_session.cpp | 2 +- 8 files changed, 9 insertions(+), 22 deletions(-) diff --git a/client/scenes/lobby.cpp b/client/scenes/lobby.cpp index 4ddfff37..1633eb02 100644 --- a/client/scenes/lobby.cpp +++ b/client/scenes/lobby.cpp @@ -18,16 +18,11 @@ */ #include "lobby.h" -#include "glm/glm.hpp" #include "render/text_rasterizer.h" #include "stream.h" -#include "utils/ranges.h" -#include "utils/strings.h" -#include "vk/vk.h" #include #include -#include #include #include diff --git a/client/scenes/lobby.h b/client/scenes/lobby.h index 6b85c010..54c18950 100644 --- a/client/scenes/lobby.h +++ b/client/scenes/lobby.h @@ -23,7 +23,6 @@ #include "vk/buffer.h" #include "vk/image.h" #include "vk/renderpass.h" -#include "wivrn_client.h" #include "wivrn_discover.h" #include diff --git a/client/scenes/stream.h b/client/scenes/stream.h index 64bf9592..f3876967 100644 --- a/client/scenes/stream.h +++ b/client/scenes/stream.h @@ -23,13 +23,8 @@ #include "scene.h" #include "stream_reprojection.h" #include "utils/sync_queue.h" -#include "vk/device_memory.h" -#include "vk/renderpass.h" #include "wivrn_client.h" #include "wivrn_packets.h" -#include -#include -#include #include #include #include diff --git a/client/wivrn_client.h b/client/wivrn_client.h index 9c1a6fb7..5376ca14 100644 --- a/client/wivrn_client.h +++ b/client/wivrn_client.h @@ -27,8 +27,8 @@ using namespace xrt::drivers::wivrn; class wivrn_session { - typed_socket control; - typed_socket stream; + typed_socket control; + typed_socket stream; void handshake(); diff --git a/common/wivrn_packets.h b/common/wivrn_packets.h index cc134af7..117211ae 100644 --- a/common/wivrn_packets.h +++ b/common/wivrn_packets.h @@ -183,8 +183,7 @@ struct feedback uint8_t received_data_packets; }; -using control_packets = std::variant; -using stream_packets = std::variant; +using packets = std::variant; } // namespace from_headset namespace to_headset @@ -288,8 +287,7 @@ struct timesync_query std::chrono::nanoseconds query; }; -using control_packets = std::variant; -using stream_packets = std::variant; +using packets = std::variant; } // namespace to_headset diff --git a/server/driver/wivrn_connection.cpp b/server/driver/wivrn_connection.cpp index 80f6fb24..a5287979 100644 --- a/server/driver/wivrn_connection.cpp +++ b/server/driver/wivrn_connection.cpp @@ -98,7 +98,7 @@ wivrn_connection::wivrn_connection(TCP && tcp) : } } -std::optional wivrn_connection::poll_control(int timeout) +std::optional wivrn_connection::poll_control(int timeout) { pollfd fds{}; fds.events = POLLIN; diff --git a/server/driver/wivrn_connection.h b/server/driver/wivrn_connection.h index c8fe0564..45fe4b69 100644 --- a/server/driver/wivrn_connection.h +++ b/server/driver/wivrn_connection.h @@ -28,8 +28,8 @@ using namespace xrt::drivers::wivrn; class wivrn_connection { - typed_socket control; - typed_socket stream; + typed_socket control; + typed_socket stream; public: wivrn_connection(TCP && tcp); @@ -47,7 +47,7 @@ public: stream.send(std::forward(packet)); } - std::optional poll_control(int timeout); + std::optional poll_control(int timeout); template int poll(T && visitor, int timeout) diff --git a/server/driver/wivrn_session.cpp b/server/driver/wivrn_session.cpp index fbc34969..5de3de60 100644 --- a/server/driver/wivrn_session.cpp +++ b/server/driver/wivrn_session.cpp @@ -76,7 +76,7 @@ xrt_result_t xrt::drivers::wivrn::wivrn_session::create_session(xrt::drivers::wi xrt_system_compositor ** out_xsysc) { std::shared_ptr self; - std::optional control; + std::optional control; try { self = std::shared_ptr(new wivrn_session(std::move(tcp)));