Merge pull request #6270 from dignow/fix/android_rotation

fix, android rotate screen
This commit is contained in:
RustDesk 2023-11-03 10:34:54 +08:00 committed by GitHub
commit 11232c6f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions

View File

@ -4,8 +4,10 @@ use std::{
sync::{Arc, Mutex, RwLock},
};
#[cfg(any(target_os = "windows", feature = "unix-file-copy-paste",))]
use hbb_common::{allow_err, log};
use hbb_common::{
allow_err, lazy_static, log,
lazy_static,
tokio::sync::{
mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
Mutex as TokioMutex,

View File

@ -10,11 +10,11 @@ use std::{
ffi::{CStr, CString},
result::Result,
};
use crate::{
allow_err, log, send_data, ClipboardFile, CliprdrError, CliprdrServiceContext, ResultType,
allow_err, send_data, ClipboardFile, CliprdrError, CliprdrServiceContext, ResultType,
ERR_CODE_INVALID_PARAMETER, ERR_CODE_SERVER_FUNCTION_NONE, VEC_MSG_CHANNEL,
};
use hbb_common::log;
// only used error code will be recorded here
/// success

View File

@ -95,7 +95,7 @@ pub fn new() -> ServerPtr {
id_count: hbb_common::rand::random::<i32>() % 1000 + 1000, // ensure positive
};
server.add_service(Box::new(audio_service::new()));
#[cfg(not(any(target_os = "android", target_os = "ios")))]
#[cfg(not(target_os = "ios"))]
server.add_service(Box::new(display_service::new()));
server.add_service(Box::new(video_service::new(
*display_service::PRIMARY_DISPLAY_IDX,

View File

@ -12,6 +12,7 @@ use scrap::Display;
pub const NAME: &'static str = "display";
#[cfg(all(windows, feature = "virtual_display_driver"))]
const DUMMY_DISPLAY_SIDE_MAX_SIZE: usize = 1024;
struct ChangedResolution {