unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-09 05:06:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: refactor pt.35 (16e) even more traits, even fewer structs

Browse source
This commit is contained in:
🪞👃🪞 2024-11-15 02:01:09 +01:00
parent beca1a6ade
commit 7af5bbd02b
12 changed files with 121 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/tek_api/src/api_scene.rs
View file

@ -3,26 +3,13 @@ use crate::*;
pub trait HasScenes<S: ArrangerSceneApi> {
fn scenes (&self) -> &Vec<S>;
fn scenes_mut (&mut self) -> &mut Vec<S>;
fn scene_default_name (&self) -> String {
format!("Scene {}", self.scenes().len() + 1)
}
fn scene_add (&mut self, name: Option<&str>, color: Option<ItemColor>)
-> Usually<&mut S>
{
let name = name.map_or_else(||self.scene_default_name(), |x|x.to_string());
let scene = ArrangerScene {
name: Arc::new(name.into()),
clips: vec![None;self.tracks().len()],
color: color.unwrap_or_else(||ItemColor::random()),
};
self.scenes_mut().push(scene);
let index = self.scenes().len() - 1;
Ok(&mut self.scenes_mut()[index])
}
fn scene_add (&mut self, name: Option<&str>, color: Option<ItemColor>) -> Usually<&mut S>;
fn scene_del (&mut self, index: usize) {
self.scenes_mut().remove(index);
}
fn scene_default_name (&self) -> String {
format!("Scene {}", self.scenes().len() + 1)
}
}
#[derive(Clone, Debug)]
@ -47,9 +34,9 @@ pub enum ArrangerSceneCommand {
//}
pub trait ArrangerSceneApi: Sized {
fn name () -> Arc<RwLock<String>>;
fn clips () -> Vec<Option<Arc<RwLock<Phrase>>>>;
fn color () -> ItemColor;
fn name (&self) -> Arc<RwLock<String>>;
fn clips (&self) -> &Vec<Option<Arc<RwLock<Phrase>>>>;
fn color (&self) -> ItemColor;
fn ppqs (scenes: &[Self], factor: usize) -> Vec<(usize, usize)> {
let mut total = 0;
@ -80,7 +67,7 @@ pub trait ArrangerSceneApi: Sized {
/// Returns true if all phrases in the scene are
/// currently playing on the given collection of tracks.
fn is_playing (&self, tracks: &[ArrangerTrack]) -> bool {
self.clips().iter().any(|clip|clip.is_some()) && self.clips.iter().enumerate()
self.clips().iter().any(|clip|clip.is_some()) && self.clips().iter().enumerate()
.all(|(track_index, clip)|match clip {
Some(clip) => tracks
.get(track_index)