chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a complete removal of diesel

Browse source
This commit is contained in:
Chris Cochrun 2024-09-25 12:52:44 -05:00
parent ee03777c10
commit 444df4eacc
9 changed files with 40 additions and 545 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/rust/service_item_model.rs
View file

@ -290,7 +290,6 @@ mod service_item_model {
}
}
use crate::obs::Obs;
use crate::service_item_model::service_item_model::QList_QString;
use cxx_qt::{CxxQtType, Threading};
use cxx_qt_lib::{
@ -359,7 +358,6 @@ impl Default for ServiceItem {
pub struct ServiceItemModelRust {
id: i32,
service_items: Vec<ServiceItem>,
obs: Option<Obs>,
count: i32,
save_progress: f32,
saved: bool,
@ -367,20 +365,9 @@ pub struct ServiceItemModelRust {
impl Default for ServiceItemModelRust {
fn default() -> Self {
let obs =
tokio::runtime::Runtime::new().unwrap().block_on(async {
match Obs::new().await {
Ok(o) => Some(o),
Err(e) => {
error!(e);
None
}
}
});
Self {
id: 0,
service_items: Vec::new(),
obs,
count: 0,
save_progress: 0.0,
saved: false,
@ -823,7 +810,6 @@ impl service_item_model::ServiceItemModel {
// println!("service_item is deactivating {:?}", i);
service_item.active = false;
}
let _obs = self.as_mut().obs.clone();
if let Some(service_item) = self
.as_mut()
@ -837,14 +823,6 @@ impl service_item_model::ServiceItemModel {
background_type = ?service_item.background_type,
kind = ?service_item.ty);
service_item.active = true;
// if let Some(obs) = obs {
// match obs
// .set_scene(service_item.obs_scene.to_string())
// {
// Ok(()) => debug!("Successfully set scene"),
// Err(e) => error!(e),
// }
// }
self.as_mut().data_changed(tl, br, &vector_roles);
// We use this signal generated by our signals enum to tell QML that
// the active service_item has changed which is used to reposition views.