mirror of
https://github.com/kunkundi/crossdesk.git
synced 2026-03-22 07:37:29 +08:00
Compare commits
2 Commits
78c82f778a
...
0155413c12
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0155413c12 | ||
|
|
8468be6532 |
@@ -207,6 +207,7 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
|
|||||||
}
|
}
|
||||||
AddAudioStream(props->peer_, props->audio_label_.c_str());
|
AddAudioStream(props->peer_, props->audio_label_.c_str());
|
||||||
AddDataStream(props->peer_, props->data_label_.c_str(), false);
|
AddDataStream(props->peer_, props->data_label_.c_str(), false);
|
||||||
|
AddDataStream(props->peer_, props->control_data_label_.c_str(), true);
|
||||||
AddDataStream(props->peer_, props->file_label_.c_str(), true);
|
AddDataStream(props->peer_, props->file_label_.c_str(), true);
|
||||||
AddDataStream(props->peer_, props->file_feedback_label_.c_str(), true);
|
AddDataStream(props->peer_, props->file_feedback_label_.c_str(), true);
|
||||||
AddDataStream(props->peer_, props->clipboard_label_.c_str(), true);
|
AddDataStream(props->peer_, props->clipboard_label_.c_str(), true);
|
||||||
|
|||||||
@@ -716,6 +716,7 @@ int Render::CreateConnectionPeer() {
|
|||||||
|
|
||||||
AddAudioStream(peer_, audio_label_.c_str());
|
AddAudioStream(peer_, audio_label_.c_str());
|
||||||
AddDataStream(peer_, data_label_.c_str(), false);
|
AddDataStream(peer_, data_label_.c_str(), false);
|
||||||
|
AddDataStream(peer_, control_data_label_.c_str(), true);
|
||||||
AddDataStream(peer_, file_label_.c_str(), true);
|
AddDataStream(peer_, file_label_.c_str(), true);
|
||||||
AddDataStream(peer_, file_feedback_label_.c_str(), true);
|
AddDataStream(peer_, file_feedback_label_.c_str(), true);
|
||||||
AddDataStream(peer_, clipboard_label_.c_str(), true);
|
AddDataStream(peer_, clipboard_label_.c_str(), true);
|
||||||
@@ -1375,8 +1376,8 @@ void Render::MainLoop() {
|
|||||||
remote_action.i.host_name_size = host_name.size();
|
remote_action.i.host_name_size = host_name.size();
|
||||||
|
|
||||||
std::string msg = remote_action.to_json();
|
std::string msg = remote_action.to_json();
|
||||||
int ret =
|
int ret = SendDataFrame(peer_, msg.data(), msg.size(),
|
||||||
SendDataFrame(peer_, msg.data(), msg.size(), data_label_.c_str());
|
control_data_label_.c_str());
|
||||||
FreeRemoteAction(remote_action);
|
FreeRemoteAction(remote_action);
|
||||||
if (0 == ret) {
|
if (0 == ret) {
|
||||||
need_to_send_host_info_ = false;
|
need_to_send_host_info_ = false;
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ class Render {
|
|||||||
std::string audio_label_ = "control_audio";
|
std::string audio_label_ = "control_audio";
|
||||||
std::string data_label_ = "control_data";
|
std::string data_label_ = "control_data";
|
||||||
std::string file_label_ = "file";
|
std::string file_label_ = "file";
|
||||||
|
std::string control_data_label_ = "control_data";
|
||||||
std::string file_feedback_label_ = "file_feedback";
|
std::string file_feedback_label_ = "file_feedback";
|
||||||
std::string clipboard_label_ = "clipboard";
|
std::string clipboard_label_ = "clipboard";
|
||||||
std::string local_id_ = "";
|
std::string local_id_ = "";
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
|
|||||||
if (props->connection_status_ == ConnectionStatus::Connected) {
|
if (props->connection_status_ == ConnectionStatus::Connected) {
|
||||||
std::string msg = remote_action.to_json();
|
std::string msg = remote_action.to_json();
|
||||||
SendDataFrame(props->peer_, msg.c_str(), msg.size(),
|
SendDataFrame(props->peer_, msg.c_str(), msg.size(),
|
||||||
props->data_label_.c_str());
|
props->control_data_label_.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
props->display_selectable_hovered_ = ImGui::IsWindowHovered();
|
props->display_selectable_hovered_ = ImGui::IsWindowHovered();
|
||||||
@@ -177,7 +177,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
|
|||||||
remote_action.a = props->audio_capture_button_pressed_;
|
remote_action.a = props->audio_capture_button_pressed_;
|
||||||
std::string msg = remote_action.to_json();
|
std::string msg = remote_action.to_json();
|
||||||
SendDataFrame(props->peer_, msg.c_str(), msg.size(),
|
SendDataFrame(props->peer_, msg.c_str(), msg.size(),
|
||||||
props->data_label_.c_str());
|
props->control_data_label_.c_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Submodule submodules/minirtc updated: fc5591eec7...a282340f8b
Reference in New Issue
Block a user