refactor and cleanup (move impls)

src/model/phrase.rs

@@ -1,4 +1,4 @@
-use crate::core::*;
+use crate::{core::*, model::App};
 
 /// Define a MIDI phrase.
 #[macro_export] macro_rules! phrase {
@@ -89,3 +89,22 @@ impl Phrase {
         }
     }
 }
+
+impl App {
+    pub fn phrase (&self) -> Option<&Phrase> {
+        let (track_id, track) = self.track()?;
+        let (_, scene) = self.scene()?;
+        track.phrases.get((*scene.clips.get(track_id)?)?)
+    }
+    pub fn phrase_mut (&mut self) -> Option<&mut Phrase> {
+        let (track_id, _) = self.track()?;
+        let (_, scene) = self.scene()?;
+        let clip = (*scene.clips.get(track_id)?)?;
+        self.track_mut()?.1.phrases.get_mut(clip)
+    }
+    pub fn phrase_id (&self) -> Option<usize> {
+        let (track_id, _) = self.track()?;
+        let (_, scene) = self.scene()?;
+        *scene.clips.get(track_id)?
+    }
+}

src/model/scene.rs

@@ -1,3 +1,5 @@
+use crate::{core::*, model::App};
+
 pub struct Scene {
     pub name:  String,
     pub clips: Vec<Option<usize>>,
@@ -11,3 +13,37 @@ impl Scene {
         }
     }
 }
+
+impl App {
+    pub fn new_scene_name (&self) -> String {
+        format!("Scene {}", self.scenes.len() + 1)
+    }
+    pub fn add_scene (&mut self, name: Option<&str>) -> Usually<&mut Scene> {
+        let name = name.ok_or_else(||self.new_scene_name())?;
+        self.scenes.push(Scene::new(&name, vec![]));
+        self.scene_cursor = self.scenes.len();
+        Ok(&mut self.scenes[self.scene_cursor - 1])
+    }
+    pub fn add_scene_with_clips (
+        &mut self,
+        name: Option<&str>,
+        clips: &[Option<usize>]
+    ) -> Usually<&mut Scene> {
+        let name = name.ok_or_else(||self.new_scene_name())?;
+        self.scenes.push(Scene::new(&name, Vec::from(clips)));
+        self.scene_cursor = self.scenes.len();
+        Ok(&mut self.scenes[self.scene_cursor - 1])
+    }
+    pub fn scene (&self) -> Option<(usize, &Scene)> {
+        match self.scene_cursor { 0 => None, _ => {
+            let id = self.scene_cursor as usize - 1;
+            self.scenes.get(id).map(|t|(id, t))
+        } }
+    }
+    pub fn scene_mut (&mut self) -> Option<(usize, &mut Scene)> {
+        match self.scene_cursor { 0 => None, _ => {
+            let id = self.scene_cursor as usize - 1;
+            self.scenes.get_mut(id).map(|t|(id, t))
+        } }
+    }
+}

src/model/track.rs

@@ -239,3 +239,42 @@ impl Track {
         }
     }
 }
+
+impl App {
+    pub fn new_track_name (&self) -> String {
+        format!("Track {}", self.tracks.len() + 1)
+    }
+    pub fn add_track (
+        &mut self,
+        name: Option<&str>,
+    ) -> Usually<&mut Track> {
+        let name = name.ok_or_else(||self.new_track_name())?;
+        self.tracks.push(Track::new(&name, None, None)?);
+        self.track_cursor = self.tracks.len();
+        Ok(&mut self.tracks[self.track_cursor - 1])
+    }
+    pub fn add_track_with_cb (
+        &mut self,
+        name: Option<&str>,
+        init: impl FnOnce(&Client, &mut Track)->Usually<()>,
+    ) -> Usually<&mut Track> {
+        let name = name.ok_or_else(||self.new_track_name())?;
+        let mut track = Track::new(&name, None, None)?;
+        init(self.client(), &mut track)?;
+        self.tracks.push(track);
+        self.track_cursor = self.tracks.len();
+        Ok(&mut self.tracks[self.track_cursor - 1])
+    }
+    pub fn track (&self) -> Option<(usize, &Track)> {
+        match self.track_cursor { 0 => None, _ => {
+            let id = self.track_cursor as usize - 1;
+            self.tracks.get(id).map(|t|(id, t))
+        } }
+    }
+    pub fn track_mut (&mut self) -> Option<(usize, &mut Track)> {
+        match self.track_cursor { 0 => None, _ => {
+            let id = self.track_cursor as usize - 1;
+            self.tracks.get_mut(id).map(|t|(id, t))
+        } }
+    }
+}