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

crates/tek_tui/src/tui_arranger.rs

@@ -290,6 +290,26 @@ impl HasTracks<ArrangerTrack> for ArrangerView<Tui> {
     fn tracks_mut (&mut self) -> &mut Vec<ArrangerTrack> {
         &mut self.tracks
     }
+    fn track_add (&mut self, name: Option<&str>, color: Option<ItemColor>)
+        -> Usually<&mut ArrangerTrack>
+    {
+        let name = name.map_or_else(||self.track_default_name(), |x|x.to_string());
+        let track = ArrangerTrack {
+            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()),
+        };
+        self.tracks_mut().push(track);
+        let index = self.tracks().len() - 1;
+        Ok(&mut self.tracks_mut()[index])
+    }
+    fn track_del (&mut self, index: usize) {
+        self.tracks_mut().remove(index);
+        for scene in self.scenes_mut().iter_mut() {
+            scene.clips.remove(index);
+        }
+    }
 }
 
 impl HasScenes<ArrangerScene> for ArrangerView<Tui> {
@@ -299,6 +319,19 @@ impl HasScenes<ArrangerScene> for ArrangerView<Tui> {
     fn scenes_mut (&mut self) -> &mut Vec<ArrangerScene> {
         &mut self.scenes
     }
+    fn scene_add (&mut self, name: Option<&str>, color: Option<ItemColor>)
+        -> Usually<&mut ArrangerScene>
+    {
+        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])
+    }
 }
 
 /// Display mode of arranger

crates/tek_tui/src/tui_sequencer.rs

@@ -213,3 +213,27 @@ impl FocusGrid for SequencerApp<Tui> {
         // TODO
     }
 }
+
+impl HasJack for SequencerView {
+    fn jack (&self) -> &Arc<RwLock<JackClient>> {
+        self.transport.jack()
+    }
+}
+
+impl HasPhrases for SequencerView {
+    fn phrases (&self) -> &Vec<Arc<RwLock<Phrase>>> {
+        &self.phrases
+    }
+    fn phrases_mut (&mut self) -> &mut Vec<Arc<RwLock<Phrase>>> {
+        &mut self.phrases
+    }
+}
+
+impl HasPlayer for SequencerView {
+    fn player (&self) -> &MIDIPlayer {
+        &self.player
+    }
+    fn player_mut (&mut self) -> &mut MIDIPlayer {
+        &mut self.player
+    }
+}

crates/tek_tui/src/tui_transport.rs

@@ -4,11 +4,14 @@ use crate::*;
 impl TryFrom<&Arc<RwLock<JackClient>>> for TransportApp<Tui> {
     type Error = Box<dyn std::error::Error>;
     fn try_from (jack: &Arc<RwLock<JackClient>>) -> Usually<Self> {
-        Ok(Self::new(TransportModel {
+        Ok(Self::new(TransportView {
             metronome: false,
             transport: jack.read().unwrap().transport(),
             jack:      jack.clone(),
             clock:     Arc::new(Clock::from(Instant::default()))
+            focused:   false,
+            focus:     TransportViewFocus::PlayPause,
+            size:      Measure::new(),
         }.into(), None, None))
     }
 }
@@ -121,18 +124,6 @@ impl Command<TransportApp<Tui>> for TransportCommand {
     }
 }
 
-impl<E: Engine> From<TransportModel> for TransportView<E> {
-    fn from (model: TransportModel) -> Self {
-        Self {
-            _engine: Default::default(),
-            focused: false,
-            focus:   TransportViewFocus::PlayPause,
-            size:    Measure::new(),
-            model
-        }
-    }
-}
-
 /// Stores and displays time-related info.
 #[derive(Debug)]
 pub struct TransportView<E: Engine> {
@@ -298,3 +289,26 @@ impl FocusGrid for TransportApp<Tui> {
         // TODO
     }
 }
+
+impl HasJack for TransportView {
+    fn jack (&self) -> &Arc<RwLock<JackClient>> {
+        &self.jack
+    }
+}
+
+impl HasClock for TransportView {
+    fn clock (&self) -> &Arc<Clock> {
+        &self.clock
+    }
+}
+
+impl std::fmt::Debug for TransportView {
+    fn fmt (&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), Error> {
+        f.debug_struct("transport")
+            .field("jack",      &self.jack)
+            .field("transport", &"(JACK transport)")
+            .field("clock",     &self.clock)
+            .field("metronome", &self.metronome)
+            .finish()
+    }
+}