groovebox: spiffy sidebar

crates/device/src/arranger/arranger_model.rs

@@ -111,27 +111,27 @@ impl Arrangement {
         //1 + self.devices_with_sizes().last().map(|(_, _, _, _, y)|y as u16).unwrap_or(0)
     }
     /// Get the active track
-    fn get_track (&self) -> Option<&Track> {
+    pub fn get_track (&self) -> Option<&Track> {
         let index = self.selection().track()?;
         Has::<Vec<Track>>::get(self).get(index)
     }
     /// Get a mutable reference to the active track
-    fn get_track_mut (&mut self) -> Option<&mut Track> {
+    pub fn get_track_mut (&mut self) -> Option<&mut Track> {
         let index = self.selection().track()?;
         Has::<Vec<Track>>::get_mut(self).get_mut(index)
     }
     /// Get the active scene
-    fn get_scene (&self) -> Option<&Scene> {
+    pub fn get_scene (&self) -> Option<&Scene> {
         let index = self.selection().scene()?;
         Has::<Vec<Scene>>::get(self).get(index)
     }
     /// Get a mutable reference to the active scene
-    fn get_scene_mut (&mut self) -> Option<&mut Scene> {
+    pub fn get_scene_mut (&mut self) -> Option<&mut Scene> {
         let index = self.selection().scene()?;
         Has::<Vec<Scene>>::get_mut(self).get_mut(index)
     }
     /// Get the active clip
-    fn get_clip (&self) -> Option<Arc<RwLock<MidiClip>>> {
+    pub fn get_clip (&self) -> Option<Arc<RwLock<MidiClip>>> {
         self.get_scene()?.clips.get(self.selection().track()?)?.clone()
     }
     /// Put a clip in a slot

crates/device/src/editor/editor_view.rs

@@ -12,10 +12,11 @@ impl MidiEditor {
         let (color, name, length, looped) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) {
             (clip.color, clip.name.clone(), clip.length, clip.looped)
         } else { (ItemTheme::G[64], String::new().into(), 0, false) };
-        Bsp::e(
-            FieldH(color, "Edit", format!("{name} ({length})")),
-            FieldH(color, "Loop", looped.to_string())
-        )
+        Fixed::x(20, col!(
+            Fill::x(Align::w(FieldV(color, "Clip  ",   format!("{name}")))),
+            Fill::x(Align::w(FieldH(color, "Length", format!("{length}")))),
+            Fill::x(Align::w(FieldH(color, "Loop  ",   looped.to_string()))),
+        ))
     }
 
     pub fn edit_status (&self) -> impl Content<TuiOut> + '_ {
@@ -29,10 +30,10 @@ impl MidiEditor {
         let note_name = format!("{:4}",  Note::pitch_to_name(note_pos));
         let note_pos  = format!("{:>3}", note_pos);
         let note_len  = format!("{:>4}", self.get_note_len());
-        Bsp::e(
-            FieldH(color, "Time", format!("{length}/{time_zoom}+{time_pos} {time_lock}")),
-            FieldH(color, "Note", format!("{note_name} {note_pos} {note_len}")),
-        )
+        Fixed::x(20, Bsp::s(
+            Fill::x(Align::w(FieldH(color, "Time", format!("{length}/{time_zoom}+{time_pos} {time_lock}")))),
+            Fill::x(Align::w(FieldH(color, "Note", format!("{note_name} {note_pos} {note_len}")))),
+        ))
     }
 
 }

crates/device/src/sampler/sampler_model.rs

@@ -146,11 +146,20 @@ pub struct Sample {
     pub channels: Vec<Vec<f32>>,
     pub rate:     Option<usize>,
     pub gain:     f32,
+    pub color:    ItemTheme,
 }
 
 impl Sample {
     pub fn new (name: impl AsRef<str>, start: usize, end: usize, channels: Vec<Vec<f32>>) -> Self {
-        Self { name: name.as_ref().into(), start, end, channels, rate: None, gain: 1.0 }
+        Self {
+            name: name.as_ref().into(),
+            start,
+            end,
+            channels,
+            rate: None,
+            gain: 1.0,
+            color: ItemTheme::random(),
+        }
     }
     pub fn play (sample: &Arc<RwLock<Self>>, after: usize, velocity: &u7) -> Voice {
         Voice {

crates/device/src/sampler/sampler_view.rs

@@ -66,10 +66,18 @@ impl Sampler {
                 //let offset = |a|Push::y(i as u16, Align::n(Fixed::y(1, Fill::x(a))));
                 let mut bg = if note == note_pt { Tui::g(64) } else { Color::Reset };
                 let mut fg = Tui::g(160);
-                let mapped: &Option<Arc<RwLock<Sample>>> = &self.mapped[note];
-                if mapped.is_some() {
-                    fg = Tui::g(224);
-                    bg = Color::Rgb(0, if note == note_pt { 96 } else { 64 }, 0);
+                if let Some(mapped) = &self.mapped[note] {
+                    let sample = mapped.read().unwrap();
+                    fg = if note == note_pt {
+                        sample.color.lightest.rgb
+                    } else {
+                        Tui::g(224)
+                    };
+                    bg = if note == note_pt {
+                        sample.color.light.rgb
+                    } else {
+                        sample.color.base.rgb
+                    };
                 }
                 if let Some((index, _)) = self.recording {
                     if note == index {
@@ -110,6 +118,16 @@ impl Sampler {
         })))
     }
 
+    pub fn view_sample_status (&self, note_pt: usize) -> impl Content<TuiOut> + use<'_> {
+        Fixed::x(20, draw_info_v(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())
     }
@@ -189,11 +207,11 @@ fn draw_viewer (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> +
                 .y_bounds([0.0, height as f64])
                 .paint(|ctx| {
                     let text = "press record to begin sampling";
-                    ctx.print(
-                        (width - text.len() as u16) as f64 / 2.0,
-                        height as f64 / 2.0,
-                        text.red()
-                    );
+                    //ctx.print(
+                        //(width - text.len() as u16) as f64 / 2.0,
+                        //height as f64 / 2.0,
+                        //text.red()
+                    //);
                 })
                 .render(area, &mut to.buffer);
         }
@@ -203,7 +221,7 @@ 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];
+        let theme  = sample.color;
         row!(
             FieldH(theme, "Name",      format!("{:<10}", sample.name.clone())),
             FieldH(theme, "Length",    format!("{:<8}", sample.channels[0].len())),
@@ -215,6 +233,21 @@ fn draw_info (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> + us
     }))
 }
 
+fn draw_info_v (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> + use<'_> {
+    When(sample.is_some(), Thunk::new(move||{
+        let sample = sample.unwrap().read().unwrap();
+        let theme  = sample.color;
+        Fixed::x(20, col!(
+            Fill::x(Align::w(FieldH(theme, "Name  ", format!("{:<10}", sample.name.clone())))),
+            Fill::x(Align::w(FieldH(theme, "Length", format!("{:<8}", sample.channels[0].len())))),
+            Fill::x(Align::w(FieldH(theme, "Start ", format!("{:<8}", sample.start)))),
+            Fill::x(Align::w(FieldH(theme, "End   ", format!("{:<8}", sample.end)))),
+            Fill::x(Align::w(FieldH(theme, "Trans ", "0 "))),
+            Fill::x(Align::w(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|{