From 22d071d2ef94fda47ea90527054397ef239aa050 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Thu, 8 Dec 2022 20:08:33 +0800 Subject: [PATCH] change to rustdesk/rdev and remove warn --- Cargo.lock | 26 ++++++++++++++++++++++++-- src/client/io_loop.rs | 2 +- src/server/video_service.rs | 3 ++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf3ce1f04..237369d2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1533,7 +1533,7 @@ dependencies = [ "log", "objc", "pkg-config", - "rdev", + "rdev 0.5.0-2 (git+https://github.com/asur4s/rdev)", "serde 1.0.147", "serde_derive", "tfc", @@ -4248,6 +4248,28 @@ dependencies = [ "x11 2.20.0", ] +[[package]] +name = "rdev" +version = "0.5.0-2" +source = "git+https://github.com/rustdesk/rdev#25c29f61bfdf5d8ec50f0a8a7743bc1d85eb2c04" +dependencies = [ + "cocoa", + "core-foundation 0.9.3", + "core-foundation-sys 0.8.3", + "core-graphics 0.22.3", + "enum-map", + "epoll", + "inotify", + "lazy_static", + "libc", + "mio 0.8.5", + "strum 0.24.1", + "strum_macros 0.24.3", + "widestring 1.0.2", + "winapi 0.3.9", + "x11 2.20.0", +] + [[package]] name = "rdrand" version = "0.4.0" @@ -4518,7 +4540,7 @@ dependencies = [ "num_cpus", "objc", "parity-tokio-ipc", - "rdev", + "rdev 0.5.0-2 (git+https://github.com/rustdesk/rdev)", "repng", "reqwest", "rpassword 7.1.0", diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs index efeacb61c..326857d3f 100644 --- a/src/client/io_loop.rs +++ b/src/client/io_loop.rs @@ -936,7 +936,7 @@ impl Remote { self.handle_job_status(d.id, d.file_num, err); } Some(file_response::Union::Error(e)) => { - if let Some(job) = fs::get_job(e.id, &mut self.write_jobs) { + if let Some(_job) = fs::get_job(e.id, &mut self.write_jobs) { fs::remove_job(e.id, &mut self.write_jobs); } self.handle_job_status(e.id, e.file_num, Some(e.error)); diff --git a/src/server/video_service.rs b/src/server/video_service.rs index 686e28f35..6d1235ed8 100644 --- a/src/server/video_service.rs +++ b/src/server/video_service.rs @@ -21,8 +21,9 @@ use super::{video_qos::VideoQoS, *}; #[cfg(windows)] use crate::portable_service::client::PORTABLE_SERVICE_RUNNING; +#[cfg(windows)] +use hbb_common::get_version_number; use hbb_common::{ - get_version_number, tokio::sync::{ mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}, Mutex as TokioMutex,