fix menu and help bindings

config/config_groovebox.edn

@@ -3,15 +3,16 @@
 (info "A sequencer with built-in sampler.")
 
 (view
-  (bsp/a                                 :view-dialog
+  (bsp/a                                   :view-dialog
-    (bsp/s (fixed/y       1              :view-transport)
+    (bsp/s (fixed/y       1                :view-transport)
-      (bsp/n (fixed/y     1              :view-status)
+      (bsp/n (fixed/y     1                :view-status)
-        (bsp/w                           :view-meters-output
+        (bsp/w                             :view-meters-output
-          (bsp/e                         :view-meters-input
+          (bsp/e                           :view-meters-input
-            (bsp/n (fixed/y   5          :view-sample-viewer)
+            (bsp/n                         :view-sample-info
-              (bsp/w (fixed/x :w-sidebar :view-pool)
+              (bsp/n (fixed/y   5          :view-sample-viewer)
-                (bsp/e                   :view-samples-keys
+                (bsp/w (fixed/x :w-sidebar :view-pool)
-                  (fill/y                :view-editor))))))))))
+                  (bsp/e                   :view-samples-keys
+                    (fill/y                :view-editor)))))))))))
 
 (keys
   (layer-if :focus-pool-import "./keys_pool_file.edn")

config/keys_editor.edn

@@ -1,25 +1,24 @@
-(@up          editor note-pos   :note-pos-next)
+(@left        editor set-time-pos :time-pos-prev)
-(@down        editor note-pos   :note-pos-prev)
+(@right       editor set-time-pos :time-pos-next)
-(@pgup        editor note-pos   :note-pos-next-octave)
-(@pgdn        editor note-pos   :note-pos-prev-octave)
 
-(@comma       editor note-len   :note-len-prev)
+(@equal       editor set-time-zoom :time-zoom-prev)
-(@period      editor note-len   :note-len-next)
+(@minus       editor set-time-zoom :time-zoom-next)
-(@lt          editor note-len   :note-len-prev)
+(@plus        editor set-time-zoom :time-zoom-next-fine)
-(@gt          editor note-len   :note-len-next)
+(@underscore  editor set-time-zoom :time-zoom-prev-fine)
 
-(@plus        editor note-range :note-range-next)
+(@z           editor set-time-lock)
-(@underscore  editor note-range :note-range-prev)
 
-(@left        editor time-pos   :time-pos-prev)
+(@up          editor set-note-pos :note-pos-next)
-(@right       editor time-pos   :time-pos-next)
+(@down        editor set-note-pos :note-pos-prev)
+(@pgup        editor set-note-pos :note-pos-next-octave)
+(@pgdn        editor set-note-pos :note-pos-prev-octave)
 
-(@equal       editor time-zoom  :time-zoom-prev)
+(@comma       editor set-note-len :note-len-prev)
-(@minus       editor time-zoom  :time-zoom-next)
+(@period      editor set-note-len :note-len-next)
+(@lt          editor set-note-len :note-len-prev)
+(@gt          editor set-note-len :note-len-next)
 
-(@z           editor time-lock)
+(@a           editor append-note :true)
-
+(@enter       editor append-note :false)
-(@enter       editor note-put)
+(@del         editor delete-note)
-(@shift-enter editor note-append)
+(@shift-del   editor delete-note)
-(@del         editor note-del)
-(@shift-del   editor note-del)

config/keys_global.edn

@@ -1,5 +1,5 @@
-(@esc menu)
+(@esc toggle-menu)
-(@f1  help)
+(@f1  toggle-help)
 
 (@u       undo 1)
 (@shift-u redo 1)

crates/app/src/api.rs

@@ -203,11 +203,11 @@ handle!(TuiIn: |self: App, input|Ok(if let Some(command) = self.config.keys.comm
 }
 
 #[tengri_proc::command(App)] impl AppCommand {
-    fn toggle_help (app: &mut App, value: bool) -> Perhaps<Self> {
+    fn toggle_help (app: &mut App) -> Perhaps<Self> {
         app.toggle_dialog(Some(Dialog::Help));
         Ok(None)
     }
-    fn toggle_menu (app: &mut App, value: bool) -> Perhaps<Self> {
+    fn toggle_menu (app: &mut App) -> Perhaps<Self> {
         app.toggle_dialog(Some(Dialog::Menu));
         Ok(None)
     }
@@ -280,7 +280,7 @@ handle!(TuiIn: |self: App, input|Ok(if let Some(command) = self.config.keys.comm
             // update linked sampler after editor action
             app.sampler_mut().map(|sampler|match command {
                 // autoselect: automatically select sample in sampler
-                MidiEditCommand::NotePos { pos } => { sampler.set_note_pos(pos); },
+                MidiEditCommand::SetNotePos { pos } => { sampler.set_note_pos(pos); },
                 _ => {}
             });
             undo

crates/app/src/view.rs

@@ -41,6 +41,15 @@ impl App {
     pub fn view_sample_viewer (&self) -> impl Content<TuiOut> + use<'_> {
         self.sampler().map(|s|s.view_sample(self.editor().unwrap().get_note_pos()))
     }
+    pub fn view_sample_info (&self) -> impl Content<TuiOut> + use<'_> {
+        self.sampler().map(|s|s.view_sample_info(self.editor().unwrap().get_note_pos()))
+    }
+    pub fn view_meters_input (&self) -> impl Content<TuiOut> + use<'_> {
+        self.sampler().map(|s|s.view_meters_input())
+    }
+    pub fn view_meters_output (&self) -> impl Content<TuiOut> + use<'_> {
+        self.sampler().map(|s|s.view_meters_output())
+    }
     pub fn view_dialog (&self) -> impl Content<TuiOut> + use<'_> {
         When::new(self.dialog.is_some(), Bsp::b(
             Fill::xy(Tui::fg_bg(Rgb(64,64,64), Rgb(32,32,32), "")),
@@ -56,12 +65,6 @@ impl App {
             )))
         ))
     }
