rustdesk/qemu-display
1
0
Fork 0
mirror of https://github.com/rustdesk/qemu-display.git synced 2025-07-01 15:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

qd: rename Introspect->Display

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2021-08-16 00:20:54 +04:00
parent 848cd7af0a
commit 458d9887d5
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemu-display/src/introspect.rs → qemu-display/src/display.rs
View File

@ -6,12 +6,12 @@ use zvariant::OwnedObjectPath;
use crate::{Audio, Chardev, Result, UsbRedir}; use crate::{Audio, Chardev, Result, UsbRedir};
pub struct Introspect { pub struct Display {
conn: Connection, conn: Connection,
objects: ManagedObjects, objects: ManagedObjects,
} }
impl Introspect { impl Display {
pub async fn new(conn: &Connection) -> Result<Self> { pub async fn new(conn: &Connection) -> Result<Self> {
let objects = zbus::fdo::AsyncObjectManagerProxy::builder(&conn) let objects = zbus::fdo::AsyncObjectManagerProxy::builder(&conn)
.destination("org.qemu")? .destination("org.qemu")?

4
qemu-display/src/lib.rs
View File

@ -30,8 +30,8 @@ pub use keyboard::*;
mod mouse; mod mouse;
pub use mouse::*; pub use mouse::*;
mod introspect; mod display;
pub use introspect::*; pub use display::*;
mod usbredir; mod usbredir;
pub use usbredir::*; pub use usbredir::*;

12
qemu-rdw/src/main.rs
View File

@ -2,7 +2,7 @@ use gio::ApplicationFlags;
use glib::{clone, MainContext}; use glib::{clone, MainContext};
use gtk::{gio, glib, prelude::*}; use gtk::{gio, glib, prelude::*};
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
use qemu_display::{Chardev, Console, Introspect}; use qemu_display::{Chardev, Console, Display};
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::os::unix::net::UnixStream; use std::os::unix::net::UnixStream;
use zbus::Connection; use zbus::Connection;
@ -33,13 +33,15 @@ fn main() {
let audio_clone = audio.clone(); let audio_clone = audio.clone();
let clipboard_clone = clipboard.clone(); let clipboard_clone = clipboard.clone();
MainContext::default().spawn_local(clone!(@strong window => async move { MainContext::default().spawn_local(clone!(@strong window => async move {
let intro = Introspect::new(&conn).await.unwrap(); let display = Display::new(&conn).await.unwrap();
let console = Console::new(&conn, 0).await.expect("Failed to get the QEMU console"); let console = Console::new(&conn, 0).await.expect("Failed to get the QEMU console");
let display = display_qemu::DisplayQemu::new(console); let rdw = display_qemu::DisplayQemu::new(console);
window.set_child(Some(&display)); window.set_child(Some(&rdw));
if let Ok(Some(audio)) = intro.audio().await { let usbredir = display.usbredir().await;
if let Ok(Some(audio)) = display.audio().await {
match audio::Handler::new(audio).await { match audio::Handler::new(audio).await {
Ok(handler) => audio_clone.set(handler).unwrap(), Ok(handler) => audio_clone.set(handler).unwrap(),
Err(e) => log::warn!("Failed to setup audio: {}", e), Err(e) => log::warn!("Failed to setup audio: {}", e),