mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-07-29 20:28:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: install libmonado crate from crates.io
Some checks are pending
/ cargo-fmtcheck (push) Waiting to run
Details
/ cargo-clippy (push) Waiting to run
Details
/ cargo-test (push) Waiting to run
Details
/ appimage (push) Waiting to run
Details

Browse source
This commit is contained in:
Jonathan Steffan 2024-10-12 16:23:08 +00:00 • committed by GabMus
commit f25fd08c66
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -324,7 +324,7 @@ dependencies = [
"gtk4", "gtk4",
"lazy_static", "lazy_static",
"libadwaita", "libadwaita",
"libmonado-rs", "libmonado",
"nix", "nix",
"openxr", "openxr",
"relm4", "relm4",
@ -1155,9 +1155,10 @@ dependencies = [
] ]
[[package]] [[package]]
name = "libmonado-rs" name = "libmonado"
version = "0.1.0" version = "1.3.0"
source = "git+https://github.com/technobaboo/libmonado-rs?rev=6edb1163627d87db9904c57d7ed9dd4dcc7228b7#6edb1163627d87db9904c57d7ed9dd4dcc7228b7" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3978b97bed5d012afccb11af3bcc5ccff35f313ed978116d3dd6ec3eae4d810b"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cmake", "cmake",

2
Cargo.toml
View file

@ -12,7 +12,7 @@ git2 = "0.19.0"
gtk = { package = "gtk4", version = "0.9.0", features = ["v4_10"] } gtk = { package = "gtk4", version = "0.9.0", features = ["v4_10"] }
lazy_static = "1.5.0" lazy_static = "1.5.0"
adw = { package = "libadwaita", version = "0.7.0", features = ["v1_5"] } adw = { package = "libadwaita", version = "0.7.0", features = ["v1_5"] }
libmonado-rs = { git = "https://github.com/technobaboo/libmonado-rs", rev = "6edb1163627d87db9904c57d7ed9dd4dcc7228b7" } libmonado = "1.3.0"
rusb = "0.9.4" rusb = "0.9.4"
nix = { version = "0.29.0", features = ["fs", "signal"] } nix = { version = "0.29.0", features = ["fs", "signal"] }
relm4 = { version = "0.9.0", features = ["libadwaita"] } relm4 = { version = "0.9.0", features = ["libadwaita"] }

4
src/ui/app.rs
View file

@ -79,7 +79,7 @@ pub struct App {
build_worker: Option<JobWorker>, build_worker: Option<JobWorker>,
profiles: Vec<Profile>, profiles: Vec<Profile>,
xr_devices: Vec<XRDevice>, xr_devices: Vec<XRDevice>,
libmonado: Option<libmonado_rs::Monado>, libmonado: Option<libmonado::Monado>,
wivrn_conf_editor: Option<Controller<WivrnConfEditor>>, wivrn_conf_editor: Option<Controller<WivrnConfEditor>>,
skip_depcheck: bool, skip_depcheck: bool,
@ -375,7 +375,7 @@ impl AsyncComponent for App {
.sender() .sender()
.emit(MainViewMsg::UpdateDevices(self.xr_devices.clone())); .emit(MainViewMsg::UpdateDevices(self.xr_devices.clone()));
} else if let Some(so) = self.get_selected_profile().libmonado_so() { } else if let Some(so) = self.get_selected_profile().libmonado_so() {
self.libmonado = libmonado_rs::Monado::create(so).ok(); self.libmonado = libmonado::Monado::create(so).ok();
if self.libmonado.is_some() { if self.libmonado.is_some() {
sender.input(Msg::ClockTicking); sender.input(Msg::ClockTicking);
} }

2
src/ui/battery_status.rs
View file

@ -1,4 +1,4 @@
use libmonado_rs::BatteryStatus; use libmonado::BatteryStatus;
use std::fmt::Display; use std::fmt::Display;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]

6
src/xr_devices.rs
View file

@ -1,4 +1,4 @@
use libmonado_rs::{self, BatteryStatus, DeviceRole}; use libmonado::{self, BatteryStatus, DeviceRole};
use std::{collections::HashMap, fmt::Display, slice::Iter}; use std::{collections::HashMap, fmt::Display, slice::Iter};
#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)] #[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
@ -241,7 +241,7 @@ pub struct XRDevice {
} }
impl XRDevice { impl XRDevice {
pub fn from_libmonado(monado: &libmonado_rs::Monado) -> Vec<Self> { pub fn from_libmonado(monado: &libmonado::Monado) -> Vec<Self> {
if let Ok(monado_devs) = monado.devices() { if let Ok(monado_devs) = monado.devices() {
let mut devs: HashMap<u32, XRDevice> = monado_devs let mut devs: HashMap<u32, XRDevice> = monado_devs
.into_iter() .into_iter()
@ -249,7 +249,7 @@ impl XRDevice {
( (
dev.index, dev.index,
Self { Self {
id: dev.id, id: dev.name_id,
index: dev.index, index: dev.index,
serial: dev.serial().ok(), serial: dev.serial().ok(),
battery: dev.battery_status().ok().and_then(|bs| { battery: dev.battery_status().ok().and_then(|bs| {