wip: rebinding commands...

midi/src/midi_pool.rs

@@ -25,6 +25,54 @@ pub trait HasClips {
     }
 }
 
+#[derive(Debug)]
+pub struct PoolModel {
+    pub visible: bool,
+    /// Collection of clips
+    pub clips: Arc<RwLock<Vec<Arc<RwLock<MidiClip>>>>>,
+    /// Selected clip
+    pub clip: AtomicUsize,
+    /// Mode switch
+    pub mode: Option<PoolMode>,
+}
+impl Default for PoolModel {
+    fn default () -> Self {
+        Self {
+            visible: true,
+            clips:   Arc::from(RwLock::from(vec![])),
+            clip:    0.into(),
+            mode:    None,
+        }
+    }
+}
+from!(|clip:&Arc<RwLock<MidiClip>>|PoolModel = {
+    let model = Self::default();
+    model.clips.write().unwrap().push(clip.clone());
+    model.clip.store(1, Relaxed);
+    model
+});
+
+#[derive(Clone, PartialEq, Debug)]
+pub enum PoolCommand {
+    Show(bool),
+    /// Update the contents of the clip pool
+    Clip(MidiPoolCommand),
+    /// Select a clip from the clip pool
+    Select(usize),
+    /// Rename a clip
+    Rename(ClipRenameCommand),
+    /// Change the length of a clip
+    Length(ClipLengthCommand),
+    /// Import from file
+    Import(FileBrowserCommand),
+    /// Export to file
+    Export(FileBrowserCommand),
+}
+impl PoolCommand {
+    pub fn from_edn <'a> (head: &EdnItem<&str>, tail: &'a [EdnItem<String>]) -> Self {
+        todo!()
+    }
+}
 #[derive(Clone, Debug, PartialEq)]
 pub enum MidiPoolCommand {
     Add(usize, MidiClip),
@@ -42,6 +90,20 @@ impl MidiPoolCommand {
     }
 }
 
+/// Modes for clip pool
+#[derive(Debug, Clone)]
+pub enum PoolMode {
+    /// Renaming a pattern
+    Rename(usize, Arc<str>),
+    /// Editing the length of a pattern
+    Length(usize, usize, ClipLengthFocus),
+    /// Load clip from disk
+    Import(usize, FileBrowser),
+    /// Save clip to disk
+    Export(usize, FileBrowser),
+}
+
+
 impl<T: HasClips> Command<T> for MidiPoolCommand {
     fn execute (self, model: &mut T) -> Perhaps<Self> {
         use MidiPoolCommand::*;
@@ -108,38 +170,6 @@ impl<T: HasClips> Command<T> for MidiPoolCommand {
     }
 }
 
-#[derive(Debug)]
-pub struct PoolModel {
-    pub visible: bool,
-    /// Collection of clips
-    pub clips: Arc<RwLock<Vec<Arc<RwLock<MidiClip>>>>>,
-    /// Selected clip
-    pub clip: AtomicUsize,
-    /// Mode switch
-    pub mode: Option<PoolMode>,
-    /// Rendered size
-    size: Measure<TuiOut>,
-    /// Scroll offset
-    scroll: usize,
-}
-impl Default for PoolModel {
-    fn default () -> Self {
-        Self {
-            visible: true,
-            clips:   Arc::from(RwLock::from(vec![])),
-            clip:    0.into(),
-            scroll:  0,
-            mode:    None,
-            size:    Measure::new(),
-        }
-    }
-}
-from!(|clip:&Arc<RwLock<MidiClip>>|PoolModel = {
-    let mut model = Self::default();
-    model.clips.write().unwrap().push(clip.clone());
-    model.clip.store(1, Relaxed);
-    model
-});
 
 pub struct PoolView<'a>(pub bool, pub &'a PoolModel);
 render!(TuiOut: (self: PoolView<'a>) => {
@@ -167,41 +197,6 @@ render!(TuiOut: (self: PoolView<'a>) => {
     })))))
 });
 
-/// Modes for clip pool
-#[derive(Debug, Clone)]
-pub enum PoolMode {
-    /// Renaming a pattern
-    Rename(usize, Arc<str>),
-    /// Editing the length of a pattern
-    Length(usize, usize, ClipLengthFocus),
-    /// Load clip from disk
-    Import(usize, FileBrowser),
-    /// Save clip to disk
-    Export(usize, FileBrowser),
-}
-
-#[derive(Clone, PartialEq, Debug)]
-pub enum PoolCommand {
-    Show(bool),
-    /// Update the contents of the clip pool
-    Clip(MidiPoolCommand),
-    /// Select a clip from the clip pool
-    Select(usize),
-    /// Rename a clip
-    Rename(ClipRenameCommand),
-    /// Change the length of a clip
-    Length(ClipLengthCommand),
-    /// Import from file
-    Import(FileBrowserCommand),
-    /// Export to file
-    Export(FileBrowserCommand),
-}
-impl PoolCommand {
-    pub fn from_edn <'a> (head: &EdnItem<&str>, tail: &'a [EdnItem<String>]) -> Self {
-        todo!()
-    }
-}
-
 command!(|self:PoolCommand, state: PoolModel|{
     use PoolCommand::*;
     match self {