sequencer: merge Sequencer and SequencerTrack

This commit is contained in:
🪞👃🪞 2024-08-10 20:20:20 +03:00
parent 1d3d3875fe
commit 6206a43b4a
8 changed files with 171 additions and 190 deletions

View file

@ -1,6 +1,7 @@
use crate::*;
/// A collection of phrases to play on each track.
#[derive(Default)]
pub struct Scene {
pub name: String,
pub clips: Vec<Option<usize>>,
@ -13,14 +14,14 @@ impl Scene {
Self { name, clips, }
}
/// Returns the pulse length of the longest phrase in the scene
pub fn pulses (&self, tracks: &[SequencerTrack]) -> usize {
pub fn pulses (&self, tracks: &[Sequencer]) -> usize {
self.clips.iter().enumerate()
.filter_map(|(i, c)|c.map(|c|tracks[i].phrases.get(c)))
.filter_map(|p|p)
.fold(0, |a, p|a.max(p.read().unwrap().length))
}
/// Returns true if all phrases in the scene are currently playing
pub fn is_playing (&self, tracks: &[SequencerTrack]) -> bool {
pub fn is_playing (&self, tracks: &[Sequencer]) -> bool {
self.clips.iter().enumerate()
.all(|(track_index, phrase_index)|match phrase_index {
Some(i) => tracks[track_index].sequence == Some(*i),
@ -35,7 +36,7 @@ pub fn scene_name_max_len (scenes: &[Scene]) -> usize {
.fold(0, usize::max)
}
pub fn scene_ppqs (tracks: &[SequencerTrack], scenes: &[Scene]) -> Vec<(usize, usize)> {
pub fn scene_ppqs (tracks: &[Sequencer], scenes: &[Scene]) -> Vec<(usize, usize)> {
let mut total = 0;
let mut scenes: Vec<(usize, usize)> = scenes.iter().map(|scene|{
let pulses = scene.pulses(tracks);