From bc9bac8c40bd17a9bf2ab36fe106256fde8005ca Mon Sep 17 00:00:00 2001 From: Aleksander Date: Thu, 17 Oct 2024 22:53:17 +0200 Subject: [PATCH] Fix compilation issues with uidev target or without wayland target --- src/backend/uidev/mod.rs | 8 ++++---- src/overlays/screen.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/uidev/mod.rs b/src/backend/uidev/mod.rs index d4eda35..b0d4574 100644 --- a/src/backend/uidev/mod.rs +++ b/src/backend/uidev/mod.rs @@ -30,7 +30,7 @@ use crate::{ use super::{ input::{TrackedDevice, TrackedDeviceRole}, - overlay::OverlayRenderer, + overlay::{OverlayID, OverlayRenderer}, }; static LAST_SIZE: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0); @@ -301,17 +301,17 @@ fn add_dummy_devices(app: &mut AppState) { fn add_dummy_screens(app: &mut AppState) { app.screens.push(ScreenMeta { name: "HDMI-A-1".into(), - id: 0, + id: OverlayID(0), native_handle: 0, }); app.screens.push(ScreenMeta { name: "DP-2".into(), - id: 0, + id: OverlayID(0), native_handle: 0, }); app.screens.push(ScreenMeta { name: "DP-3".into(), - id: 0, + id: OverlayID(0), native_handle: 0, }); } diff --git a/src/overlays/screen.rs b/src/overlays/screen.rs index 8dc0336..b6f48ff 100644 --- a/src/overlays/screen.rs +++ b/src/overlays/screen.rs @@ -18,7 +18,6 @@ use wlx_capture::{ DrmFormat, FrameFormat, MouseMeta, WlxFrame, DRM_FORMAT_ABGR2101010, DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888, DRM_FORMAT_XBGR2101010, DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888, }, - pipewire::PipewireSelectScreenResult, WlxCapture, }; @@ -28,6 +27,7 @@ use { std::error::Error, std::{ops::Deref, path::PathBuf, task}, wlx_capture::pipewire::PipewireCapture, + wlx_capture::pipewire::PipewireSelectScreenResult, }; #[cfg(all(feature = "x11", feature = "pipewire"))]