From a967dc72d7e0e59ff8aea4f138da1c569a4e6e1b Mon Sep 17 00:00:00 2001 From: dijunkun Date: Fri, 19 Dec 2025 01:46:16 +0800 Subject: [PATCH] [feat] use SendReliableDataFrame() instead of SendDataFrame() --- src/gui/render.cpp | 4 ++-- src/gui/render_callback.cpp | 18 +++++++++--------- src/gui/toolbars/control_bar.cpp | 10 +++++----- submodules/minirtc | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/gui/render.cpp b/src/gui/render.cpp index d4e938c..9e3ff4c 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -1341,8 +1341,8 @@ void Render::MainLoop() { remote_action.i.host_name_size = host_name.size(); std::string msg = remote_action.to_json(); - int ret = SendDataFrame(peer_, msg.data(), msg.size(), - data_label_.c_str(), false); + int ret = SendReliableDataFrame(peer_, msg.data(), msg.size(), + data_label_.c_str()); FreeRemoteAction(remote_action); if (0 == ret) { need_to_send_host_info_ = false; diff --git a/src/gui/render_callback.cpp b/src/gui/render_callback.cpp index fe687a1..2408ebe 100644 --- a/src/gui/render_callback.cpp +++ b/src/gui/render_callback.cpp @@ -33,8 +33,8 @@ int Render::SendKeyCommand(int key_code, bool is_down) { if (props->connection_status_ == ConnectionStatus::Connected) { std::string msg = remote_action.to_json(); if (props->peer_) { - SendDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str(), false); + SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), + props->data_label_.c_str()); } } } @@ -104,8 +104,8 @@ int Render::ProcessMouseEvent(const SDL_Event& event) { std::string msg = remote_action.to_json(); if (props->peer_) { - SendDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str(), false); + SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), + props->data_label_.c_str()); } } else if (SDL_EVENT_MOUSE_WHEEL == event.type && last_mouse_event.button.x >= props->stream_render_rect_.x && @@ -151,8 +151,8 @@ int Render::ProcessMouseEvent(const SDL_Event& event) { std::string msg = remote_action.to_json(); if (props->peer_) { - SendDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str(), false); + SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), + props->data_label_.c_str()); } } } @@ -495,12 +495,12 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id, render->need_to_send_host_info_ = true; render->start_screen_capturer_ = true; render->start_speaker_capturer_ = true; -#ifdef CROSSDESK_DEBUG + // #ifdef CROSSDESK_DEBUG render->start_mouse_controller_ = false; render->start_keyboard_capturer_ = false; -#else + // #else render->start_mouse_controller_ = true; -#endif + // #endif if (std::all_of(render->connection_status_.begin(), render->connection_status_.end(), [](const auto& kv) { return kv.first.find("web") != std::string::npos; diff --git a/src/gui/toolbars/control_bar.cpp b/src/gui/toolbars/control_bar.cpp index d6924ee..b22715d 100644 --- a/src/gui/toolbars/control_bar.cpp +++ b/src/gui/toolbars/control_bar.cpp @@ -92,8 +92,8 @@ int Render::ControlBar(std::shared_ptr& props) { remote_action.d = i; if (props->connection_status_ == ConnectionStatus::Connected) { std::string msg = remote_action.to_json(); - SendDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str(), false); + SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), + props->data_label_.c_str()); } } props->display_selectable_hovered_ = ImGui::IsWindowHovered(); @@ -173,8 +173,8 @@ int Render::ControlBar(std::shared_ptr& props) { remote_action.type = ControlType::audio_capture; remote_action.a = props->audio_capture_button_pressed_; std::string msg = remote_action.to_json(); - SendDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str(), false); + SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), + props->data_label_.c_str()); } } @@ -214,7 +214,7 @@ int Render::ControlBar(std::shared_ptr& props) { int ret = sender.SendFile( file_path, file_path.filename().string(), [peer, file_label](const char* buf, size_t sz) -> int { - return SendDataFrame(peer, buf, sz, file_label.c_str(), true); + return SendReliableDataFrame(peer, buf, sz, file_label.c_str()); }); if (ret != 0) { diff --git a/submodules/minirtc b/submodules/minirtc index 6db742f..c5622d7 160000 --- a/submodules/minirtc +++ b/submodules/minirtc @@ -1 +1 @@ -Subproject commit 6db742ffa34d346201ebf7684971a37ab3d62889 +Subproject commit c5622d710426fed91a18c65af8964b9cbc321de8