hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opt: send audio format and data after login successfully.

Browse Source
This commit is contained in:
Kingtous 2023-01-30 01:39:42 +08:00
parent e7e8e1a18b
commit 4f3c5b42ae
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/io_loop.rs
View File

@ -44,6 +44,8 @@ pub struct Remote<T: InvokeUiSession> {
audio_sender: MediaSender, audio_sender: MediaSender,
receiver: mpsc::UnboundedReceiver<Data>, receiver: mpsc::UnboundedReceiver<Data>,
sender: mpsc::UnboundedSender<Data>, sender: mpsc::UnboundedSender<Data>,
// Stop sending local audio to remote client.
stop_local_audio_sender: Option<std::sync::mpsc::Sender<()>>,
old_clipboard: Arc<Mutex<String>>, old_clipboard: Arc<Mutex<String>>,
read_jobs: Vec<fs::TransferJob>, read_jobs: Vec<fs::TransferJob>,
write_jobs: Vec<fs::TransferJob>, write_jobs: Vec<fs::TransferJob>,
@ -85,6 +87,7 @@ impl<T: InvokeUiSession> Remote<T> {
data_count: Arc::new(AtomicUsize::new(0)), data_count: Arc::new(AtomicUsize::new(0)),
frame_count, frame_count,
video_format: CodecFormat::Unknown, video_format: CodecFormat::Unknown,
stop_local_audio_sender: None,
} }
} }
@ -113,8 +116,6 @@ impl<T: InvokeUiSession> Remote<T> {
SERVER_FILE_TRANSFER_ENABLED.store(true, Ordering::SeqCst); SERVER_FILE_TRANSFER_ENABLED.store(true, Ordering::SeqCst);
self.handler.set_connection_type(peer.is_secured(), direct); // flutter -> connection_ready self.handler.set_connection_type(peer.is_secured(), direct); // flutter -> connection_ready
self.handler.set_connection_info(direct, false); self.handler.set_connection_info(direct, false);
// Start client audio when connection is established.
let stop_client_audio = self.start_client_audio();
// just build for now // just build for now
#[cfg(not(windows))] #[cfg(not(windows))]
@ -220,8 +221,8 @@ impl<T: InvokeUiSession> Remote<T> {
} }
log::debug!("Exit io_loop of id={}", self.handler.id); log::debug!("Exit io_loop of id={}", self.handler.id);
// Stop client audio server. // Stop client audio server.
if let Some(stop) = stop_client_audio { if let Some(s) = self.stop_local_audio_sender.take() {
stop.send(()).ok(); s.send(()).ok();
} }
} }
Err(err) => { Err(err) => {
@ -865,6 +866,15 @@ impl<T: InvokeUiSession> Remote<T> {
}); });
} }
} }
// Start audio thread for playback
if !self.handler.is_file_transfer() && !self.handler.is_port_forward() {
// Cancel previous local audio session.
if let Some(sender) = self.stop_local_audio_sender.take() {
allow_err!(sender.send(()));
}
// Start client audio when connection is established.
self.stop_local_audio_sender = self.start_client_audio();
}
if self.handler.is_file_transfer() { if self.handler.is_file_transfer() {
self.handler.load_last_jobs(); self.handler.load_last_jobs();