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

fix some misspellings

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2022-12-31 21:41:16 +08:00
parent 17225a25dd
commit b114ebf350
20 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/connection.rs
View File

@@ -400,7 +400,7 @@ impl Connection {
},
Some((instant, value)) = rx_video.recv() => {
if !conn.video_ack_required {
video_service::notify_video_frame_feched(id, Some(instant.into()));
video_service::notify_video_frame_fetched(id, Some(instant.into()));
}
if let Err(err) = conn.stream.send(&value as &Message).await {
conn.on_close(&err.to_string(), false).await;
@@ -499,7 +499,7 @@ impl Connection {
} else if video_privacy_conn_id == 0 {
let _ = privacy_mode::turn_off_privacy(0);
}
video_service::notify_video_frame_feched(id, None);
video_service::notify_video_frame_fetched(id, None);
scrap::codec::Encoder::update_video_encoder(id, scrap::codec::EncoderUpdate::Remove);
video_service::VIDEO_QOS.lock().unwrap().reset();
if conn.authorized {
@@ -1464,7 +1464,7 @@ impl Connection {
}
}
Some(misc::Union::VideoReceived(_)) => {
video_service::notify_video_frame_feched(
video_service::notify_video_frame_fetched(
self.inner.id,
Some(Instant::now().into()),
);

34
src/server/video_service.rs
View File

@@ -78,11 +78,11 @@ fn is_capturer_mag_supported() -> bool {
false
}
pub fn capture_cursor_embeded() -> bool {
scrap::is_cursor_embeded()
pub fn capture_cursor_embedded() -> bool {
scrap::is_cursor_embedded()
}
pub fn notify_video_frame_feched(conn_id: i32, frame_tm: Option<Instant>) {
pub fn notify_video_frame_fetched(conn_id: i32, frame_tm: Option<Instant>) {
FRAME_FETCHED_NOTIFIER.0.send((conn_id, frame_tm)).unwrap()
}
@@ -146,7 +146,7 @@ impl VideoFrameController {
fetched_conn_ids.insert(id);
}
Ok(None) => {
// this branch would nerver be reached
// this branch would never be reached
}
}
}
@@ -162,7 +162,7 @@ fn check_display_changed(
last_n: usize,
last_current: usize,
last_width: usize,
last_hegiht: usize,
last_height: usize,
) -> bool {
#[cfg(target_os = "linux")]
{
@@ -187,7 +187,7 @@ fn check_display_changed(
if i != last_current {
return true;
};
if d.width() != last_width || d.height() != last_hegiht {
if d.width() != last_width || d.height() != last_height {
return true;
};
}
@@ -249,7 +249,7 @@ fn create_capturer(
PRIVACY_WINDOW_NAME
);
}
log::debug!("Create maginifier capture for {}", privacy_mode_id);
log::debug!("Create magnifier capture for {}", privacy_mode_id);
c = Some(Box::new(c1));
}
Err(e) => {
@@ -385,10 +385,12 @@ fn get_capturer(use_yuv: bool, portable_service_running: bool) -> ResultType<Cap
captuerer_privacy_mode_id,
);
if privacy_mode_id != captuerer_privacy_mode_id {
log::info!("In privacy mode, but show UAC prompt window for now");
} else {
log::info!("In privacy mode, the peer side cannot watch the screen");
if privacy_mode_id != 0 {
if privacy_mode_id != captuerer_privacy_mode_id {
log::info!("In privacy mode, but show UAC prompt window for now");
} else {
log::info!("In privacy mode, the peer side cannot watch the screen");
}
}
let capturer = create_capturer(
captuerer_privacy_mode_id,
@@ -413,7 +415,7 @@ fn run(sp: GenericService) -> ResultType<()> {
#[cfg(windows)]
ensure_close_virtual_device()?;
// ensure_inited() is needed because release_resouce() may be called.
// ensure_inited() is needed because release_resource() may be called.
#[cfg(target_os = "linux")]
super::wayland::ensure_inited()?;
#[cfg(windows)]
@@ -464,7 +466,7 @@ fn run(sp: GenericService) -> ResultType<()> {
y: c.origin.1 as _,
width: c.width as _,
height: c.height as _,
cursor_embeded: capture_cursor_embeded(),
cursor_embedded: capture_cursor_embedded(),
..Default::default()
});
let mut msg_out = Message::new();
@@ -599,7 +601,7 @@ fn run(sp: GenericService) -> ResultType<()> {
would_block_count += 1;
if !scrap::is_x11() {
if would_block_count >= 100 {
super::wayland::release_resouce();
super::wayland::release_resource();
bail!("Wayland capturer none 100 times, try restart captuere");
}
}
@@ -653,7 +655,7 @@ fn run(sp: GenericService) -> ResultType<()> {
#[cfg(target_os = "linux")]
if !scrap::is_x11() {
super::wayland::release_resouce();
super::wayland::release_resource();
}
Ok(())
@@ -821,7 +823,7 @@ pub(super) fn get_displays_2(all: &Vec<Display>) -> (usize, Vec<DisplayInfo>) {
height: d.height() as _,
name: d.name(),
online: d.is_online(),
cursor_embeded: false,
cursor_embedded: false,
..Default::default()
});
}

2
src/server/wayland.rs
View File

@@ -129,7 +129,7 @@ pub(super) async fn check_init() -> ResultType<()> {
let num = all.len();
let (primary, mut displays) = super::video_service::get_displays_2(&all);
for display in displays.iter_mut() {
display.cursor_embeded = true;
display.cursor_embedded = true;
}
let mut rects: Vec<((i32, i32), usize, usize)> = Vec::new();