From d337971de0909670b2cf2ecb5bc54d5691369d40 Mon Sep 17 00:00:00 2001 From: dijunkun Date: Fri, 19 Dec 2025 18:22:34 +0800 Subject: [PATCH] [feat] update MiniRTC api calling --- src/gui/panels/remote_peer_panel.cpp | 4 ++-- src/gui/render.cpp | 8 ++++---- src/gui/render_callback.cpp | 18 +++++++++--------- src/gui/toolbars/control_bar.cpp | 8 ++++---- submodules/minirtc | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gui/panels/remote_peer_panel.cpp b/src/gui/panels/remote_peer_panel.cpp index 26c5b47..606e8af 100644 --- a/src/gui/panels/remote_peer_panel.cpp +++ b/src/gui/panels/remote_peer_panel.cpp @@ -206,8 +206,8 @@ int Render::ConnectTo(const std::string& remote_id, const char* password, AddVideoStream(props->peer_, display_info.name.c_str()); } AddAudioStream(props->peer_, props->audio_label_.c_str()); - AddDataStream(props->peer_, props->data_label_.c_str()); - AddDataStream(props->peer_, props->file_label_.c_str()); + AddDataStream(props->peer_, props->data_label_.c_str(), false); + AddDataStream(props->peer_, props->file_label_.c_str(), true); props->connection_status_ = ConnectionStatus::Connecting; diff --git a/src/gui/render.cpp b/src/gui/render.cpp index 9e3ff4c..95ea3cc 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -713,8 +713,8 @@ int Render::CreateConnectionPeer() { } AddAudioStream(peer_, audio_label_.c_str()); - AddDataStream(peer_, data_label_.c_str()); - AddDataStream(peer_, file_label_.c_str()); + AddDataStream(peer_, data_label_.c_str(), false); + AddDataStream(peer_, file_label_.c_str(), true); return 0; } else { return -1; @@ -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 = SendReliableDataFrame(peer_, msg.data(), msg.size(), - data_label_.c_str()); + int ret = + SendDataFrame(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 2408ebe..79cefdf 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_) { - SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str()); + SendDataFrame(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_) { - SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str()); + SendDataFrame(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_) { - SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str()); + SendDataFrame(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 b22715d..c326444 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(); - SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str()); + SendDataFrame(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(); - SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(), - props->data_label_.c_str()); + SendDataFrame(props->peer_, msg.c_str(), msg.size(), + props->data_label_.c_str()); } } diff --git a/submodules/minirtc b/submodules/minirtc index c5622d7..05ea5f9 160000 --- a/submodules/minirtc +++ b/submodules/minirtc @@ -1 +1 @@ -Subproject commit c5622d710426fed91a18c65af8964b9cbc321de8 +Subproject commit 05ea5f9b2f3b209d1e3b0792afb679dd0d2265cd