wip: refactor pt.5, no translate

crates/tek_tui/src/tui_sequencer.rs

@@ -7,7 +7,7 @@ pub type PhraseMessage = Vec<u8>;
 /// Collection of serialized MIDI messages
 pub type PhraseChunk = [Vec<PhraseMessage>];
 /// Root level object for standalone `tek_sequencer`
-pub struct Sequencer<E: Engine> {
+pub struct SequencerView<E: Engine> {
     /// JACK client handle (needs to not be dropped for standalone mode to work).
     pub jack:         Arc<RwLock<JackClient>>,
     /// Controls the JACK transport.
@@ -25,6 +25,18 @@ pub struct Sequencer<E: Engine> {
     /// Whether the currently focused item is entered
     pub entered:      bool,
 }
+pub struct PhrasePoolView<E: Engine> {
+    _engine:     PhantomData<E>,
+    state:       PhrasePool,
+    /// Scroll offset
+    pub scroll:  usize,
+    /// Mode switch
+    pub mode:    Option<PhrasePoolMode>,
+    /// Whether this widget is focused
+    pub focused: bool,
+    /// Whether this widget is entered
+    pub entered: bool,
+}
 /// Sections in the sequencer app that may be focused
 #[derive(Copy, Clone, PartialEq, Eq)] pub enum SequencerFocus {
     /// The transport (toolbar) is focused
@@ -47,28 +59,6 @@ pub enum PhrasePoolMode {
     /// Editing the length of a pattern
     Length(usize, usize, PhraseLengthFocus),
 }
-/// A MIDI sequence.
-#[derive(Debug, Clone)] pub struct Phrase {
-    pub uuid:        uuid::Uuid,
-    /// Name of phrase
-    pub name:        String,
-    /// Temporal resolution in pulses per quarter note
-    pub ppq:         usize,
-    /// Length of phrase in pulses
-    pub length:      usize,
-    /// Notes in phrase
-    pub notes:       PhraseData,
-    /// Whether to loop the phrase or play it once
-    pub loop_on:     bool,
-    /// Start of loop
-    pub loop_start:  usize,
-    /// Length of loop
-    pub loop_length: usize,
-    /// All notes are displayed with minimum length
-    pub percussive:  bool,
-    /// Identifying color of phrase
-    pub color:       ItemColorTriplet,
-}
 /// Contains state for viewing and editing a phrase
 pub struct PhraseEditor<E: Engine> {
     _engine:       PhantomData<E>,
@@ -154,14 +144,22 @@ pub struct PhraseLength<E: Engine> {
 /// Focus layout of sequencer app
 impl<E: Engine> FocusGrid for Sequencer<E> {
     type Item = SequencerFocus;
-    fn cursor (&self) -> (usize, usize) { self.focus_cursor }
-    fn cursor_mut (&mut self) -> &mut (usize, usize) { &mut self.focus_cursor }
+    fn cursor (&self) -> (usize, usize) {
+        self.focus_cursor
+    }
+    fn cursor_mut (&mut self) -> &mut (usize, usize) {
+        &mut self.focus_cursor
+    }
     fn layout (&self) -> &[&[SequencerFocus]] { &[
         &[SequencerFocus::Transport],
         &[SequencerFocus::PhrasePool, SequencerFocus::PhraseEditor],
     ] }
-    fn focus_enter (&mut self) { self.entered = true }
-    fn focus_exit (&mut self) { self.entered = false }
+    fn focus_enter (&mut self) {
+        self.entered = true
+    }
+    fn focus_exit (&mut self) {
+        self.entered = false
+    }
     fn entered (&self) -> Option<Self::Item> {
         if self.entered { Some(self.focused()) } else { None }
     }
@@ -874,36 +872,3 @@ pub(crate) fn keys_vert () -> Buffer {
     });
     buffer
 }
-impl Handle<Tui> for PhraseEditor<Tui> {
-    fn handle (&mut self, from: &TuiInput) -> Perhaps<bool> {
-        if let Some(command) = PhraseEditorCommand::input_to_command(self, from) {
-            let _undo = command.execute(self)?;
-            return Ok(Some(true))
-        }
-        Ok(None)
-    }
-}
-impl InputToCommand<Tui, PhraseEditor<Tui>> for PhraseEditorCommand {
-    fn input_to_command (_: &PhraseEditor<Tui>, from: &TuiInput) -> Option<Self> {
-        match from.event() {
-            key!(KeyCode::Char('`')) => Some(Self::ToggleDirection),
-            key!(KeyCode::Enter)     => Some(Self::EnterEditMode),
-            key!(KeyCode::Esc)       => Some(Self::ExitEditMode),
-            key!(KeyCode::Char('[')) => Some(Self::NoteLengthDec),
-            key!(KeyCode::Char(']')) => Some(Self::NoteLengthInc),
-            key!(KeyCode::Char('a')) => Some(Self::NoteAppend),
-            key!(KeyCode::Char('s')) => Some(Self::NoteSet),
-            key!(KeyCode::Char('-')) => Some(Self::TimeZoomOut),
-            key!(KeyCode::Char('_')) => Some(Self::TimeZoomOut),
-            key!(KeyCode::Char('=')) => Some(Self::TimeZoomIn),
-            key!(KeyCode::Char('+')) => Some(Self::TimeZoomIn),
-            key!(KeyCode::PageUp)    => Some(Self::NotePageUp),
-            key!(KeyCode::PageDown)  => Some(Self::NotePageDown),
-            key!(KeyCode::Up)        => Some(Self::GoUp),
-            key!(KeyCode::Down)      => Some(Self::GoDown),
-            key!(KeyCode::Left)      => Some(Self::GoLeft),
-            key!(KeyCode::Right)     => Some(Self::GoRight),
-            _ => None
-        }
-    }
-}