weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtual display: win10 trivial refactor

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2022-03-13 17:08:33 +08:00
parent 957eabcef0
commit 974c259a3d
3 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/server/video_service.rs
View File

@@ -32,6 +32,7 @@ use std::{
io::ErrorKind::WouldBlock,
time::{self, Duration, Instant},
};
#[cfg(windows)]
use virtual_display;
const WAIT_BASE: i32 = 17;
@@ -104,7 +105,7 @@ impl VideoFrameController {
}
Ok(Some((id, instant))) => {
if let Some(tm) = instant {
log::trace!("channel recv latency: {}", tm.elapsed().as_secs_f32());
log::trace!("Channel recv latency: {}", tm.elapsed().as_secs_f32());
}
fetched_conn_ids.insert(id);
@@ -150,13 +151,35 @@ impl Drop for VideoService {
}
}
pub fn new() -> VideoService {
let sp = VideoService(GenericService::new(NAME, true));
#[cfg(windows)]
if let Err(e) = virtual_display::create_device() {
log::error!("create device failed {}", e);
}
impl VideoService {
fn new() -> Self {
#[cfg(windows)]
if let Err(e) = virtual_display::create_device() {
log::error!("Create device failed {}", e);
}
#[cfg(windows)]
match Display::all() {
Ok(displays) => {
if displays.len() == 0 {
log::info!("Detect no displays, try create monitor");
if virtual_display::is_device_created() {
if let Err(e) = virtual_display::plug_in_monitor() {
log::error!("Plug in monitor failed {}", e);
}
}
}
}
Err(e) => {
log::error!("Get all displays failed {}", e)
}
}
VideoService(GenericService::new(NAME, true))
}
}
pub fn new() -> VideoService {
let sp = VideoService::new();
sp.0.run(run);
sp
}
@@ -484,7 +507,7 @@ fn get_current_display() -> ResultType<(usize, usize, Display)> {
#[cfg(windows)]
if virtual_display::is_device_created() {
if let Err(e) = virtual_display::plug_in_monitor() {
log::error!("plug in monitor failed {}", e);
log::error!("Plug in monitor failed {}", e);
}
}
bail!("No displays");