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

fixing tweaks to obs initialization...

Browse source 
it isn't working just yet. I need to create a default implimentation
with obs working somehow...
This commit is contained in:
Chris Cochrun 2023-11-09 14:36:37 -06:00
parent 07b6663a35
commit 03f8dd9730
3 changed files with 54 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/rust/obs.rs
View file

@ -7,7 +7,7 @@ use tracing::debug;
pub struct Obs {
scenes: Scenes,
client: Client,
client: Option<Client>,
}
impl fmt::Debug for Obs {
@ -23,7 +23,16 @@ impl Clone for Obs {
fn clone(&self) -> Self {
Self {
scenes: self.scenes.clone(),
client: make_client(),
client: Some(make_client()),
}
}
}
impl Default for Obs {
fn default() -> Self {
Self {
scenes: Scenes::default(),
client: None,
}
}
}
@ -36,7 +45,7 @@ impl Obs {
debug!(?scene_list);
Ok(Self {
scenes: scene_list,
client,
client: Some(client),
})
}
@ -58,19 +67,24 @@ impl Obs {
self,
scene: String,
) -> Result<(), Box<dyn Error>> {
if let Some(scene) = self
.scenes
.scenes
.iter()
.filter(|x| x.name == scene)
.next()
{
self.client
.scenes()
.set_current_program_scene(scene.name.as_str());
Ok(())
if self.client.is_some() {
if let Some(scene) = self
.scenes
.scenes
.iter()
.filter(|x| x.name == scene)
.next()
{
self.client
.unwrap()
.scenes()
.set_current_program_scene(scene.name.as_str());
Ok(())
} else {
Err("Couldn't set the scene".to_owned())?
}
} else {
Err("Couldn't set the scene".to_owned())?
Err("There is no client".to_owned())?
}
}
}

37
src/rust/service_item_model.rs
View file

@ -84,25 +84,30 @@ mod service_item_model {
}
#[cxx_qt::qobject(base = "QAbstractListModel")]
#[derive(Debug)]
#[derive(Debug, Default)]
pub struct ServiceItemMod {
id: i32,
service_items: Vec<ServiceItm>,
obs: Obs,
// obs: Obs,
}
impl Default for ServiceItemMod {
fn default() -> Self {
let obs = tokio::runtime::Runtime::new()
.unwrap()
.block_on(async { Obs::new().await.ok().unwrap() });
Self {
id: 0,
service_items: Vec::new(),
obs,
}
}
}
// impl Default for ServiceItemMod {
// fn default() -> Self {
// let obs = tokio::runtime::Runtime::new()
// .unwrap()
// .block_on(async {
// match Obs::new().await {
// Ok(o) => o,
// Err(e) => error!(e),
// }
// });
// Self {
// id: 0,
// service_items: Vec::new(),
// obs,
// }
// }
// }
#[cxx_qt::qsignals(ServiceItemMod)]
pub enum Signals<'a> {
@ -600,7 +605,7 @@ mod service_item_model {
// println!("service_item is deactivating {:?}", i);
service_item.active = false;
}
let obs = self.as_mut().obs_mut().clone();
// let obs = self.as_mut().obs_mut().clone();
if let Some(service_item) = self
.as_mut()
@ -612,7 +617,7 @@ mod service_item_model {
background = ?service_item.background,
background_type = ?service_item.background_type);
service_item.active = true;
obs.set_scene(service_item.obs_scene.to_string());
// obs.set_scene(service_item.obs_scene.to_string());
self.as_mut().emit_data_changed(
tl,
br,