wip: refactor pt.13: 146 errors

crates/tek_api/src/arrange.rs

@@ -42,9 +42,66 @@ impl Arrangement {
     pub fn is_stopped (&self) -> bool {
         *self.clock.playing.read().unwrap() == Some(TransportState::Stopped)
     }
+    pub fn track_default_name (&self) -> String {
+        format!("Track {}", self.tracks.len() + 1)
+    }
+    pub fn scene_default_name (&self) -> String {
+        format!("Scene {}", self.scenes.len() + 1)
+    }
+    pub fn track_add (
+        &mut self, name: Option<&str>, color: Option<ItemColor>
+    ) -> Usually<&mut ArrangementTrack> {
+        let name = name.map_or_else(||self.track_default_name(), |x|x.to_string());
+        self.tracks.push(ArrangementTrack {
+            width:  name.len() + 2,
+            color:  color.unwrap_or_else(||ItemColor::random()),
+            player: MIDIPlayer::new(&self.jack, &self.clock, name.as_str())?,
+            name:   Arc::new(name.into()),
+        });
+        let index = self.tracks.len() - 1;
+        Ok(&mut self.tracks[index])
+    }
+    pub fn scene_add (
+        &mut self, name: Option<&str>, color: Option<ItemColor>
+    ) -> Usually<&mut ArrangementScene> {
+        let name = name.map_or_else(||self.scene_default_name(), |x|x.to_string());
+        self.scenes.push(ArrangementScene {
+            name:  Arc::new(name.into()),
+            clips: vec![None;self.tracks.len()],
+            color: color.unwrap_or_else(||ItemColor::random()),
+        });
+        let index = self.scenes.len() - 1;
+        Ok(&mut self.scenes[index])
+    }
+    pub fn track_del (&mut self, index: usize) {
+        self.tracks.remove(index);
+        for scene in self.scenes.iter_mut() {
+            scene.clips.remove(index);
+        }
+    }
+    pub fn scene_del (&mut self, index: usize) {
+        self.scenes.remove(index);
+    }
 }
 
 impl ArrangementScene {
+    pub fn ppqs (scenes: &[Self], factor: usize) -> Vec<(usize, usize)> {
+        let mut total = 0;
+        if factor == 0 {
+            scenes.iter().map(|scene|{
+                let pulses = scene.pulses().max(PPQ);
+                total = total + pulses;
+                (pulses, total - pulses)
+            }).collect()
+        } else {
+            (0..=scenes.len()).map(|i|{
+                (factor*PPQ, factor*PPQ*i)
+            }).collect()
+        }
+    }
+    pub fn longest_name (scenes: &[Self]) -> usize {
+        scenes.iter().map(|s|s.name.read().unwrap().len()).fold(0, usize::max)
+    }
     /// Returns the pulse length of the longest phrase in the scene
     pub fn pulses (&self) -> usize {
         self.clips.iter().fold(0, |a, p|{
@@ -100,23 +157,6 @@ impl ArrangementScene {
             //clips,
         //})
     //}
-    pub fn ppqs (scenes: &[Self], factor: usize) -> Vec<(usize, usize)> {
-        let mut total = 0;
-        if factor == 0 {
-            scenes.iter().map(|scene|{
-                let pulses = scene.pulses().max(PPQ);
-                total = total + pulses;
-                (pulses, total - pulses)
-            }).collect()
-        } else {
-            (0..=scenes.len()).map(|i|{
-                (factor*PPQ, factor*PPQ*i)
-            }).collect()
-        }
-    }
-    pub fn longest_name (scenes: &[Self]) -> usize {
-        scenes.iter().map(|s|s.name.read().unwrap().len()).fold(0, usize::max)
-    }
 }
 
 impl ArrangementTrack {