-    pub fn view_meters_input (&self) -> impl Content<TuiOut> + use<'_> {
-        self.sampler().map(|s|s.view_meters_input())
-    }
-    pub fn view_meters_output (&self) -> impl Content<TuiOut> + use<'_> {
-        self.sampler().map(|s|s.view_meters_output())
-    }
 }
 
 impl App {

crates/cli/tek.rs

@@ -111,10 +111,10 @@ impl Cli {
                 _ => todo!("{mode:?}"),
             };
             let config = Configuration::new(&config_path, false)?;
+            let clock  = Clock::new(jack, self.bpm)?;
             let mut app = App {
                 jack:  jack.clone(),
                 color: ItemTheme::random(),
-                clock: Clock::new(jack, self.bpm)?,
                 pool: match mode {
                     LaunchMode::Sequencer | LaunchMode::Groovebox => clip.as_ref().map(Into::into),
                     LaunchMode::Arranger { .. } => Some(Default::default()),
@@ -141,7 +141,7 @@ impl Cli {
                             &name,
                             None,
                             jack,
-                            None,
+                            Some(&clock),
                             clip.as_ref(),
                             midi_froms.as_slice(),
                             midi_tos.as_slice()
@@ -152,7 +152,7 @@ impl Cli {
                             &name,
                             None,
                             jack,
-                            None,
+                            Some(&clock),
                             clip.as_ref(),
                             midi_froms.as_slice(),
                             midi_froms.as_slice(),
@@ -165,6 +165,7 @@ impl Cli {
                 scenes,
                 selected: Selection::TrackClip { track: 0, scene: 0 },
                 config,
+                clock,
                 ..Default::default()
             };
             if let &LaunchMode::Arranger { scenes, tracks, track_width, .. } = mode {

crates/device/src/editor/editor_api.rs

@@ -4,12 +4,6 @@ use crate::*;
     fn _todo_opt_clip_stub (&self) -> Option<Arc<RwLock<MidiClip>>> {
         todo!()
     }
-    fn time_lock (&self) -> bool {
-        self.get_time_lock()
-    }
-    fn time_lock_toggled (&self) -> bool {
-        !self.get_time_lock()
-    }
 
     fn note_length (&self) -> usize {
         self.get_note_len()
@@ -55,10 +49,10 @@ use crate::*;
         self.get_time_pos()
     }
     fn time_pos_next (&self) -> usize {
-        self.get_time_pos() + self.time_zoom()
+        self.get_time_pos() + self.get_note_len()
     }
     fn time_pos_prev (&self) -> usize {
-        self.get_time_pos().saturating_sub(self.time_zoom())
+        self.get_time_pos().saturating_sub(self.get_note_len())
     }
 
     fn time_zoom (&self) -> usize {
@@ -67,29 +61,37 @@ use crate::*;
     fn time_zoom_next (&self) -> usize {
         self.get_time_zoom() + 1
     }
+    fn time_zoom_next_fine (&self) -> usize {
+        self.get_time_zoom() + 1
+    }
     fn time_zoom_prev (&self) -> usize {
         self.get_time_zoom().saturating_sub(1).max(1)
     }
+    fn time_zoom_prev_fine (&self) -> usize {
+        self.get_time_zoom().saturating_sub(1).max(1)
+    }
+
+    fn time_lock (&self) -> bool {
+        self.get_time_lock()
+    }
+    fn time_lock_toggled (&self) -> bool {
+        !self.get_time_lock()
+    }
 }
 
 #[tengri_proc::command(MidiEditor)] impl MidiEditCommand {
-    // TODO: 1-9 seek markers that by default start every 8th of the clip
+    fn append_note (editor: &mut MidiEditor, advance: bool) -> Perhaps<Self> {
-    fn note_append (editor: &mut MidiEditor) -> Perhaps<Self> {
+        editor.put_note(advance);
-        editor.put_note(true);
         Ok(None)
     }
-    fn note_put (editor: &mut MidiEditor) -> Perhaps<Self> {
+    fn delete_note (_editor: &mut MidiEditor) -> Perhaps<Self> {
-        editor.put_note(false);
-        Ok(None)
-    }
-    fn note_del (_editor: &mut MidiEditor) -> Perhaps<Self> {
         todo!()
     }
-    fn note_pos (editor: &mut MidiEditor, pos: usize) -> Perhaps<Self> {
+    fn set_note_pos (editor: &mut MidiEditor, pos: usize) -> Perhaps<Self> {
         editor.set_note_pos(pos.min(127));
         Ok(None)
     }
-    fn note_len (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
+    fn set_note_len (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
         //let note_len = editor.get_note_len();
         //let time_zoom = editor.get_time_zoom();
         editor.set_note_len(value);
@@ -98,24 +100,24 @@ use crate::*;
         //}
         Ok(None)
     }
-    fn note_scroll (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
+    fn set_note_scroll (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
         editor.set_note_lo(value.min(127));
         Ok(None)
     }
-    fn time_pos (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
+    fn set_time_pos (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
         editor.set_time_pos(value);
         Ok(None)
     }
-    fn time_scroll (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
+    fn set_time_scroll (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
         editor.set_time_start(value);
         Ok(None)
     }
-    fn time_zoom (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
+    fn set_time_zoom (editor: &mut MidiEditor, value: usize) -> Perhaps<Self> {
         editor.set_time_zoom(value);
         editor.redraw();
         Ok(None)
     }
-    fn time_lock (editor: &mut MidiEditor, value: bool) -> Perhaps<Self> {
+    fn set_time_lock (editor: &mut MidiEditor, value: bool) -> Perhaps<Self> {
         editor.set_time_lock(value);
         Ok(None)
     }
@@ -123,4 +125,5 @@ use crate::*;
         editor.set_clip(clip.as_ref());
         Ok(None)
     }
+    // TODO: 1-9 seek markers that by default start every 8th of the clip
 }

crates/device/src/editor/editor_model.rs

@@ -61,7 +61,7 @@ impl MidiEditor {
                 clip.notes[note_end].push(note_off);
             }
             if advance {
-                self.set_time_pos(note_end);
+                self.set_time_pos(note_end + 1);
             }
             redraw = true;
         }

crates/device/src/sampler/sampler_model.rs

@@ -4,7 +4,7 @@ use crate::*;
 #[derive(Debug)]
 pub struct Sampler {
     /// Name of sampler.
-    pub name:          String,
+    pub name:          Arc<str>,
     /// Device color.
     pub color:         ItemTheme,
     /// Audio input ports. Samples get recorded here.
@@ -55,7 +55,7 @@ impl Default for Sampler {
             input_meters:   vec![0.0;2],
             output_meters:  vec![0.0;2],
             audio_outs:     vec![],
-            name:           "tek_sampler".to_string(),
+            name:           "tek_sampler".into(),
             mapped:         [const { None };128],
             unmapped:       vec![],
             voices:         Arc::new(RwLock::new(vec![])),

crates/device/src/sampler/sampler_view.rs

@@ -100,33 +100,46 @@ impl Sampler {
             })))
     }
 
-    pub fn status (&self, index: usize) -> impl Content<TuiOut> {
+    pub fn view_sample_info (&self, note_pt: usize) -> impl Content<TuiOut> + use<'_> {
+        Fill::x(Fixed::y(1, draw_info(if let Some((_, sample)) = &self.recording {
+            Some(sample)
+        } else if let Some(sample) = &self.mapped[note_pt] {
+            Some(sample)
+        } else {
+            None
+        })))
+    }
+
+    pub fn view_status (&self, index: usize) -> impl Content<TuiOut> {
         draw_status(self.mapped[index].as_ref())
     }
 
     pub fn view_meters_input (&self) -> impl Content<TuiOut> + use<'_> {
-        Tui::bg(Black, Fixed::x(2, Map::east(1, ||self.input_meters.iter(), |value, _index|{
+        draw_meters(&self.input_meters)
-            Fill::y(RmsMeter(*value))
-        })))
     }
 
     pub fn view_meters_output (&self) -> impl Content<TuiOut> + use<'_> {
-        Tui::bg(Black, Fixed::x(2, Map::east(1, ||self.output_meters.iter(), |value, _index|{
+        draw_meters(&self.output_meters)
-            Fill::y(RmsMeter(*value))
-        })))
     }
 }
 
+fn draw_meters (meters: &[f32]) -> impl Content<TuiOut> + use<'_> {
+    Tui::bg(Black, Fixed::x(2, Map::east(1, ||meters.iter(), |value, _index|{
+        Fill::y(RmsMeter(*value))
+    })))
+}
+
 fn draw_list_item (sample: &Option<Arc<RwLock<Sample>>>) -> String {
     if let Some(sample) = sample {
         let sample = sample.read().unwrap();
-        format!("{:8} {:3} {:6}-{:6}/{:6}",
+        format!("{:8}", sample.name)
-            sample.name,
+        //format!("{:8} {:3} {:6}-{:6}/{:6}",
-            sample.gain,
+            //sample.name,
-            sample.start,
+            //sample.gain,
-            sample.end,
+            //sample.start,
-            sample.channels[0].len()
+            //sample.end,
-        )
+            //sample.channels[0].len()
+        //)
     } else {
         String::from("........")
     }
@@ -187,6 +200,21 @@ fn draw_viewer (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> +
     })
 }
 
+fn draw_info (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> + use<'_> {
+    When(sample.is_some(), Thunk::new(move||{
+        let sample = sample.unwrap().read().unwrap();
+        let theme  = ItemTheme::G[96];
+        row!(
+            FieldH(theme, "Name",      format!("{:<10}", sample.name.clone())),
+            FieldH(theme, "Length",    format!("{:<8}", sample.channels[0].len())),
+            FieldH(theme, "Start",     format!("{:<8}", sample.start)),
+            FieldH(theme, "End",       format!("{:<8}", sample.end)),
+            FieldH(theme, "Transpose", " 0 "),
+            FieldH(theme, "Gain",      format!("{}", sample.gain)),
+        )
+    }))
+}
+
 fn draw_status (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> {
     Tui::bold(true, Tui::fg(Tui::g(224), sample
         .map(|sample|{

crates/device/src/sequencer/seq_model.rs

@@ -18,29 +18,29 @@ pub trait HasSequencer {
 /// Contains state for playing a clip
 pub struct Sequencer {
     /// State of clock and playhead
-    pub clock:       Clock,
+    pub clock:      Clock,
     /// Start time and clip being played
-    pub play_clip:   Option<(Moment, Option<Arc<RwLock<MidiClip>>>)>,
+    pub play_clip:  Option<(Moment, Option<Arc<RwLock<MidiClip>>>)>,
     /// Start time and next clip
-    pub next_clip:   Option<(Moment, Option<Arc<RwLock<MidiClip>>>)>,
+    pub next_clip:  Option<(Moment, Option<Arc<RwLock<MidiClip>>>)>,
     /// Play input through output.
-    pub monitoring:  bool,
+    pub monitoring: bool,
     /// Write input to sequence.
-    pub recording:   bool,
+    pub recording:  bool,
     /// Overdub input to sequence.
-    pub overdub:     bool,
+    pub overdub:    bool,
     /// Send all notes off
-    pub reset:       bool, // TODO?: after Some(nframes)
+    pub reset:      bool, // TODO?: after Some(nframes)
     /// Record from MIDI ports to current sequence.
-    pub midi_ins:    Vec<JackMidiIn>,
+    pub midi_ins:   Vec<JackMidiIn>,
     /// Play from current sequence to MIDI ports
-    pub midi_outs:   Vec<JackMidiOut>,
+    pub midi_outs:  Vec<JackMidiOut>,
     /// Notes currently held at input
-    pub notes_in:    Arc<RwLock<[bool; 128]>>,
+    pub notes_in:   Arc<RwLock<[bool; 128]>>,
     /// Notes currently held at output
-    pub notes_out:   Arc<RwLock<[bool; 128]>>,
+    pub notes_out:  Arc<RwLock<[bool; 128]>>,
     /// MIDI output buffer
-    pub note_buf:    Vec<u8>,
+    pub note_buf:   Vec<u8>,
 }
 
 impl Default for Sequencer {