wip: refactor pt.9, 403 errors

crates/tek_api/src/arrange.rs

@@ -1,5 +1,6 @@
 use crate::*;
 
+#[derive(Debug)]
 pub struct Arrangement {
     /// JACK client handle (needs to not be dropped for standalone mode to work).
     pub jack:    Arc<RwLock<JackClient>>,
@@ -12,9 +13,10 @@ pub struct Arrangement {
     /// Collection of tracks.
     pub tracks:  Vec<ArrangementTrack>,
     /// Collection of scenes.
-    pub scenes:  Vec<Scene>,
+    pub scenes:  Vec<ArrangementScene>,
 }
 
+#[derive(Debug)]
 pub struct ArrangementTrack {
     /// Name of track
     pub name:   Arc<RwLock<String>>,
@@ -26,57 +28,93 @@ pub struct ArrangementTrack {
     pub player: MIDIPlayer
 }
 
+#[derive(Default, Debug, Clone)]
+pub struct ArrangementScene {
+    /// Name of scene
+    pub name:  Arc<RwLock<String>>,
+    /// Clips in scene, one per track
+    pub clips: Vec<Option<Arc<RwLock<Phrase>>>>,
+    /// Identifying color of scene
+    pub color: ItemColor,
+}
+
 impl Audio for Arrangement {
-    fn process (&mut self, client: &Client, scope: &ProcessScope) -> Control {
+    #[inline] fn process (&mut self, client: &Client, scope: &ProcessScope) -> Control {
         for track in self.tracks.iter_mut() {
-            track.player.process(client, scope);
+            if track.process(client, scope) == Control::Quit {
+                return Control::Quit
+            }
         }
         Control::Continue
     }
 }
 
+impl Audio for ArrangementTrack {
+    #[inline] fn process (&mut self, client: &Client, scope: &ProcessScope) -> Control {
+        self.player.process(client, scope)
+    }
+}
+
 impl Arrangement {
-    fn is_stopped (&self) -> bool {
+    pub fn is_stopped (&self) -> bool {
         *self.clock.playing.read().unwrap() == Some(TransportState::Stopped)
     }
 }
 
-#[derive(Clone)]
-pub enum ArrangementCommand {
-    New,
-    Load,
-    Save,
-    ToggleViewMode,
-    Delete,
-    Activate,
-    Increment,
-    Decrement,
-    ZoomIn,
-    ZoomOut,
-    Go(Direction),
-    Edit(Option<Arc<RwLock<Phrase>>>),
-    Scene(SceneCommand),
-    Track(ArrangementTrackCommand),
-    Clip(ArrangementClipCommand),
-}
+impl ArrangementScene {
+    /// Returns the pulse length of the longest phrase in the scene
+    pub fn pulses (&self) -> usize {
+        self.clips.iter().fold(0, |a, p|{
+            a.max(p.as_ref().map(|q|q.read().unwrap().length).unwrap_or(0))
+        })
+    }
 
-#[derive(Clone)]
-pub enum ArrangementTrackCommand {
-    Next,
-    Prev,
-    Add,
-    Delete,
-    MoveForward,
-    MoveBack,
-    RandomColor,
-    SetSize(usize),
-    SetZoom(usize),
-}
+    /// Returns true if all phrases in the scene are
+    /// currently playing on the given collection of tracks.
+    pub fn is_playing (&self, tracks: &[MIDIPlayer]) -> bool {
+        self.clips.iter().any(|clip|clip.is_some()) && self.clips.iter().enumerate()
+            .all(|(track_index, clip)|match clip {
+                Some(clip) => tracks
+                    .get(track_index)
+                    .map(|track|if let Some((_, Some(phrase))) = &track.phrase {
+                        *phrase.read().unwrap() == *clip.read().unwrap()
+                    } else {
+                        false
+                    })
+                    .unwrap_or(false),
+                None => true
+            })
+    }
 
-#[derive(Clone)]
-pub enum ArrangementClipCommand {
-    Get(usize, usize),
-    Put(usize, usize, Option<Arc<RwLock<Phrase>>>),
-    Edit(Option<Arc<RwLock<Phrase>>>),
-    SetLoop(bool),
+    pub fn clip (&self, index: usize) -> Option<&Arc<RwLock<Phrase>>> {
+        match self.clips.get(index) { Some(Some(clip)) => Some(clip), _ => None }
+    }
+
+    //TODO
+    //pub fn from_edn <'a, 'e> (args: &[Edn<'e>]) -> Usually<Self> {
+        //let mut name  = None;
+        //let mut clips = vec![];
+        //edn!(edn in args {
+            //Edn::Map(map) => {
+                //let key = map.get(&Edn::Key(":name"));
+                //if let Some(Edn::Str(n)) = key {
+                    //name = Some(*n);
+                //} else {
+                    //panic!("unexpected key in scene '{name:?}': {key:?}")
+                //}
+            //},
+            //Edn::Symbol("_") => {
+                //clips.push(None);
+            //},
+            //Edn::Int(i) => {
+                //clips.push(Some(*i as usize));
+            //},
+            //_ => panic!("unexpected in scene '{name:?}': {edn:?}")
+        //});
+        //Ok(ArrangementScene {
+            //name:  Arc::new(name.unwrap_or("").to_string().into()),
+            //color: ItemColor::random(),
+            //clips,
+        //})
+    //}
 }