wip: some namespace progress

crates/app/app.rs

@@ -216,19 +216,29 @@ impl App {
 }
 
 fn render_dsl <'t, S> (state: &'t S, src: &str) -> Box<dyn Render<TuiOut>>
-where S: DslSymNs<'t, Box<dyn Render<TuiOut>>> + DslExpNs<'t, Box<dyn Render<TuiOut>>>
+    where S: DslSymNs<'t, Box<dyn Render<TuiOut>>> + DslExpNs<'t, Box<dyn Render<TuiOut>>>
 {
-    if let Ok(Some(value)) = state.from_sym(src) { return value }
-    if let Ok(Some(value)) = state.from_exp(src) { return value }
-    Box::new(Bsp::s(
-        Fill::x(Align::w(Tui::bold(true, Tui::fg_bg(Color::Rgb(240,160,100), Color::Rgb(48,00,00),
-            "Could not render:")))),
-        Max::x(40, Tui::fg_bg(Color::Rgb(250,200,120), Color::Rgb(32,00,00),
-            format!("{src}")))
-    ))
+    let sym_err: Option<Box<dyn Error>> = match state.from_sym(src) {
+        Ok(Some(value)) => return value,
+        Ok(None) => None,
+        Err(e) => Some(e),
+    };
+    let exp_err = match state.from_exp(src) {
+        Ok(Some(value)) => return value,
+        Ok(None) => None,
+        Err(e) => Some(e),
+    };
+    let (err_fg_1, err_bg_1) = (Color::Rgb(240, 160, 100), Color::Rgb(48, 0, 0));
+    let (err_fg_2, err_bg_2) = (Color::Rgb(250, 200, 120), Color::Rgb(32, 0, 0));
+    Box::new(Fill::x(col! {
+        Fill::x(Margin::x(1, Align::w(Tui::bold(true, Tui::fg_bg(err_fg_1, err_bg_1, "Could not render:"))))),
+        Fill::x(Margin::x(1, Tui::fg_bg(err_fg_2, err_bg_2, format!("{src}")))),
+        Fill::x(Margin::x(1, Tui::fg_bg(err_fg_2, err_bg_2, format!("{sym_err:?}")))),
+        Fill::x(Margin::x(1, Tui::fg_bg(err_fg_2, err_bg_2, format!("{exp_err:?}")))),
+    }))
 }
 
-dsl_exp!(|app: App, tail| -> Box<dyn Render<TuiOut>> {
+dsl_exp_ns!(|app: App| -> Box<dyn Render<TuiOut>> {
     ("bold", value: bool, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::bold(value, x)),
     ("fg", color: Color, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::fg(color, x)),
     ("bg", color: Color, x: Box<dyn Render<TuiOut>>) => Box::new(Tui::bg(color, x)),
@@ -239,24 +249,26 @@ dsl_exp!(|app: App, tail| -> Box<dyn Render<TuiOut>> {
     ("bsp/w", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::w(a, b)),
     ("bsp/a", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::a(a, b)),
     ("bsp/b", a: Box<dyn Render<TuiOut>>, b: Box<dyn Render<TuiOut>>) => Box::new(Bsp::b(a, b)),
-    ("align/n", x: Box<dyn Render<TuiOut>>) => Box::new(Align::n(a, b)),
-    ("align/s", x: Box<dyn Render<TuiOut>>) => Box::new(Align::s(a, b)),
-    ("align/e", x: Box<dyn Render<TuiOut>>) => Box::new(Align::e(a, b)),
-    ("align/w", x: Box<dyn Render<TuiOut>>) => Box::new(Align::w(a, b)),
-    ("align/x", x: Box<dyn Render<TuiOut>>) => Box::new(Align::x(a, b)),
-    ("align/y", x: Box<dyn Render<TuiOut>>) => Box::new(Align::y(a, b)),
-    ("align/c", x: Box<dyn Render<TuiOut>>) => Box::new(Align::c(a, b)),
+    ("align/n", x: Box<dyn Render<TuiOut>>) => Box::new(Align::n(x)),
+    ("align/s", x: Box<dyn Render<TuiOut>>) => Box::new(Align::s(x)),
+    ("align/e", x: Box<dyn Render<TuiOut>>) => Box::new(Align::e(x)),
+    ("align/w", x: Box<dyn Render<TuiOut>>) => Box::new(Align::w(x)),
+    ("align/x", x: Box<dyn Render<TuiOut>>) => Box::new(Align::x(x)),
+    ("align/y", x: Box<dyn Render<TuiOut>>) => Box::new(Align::y(x)),
+    ("align/c", x: Box<dyn Render<TuiOut>>) => Box::new(Align::c(x)),
     ("fill/x",  x: Box<dyn Render<TuiOut>>) => Box::new(Fill::x(x)),
     ("fill/y",  x: Box<dyn Render<TuiOut>>) => Box::new(Fill::y(x)),
     ("fill/xy", x: Box<dyn Render<TuiOut>>) => Box::new(Fill::xy(x)),
 });
 
-dsl_exp!(|app: App, tail| -> Color {
-    ("rgb", r: u8, g: u8, b: u8) => Color::Rgb(r, g, b),
-    ("g",   n: u8)               => Color::Rgb(n. n. n),
+dsl_exp_ns!(|app: App| -> Color {
+    ("g", n: u8) =>
+        Color::Rgb(n, n, n),
+    ("rgb", r: u8, g: u8, b: u8) =>
+        Color::Rgb(r, g, b),
 });
 
-dsl_sym!(|app: App| -> Box<dyn Render<TuiOut>> {
+dsl_sym_ns!(|app: App| -> Box<dyn Render<TuiOut>> {
 
     ":view/menu" => app.view(stringify!((bg (rgb 0 0 0)
         (bsp/s :view/ports/outs (bsp/s (bg (rgb 33 33 33) (bold :true "tek 0.3.0-rc.0")))
@@ -567,24 +579,24 @@ handle!(TuiIn:|self: App, input|{
         //None
     //})
 });
-dsl_sym!(|app: App| -> isize {
+dsl_sym_ns!(|app: App| -> isize {
     ":_isize_stub" => -1
 });
-dsl_sym!(|app: App| -> ItemTheme {
+dsl_sym_ns!(|app: App| -> ItemTheme {
     ":_theme_stub" => Default::default()
 });
-dsl_sym!(|app: App| -> u16{
+dsl_sym_ns!(|app: App| -> u16{
     ":w/sidebar"       => app.project.w_sidebar(app.editor().is_some()),
     ":h/sample-detail" => 6.max(app.height() as u16 * 3 / 9),
 });
-dsl_sym!(|app: App| -> usize {
+dsl_sym_ns!(|app: App| -> usize {
     ":scene-count"      => app.scenes().len(),
     ":track-count"      => app.tracks().len(),
     ":device-kind"      => app.dialog.device_kind().unwrap_or(0),
     ":device-kind/next" => app.dialog.device_kind_next().unwrap_or(0),
     ":device-kind/prev" => app.dialog.device_kind_prev().unwrap_or(0),
 });
-dsl_sym!(|app: App| -> bool {
+dsl_sym_ns!(|app: App| -> bool {
     ":focused/editor"      => app.project.editor.is_some(),
     ":focused/dialog"      => !matches!(app.dialog, Dialog::None),
     ":focused/message"     => matches!(app.dialog, Dialog::Message(..)),
@@ -599,7 +611,7 @@ dsl_sym!(|app: App| -> bool {
     ":focused/pool/rename" => matches!(app.pool.mode, Some(PoolMode::Rename(..))),
     ":focused/pool/length" => matches!(app.pool.mode, Some(PoolMode::Length(..))),
 });
-dsl_sym!(|app: App| -> Dialog {
+dsl_sym_ns!(|app: App| -> Dialog {
     ":dialog/none"          => Dialog::None,
     ":dialog/options"       => Dialog::Options,
     ":dialog/device"        => Dialog::Device(0),
@@ -614,7 +626,7 @@ dsl_sym!(|app: App| -> Dialog {
     ":dialog/import/sample" => Dialog::Browser(BrowserTarget::ImportSample(Default::default()), Browser::new(None).unwrap().into()),
     ":dialog/export/sample" => Dialog::Browser(BrowserTarget::ExportSample(Default::default()), Browser::new(None).unwrap().into()),
 });
-dsl_sym!(|app: App| -> Selection {
+dsl_sym_ns!(|app: App| -> Selection {
     ":select/scene"      => app.selection().select_scene(app.tracks().len()),
     ":select/scene/next" => app.selection().select_scene_next(app.scenes().len()),
     ":select/scene/prev" => app.selection().select_scene_prev(),
@@ -622,14 +634,14 @@ dsl_sym!(|app: App| -> Selection {
     ":select/track/next" => app.selection().select_track_next(app.tracks().len()),
     ":select/track/prev" => app.selection().select_track_prev(),
 });
-dsl_sym!(|app: App| -> Option<u7> {
+dsl_sym_ns!(|app: App| -> Option<u7> {
     ":editor/pitch" => Some((app.editor().as_ref().map(|e|e.get_note_pos()).unwrap() as u8).into())
 });
-dsl_sym!(|app: App| -> Option<usize> {
+dsl_sym_ns!(|app: App| -> Option<usize> {
     ":selected/scene" => app.selection().scene(),
     ":selected/track" => app.selection().track(),
 });
-dsl_sym!(|app: App| -> Option<Arc<RwLock<MidiClip>>> {
+dsl_sym_ns!(|app: App| -> Option<Arc<RwLock<MidiClip>>> {
     ":selected/clip" => if let Selection::TrackClip { track, scene } = app.selection() {
         app.scenes()[*scene].clips[*track].clone()
     } else {
@@ -639,9 +651,9 @@ dsl_sym!(|app: App| -> Option<Arc<RwLock<MidiClip>>> {
 #[derive(Debug)]
 pub enum AppCommand {
 }
-dsl_exp!(|app: App| -> AppCommand {
-    ("stop-all") => app.project.stop_all(),
-    ("enqueue", clip?: Option<Arc<RwLock<MidiClip>>>) => todo!(),
+dsl_exp_ns!(|app: App| -> AppCommand {
+    ("stop-all") => todo!(),//app.project.stop_all(),
+    ("enqueue", clip:  Option<Arc<RwLock<MidiClip>>>) => todo!(),
     ("history", delta: isize)                 => todo!(),
     ("zoom",    zoom:  usize)                 => todo!(),
     ("select",  selection: Selection)         => todo!(),
@@ -652,12 +664,12 @@ dsl_exp!(|app: App| -> AppCommand {
     ("pool"    / command: PoolCommand)        => todo!(),
     ("pool"    / editor:  MidiEditCommand)    => todo!(),
 });
-dsl_exp!(|app: App| -> DialogCommand {});
-dsl_exp!(|app: App| -> ArrangementCommand {});
-dsl_exp!(|app: App| -> ClockCommand {});
-dsl_exp!(|app: App| -> SamplerCommand {});
-dsl_exp!(|app: App| -> PoolCommand {});
-dsl_exp!(|app: App| -> MidiEditCommand {});
+dsl_exp_ns!(|app: App| -> DialogCommand {});
+dsl_exp_ns!(|app: App| -> ArrangementCommand {});
+dsl_exp_ns!(|app: App| -> ClockCommand {});
+dsl_exp_ns!(|app: App| -> SamplerCommand {});
+dsl_exp_ns!(|app: App| -> PoolCommand {});
+dsl_exp_ns!(|app: App| -> MidiEditCommand {});
 impl App {
     pub fn focused_editor (&self) -> bool {
         false

crates/device/src/arranger/arranger_api.rs

@@ -96,7 +96,7 @@ impl ArrangementCommand {
         let index = arranger.track_add(None, None, &[], &[])?.0;
         *arranger.selection_mut() = match arranger.selection() {
             Selection::Track(_) => Selection::Track(index),
-            Selection::TrackClip { track, scene } => Selection::TrackClip {
+            Selection::TrackClip { track: _, scene } => Selection::TrackClip {
                 track: index, scene: *scene
             },
             _ => *arranger.selection()

crates/device/src/arranger/arranger_tracks.rs

@@ -336,7 +336,7 @@ pub(crate) fn io_ports <'a, T: PortsSizes<'a>> (
     fg: Color, bg: Color, iter: impl Fn()->T + Send + Sync + 'a
 ) -> impl Content<TuiOut> + 'a {
     Map::new(iter, move|(
-        index, name, connections, y, y2
+        _index, name, connections, y, y2
     ): (usize, &'a Arc<str>, &'a [Connect], usize, usize), _|
         map_south(y as u16, (y2-y) as u16, Bsp::s(
             Fill::x(Tui::bold(true, Tui::fg_bg(fg, bg, Align::w(Bsp::e(" 󰣲 ", name))))),
@@ -349,11 +349,11 @@ pub(crate) fn io_conns <'a, T: PortsSizes<'a>> (
     fg: Color, bg: Color, iter: impl Fn()->T + Send + Sync + 'a
 ) -> impl Content<TuiOut> + 'a {
     Map::new(iter, move|(
-        index, name, connections, y, y2
+        _index, _name, connections, y, y2
     ): (usize, &'a Arc<str>, &'a [Connect], usize, usize), _|
         map_south(y as u16, (y2-y) as u16, Bsp::s(
             Fill::x(Tui::bold(true, wrap(bg, fg, Fill::x(Align::w("▞▞▞▞ ▞▞▞▞"))))),
-            Map::new(||connections.iter(), move|connect, index|map_south(index as u16, 1,
+            Map::new(||connections.iter(), move|_conn, index|map_south(index as u16, 1,
                 Fill::x(Align::w(Tui::bold(false, wrap(bg, fg, Fill::x(""))))))))))
 }
             //track_scroll:   Fill::x(Fixed::y(1, ScrollbarH {

crates/device/src/arranger/arranger_view.rs

@@ -1,18 +1,13 @@
 use crate::*;
 
 impl Arrangement {
-    pub fn view_inputs <'a> (&'a self, theme: ItemTheme) -> impl Content<TuiOut> + 'a {
-        let mut h = 1u16;
-        for track in self.tracks().iter() {
-            h = h.max(self.midi_ins.len() as u16);
-        }
-        let h = h + 1;
+    pub fn view_inputs <'a> (&'a self, _theme: ItemTheme) -> impl Content<TuiOut> + 'a {
         Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
             add(&Fixed::y(1,
                 Bsp::e(Fixed::x(20, Align::w(button_3("i", "nput ", format!("{}", self.midi_ins.len()), false))),
                     Bsp::w(Fixed::x(4, button_2("I", "+", false)),
                         Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                            for (index, track, x1, x2) in self.tracks_with_sizes() {
+                            for (_index, track, _x1, _x2) in self.tracks_with_sizes() {
                                 add(&Tui::bg(track.color.dark.rgb, Align::w(Fixed::x(track.width as u16, row!(
                                     Either(track.sequencer.monitoring, Tui::fg(Green, "mon "), "mon "),
                                     Either(track.sequencer.recording,  Tui::fg(Red, "rec "), "rec "),
@@ -20,13 +15,13 @@ impl Arrangement {
                                 )))))
                             }
                         })))));
-            for (index, port) in self.midi_ins().iter().enumerate() {
+            for (_index, port) in self.midi_ins().iter().enumerate() {
                 add(&Fixed::y(1, Bsp::e(
                     Fixed::x(20, Align::w(Bsp::e(" ● ",
                         Tui::bold(true, Tui::fg(Rgb(255,255,255), port.port_name()))))),
                     Bsp::w(Fixed::x(4, ()),
                         Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                            for (index, track, x1, x2) in self.tracks_with_sizes() {
+                            for (_index, track, _x1, _x2) in self.tracks_with_sizes() {
                                 add(&Tui::bg(track.color.darker.rgb, Align::w(Fixed::x(track.width as u16, row!(
                                     Either(track.sequencer.monitoring, Tui::fg(Green,  " ●  "), " ·  "),
                                     Either(track.sequencer.recording,  Tui::fg(Red,    " ●  "), " ·  "),
@@ -46,7 +41,7 @@ impl Arrangement {
         let list = Bsp::s(
             Fixed::y(1, Fill::x(Align::w(button_3("o", "utput", format!("{}", self.midi_outs.len()), false)))),
             Fixed::y(h - 1, Fill::xy(Align::nw(Stack::south(|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                for (index, port) in self.midi_outs().iter().enumerate() {
+                for (_index, port) in self.midi_outs().iter().enumerate() {
                     add(&Fixed::y(1,Fill::x(Bsp::e(
                         Align::w(Bsp::e(" ● ", Tui::fg(Rgb(255,255,255),Tui::bold(true, port.port_name())))),
                         Fill::x(Align::e(format!("{}/{} ",
@@ -60,20 +55,19 @@ impl Arrangement {
         Fixed::y(h, self.view_track_row_section(theme, list, button_2("O", "+", false),
             Tui::bg(theme.darker.rgb, Align::w(Fill::x(
                 Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                    for (index, track, x1, x2) in self.tracks_with_sizes() {
+                    for (index, track, _x1, _x2) in self.tracks_with_sizes() {
                         add(&Fixed::x(self.track_width(index, track),
                             Stack::south(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                                let index = 0;
                                 add(&Fixed::y(1, Align::w(Bsp::e(
                                     Either(true,  Tui::fg(Green,  "play "), "play "),
                                     Either(false, Tui::fg(Yellow, "solo "), "solo "),
                                 ))));
-                                for (index, port) in self.midi_outs().iter().enumerate() {
+                                for (_index, port) in self.midi_outs().iter().enumerate() {
                                     add(&Fixed::y(1, Align::w(Bsp::e(
                                         Either(true,  Tui::fg(Green,  " ●   "), " ·   "),
                                         Either(false, Tui::fg(Yellow, " ●   "), " ·   "),
                                     ))));
-                                    for (index, conn) in port.connections.iter().enumerate() {
+                                    for (_index, _conn) in port.connections.iter().enumerate() {
                                         add(&Fixed::y(1, Fill::x("")));
                                     }
                                 }})))}}))))))
@@ -88,10 +82,10 @@ impl Arrangement {
             button_3("d", "evice", format!("{}", self.track().map(|t|t.devices.len()).unwrap_or(0)), false),
             button_2("D", "+", false),
             Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                for (index, track, x1, x2) in self.tracks_with_sizes() {
+                for (index, track, _x1, _x2) in self.tracks_with_sizes() {
                     add(&Fixed::xy(self.track_width(index, track), h + 1,
                         Tui::bg(track.color.dark.rgb, Align::nw(Map::south(2, move||0..h,
-                            |_, index|Fixed::xy(track.width as u16, 2,
+                            |_, _index|Fixed::xy(track.width as u16, 2,
                                 Tui::fg_bg(
                                     ItemTheme::G[32].lightest.rgb,
                                     ItemTheme::G[32].dark.rgb,
@@ -127,8 +121,8 @@ pub trait TracksView:
     }
     /// Iterate over tracks with their corresponding sizes.
     fn tracks_with_sizes (&self) -> impl TracksSizes<'_> {
-        let editor_width = self.editor().map(|e|e.width());
-        let active_track = self.selection().track();
+        let _editor_width = self.editor().map(|e|e.width());
+        let _active_track = self.selection().track();
         let mut x = 0;
         self.tracks().iter().enumerate().map_while(move |(index, track)|{
             let width = track.width.max(8);
@@ -143,7 +137,7 @@ pub trait TracksView:
     }
     fn view_track_row_section <'a> (
         &'a self,
-        theme:      ItemTheme,
+        _theme:     ItemTheme,
         button:     impl Content<TuiOut>,
         button_add: impl Content<TuiOut>,
         content:    impl Content<TuiOut>
@@ -177,7 +171,7 @@ pub trait TracksView:
             ),
             Tui::bg(theme.darker.rgb, Fixed::y(2, Fill::x(
                 Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                    for (index, track, x1, x2) in self.tracks_with_sizes() {
+                    for (index, track, _x1, _x2) in self.tracks_with_sizes() {
                         add(&Fixed::x(self.track_width(index, track),
                             Tui::bg(if self.selection().track() == Some(index) {
                                 track.color.light.rgb
@@ -190,7 +184,7 @@ pub trait TracksView:
                     }
                 })))))
     }
-    fn view_track_outputs <'a> (&'a self, theme: ItemTheme, h: u16) -> impl Content<TuiOut> {
+    fn view_track_outputs <'a> (&'a self, theme: ItemTheme, _h: u16) -> impl Content<TuiOut> {
         self.view_track_row_section(theme,
             Bsp::s(
                 Fill::x(Align::w(button_2("o", "utput", false))),
@@ -202,7 +196,7 @@ pub trait TracksView:
             button_2("O", "+", false),
             Tui::bg(theme.darker.rgb, Align::w(Fill::x(
                 Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                    for (index, track, x1, x2) in self.tracks_with_sizes() {
+                    for (index, track, _x1, _x2) in self.tracks_with_sizes() {
                         add(&Fixed::x(self.track_width(index, track),
                             Align::nw(Fill::y(Map::south(1, ||track.sequencer.midi_outs.iter(),
                                 |port, index|Tui::fg(Rgb(255, 255, 255),
@@ -222,7 +216,7 @@ pub trait TracksView:
             button_2("I", "+", false),
             Tui::bg(theme.darker.rgb, Align::w(Fill::x(
                 Stack::east(move|add: &mut dyn FnMut(&dyn Render<TuiOut>)|{
-                    for (index, track, x1, x2) in self.tracks_with_sizes() {
+                    for (index, track, _x1, _x2) in self.tracks_with_sizes() {
                         add(&Fixed::xy(self.track_width(index, track), h + 1,
                             Align::nw(Bsp::s(
                                 Tui::bg(track.color.base.rgb,
@@ -281,7 +275,7 @@ pub trait ScenesView:
         }))
     }
     fn view_scene_name (&self, index: usize, scene: &Scene) -> impl Content<TuiOut> {
-        let h = if self.selection().scene() == Some(index) && let Some(editor) = self.editor() {
+        let h = if self.selection().scene() == Some(index) && let Some(_editor) = self.editor() {
             7
         } else {
             Self::H_SCENE as u16

crates/device/src/browser.rs

@@ -1,3 +1,3 @@
 mod browser_api;   pub use self::browser_api::*;
 mod browser_model; pub use self::browser_model::*;
-mod browser_view;  pub use self::browser_view::*;
+mod browser_view;  //pub use self::browser_view::*;

crates/device/src/browser/browser_view.rs

@@ -5,7 +5,7 @@ content!(TuiOut: |self: Browser|Map::south(1, ||EntriesIterator {
     index:   0,
     length:  self.dirs.len() + self.files.len(),
     browser: self,
-}, |entry, index|Fill::x(Align::w(entry))));
+}, |entry, _index|Fill::x(Align::w(entry))));
 
 struct EntriesIterator<'a> {
     browser: &'a Browser,

crates/device/src/editor/editor_view.rs

@@ -9,7 +9,7 @@ content!(TuiOut: |self: MidiEditor| {
 impl MidiEditor {
 
     pub fn clip_status (&self) -> impl Content<TuiOut> + '_ {
-        let (color, name, length, looped) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) {
+        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) };
         Fixed::x(20, col!(
@@ -26,7 +26,7 @@ impl MidiEditor {
     }
 
     pub fn edit_status (&self) -> impl Content<TuiOut> + '_ {
-        let (color, length) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) {
+        let (_color, length) = if let Some(clip) = self.clip().as_ref().map(|p|p.read().unwrap()) {
             (clip.color, clip.length)
         } else { (ItemTheme::G[64], 0) };
         let time_pos  = self.get_time_pos();

crates/device/src/lib.rs

@@ -14,10 +14,10 @@ pub(crate) use std::error::Error;
 pub(crate) use std::ffi::OsString;
 
 pub(crate) use ::tengri::{from, has, maybe_has, Usually, Perhaps, Has, MaybeHas};
-pub(crate) use ::tengri::{dsl::*, input::*, output::{*, Margin}, tui::{*, ratatui::prelude::*}};
+pub(crate) use ::tengri::{dsl::*, input::*, output::*, tui::{*, ratatui::prelude::*}};
 pub(crate) use ::tek_engine::*;
 pub(crate) use ::tek_engine::midi::{u7, LiveEvent, MidiMessage};
-pub(crate) use ::tek_engine::jack::{Control, ProcessScope, MidiWriter, RawMidi};
+pub(crate) use ::tek_engine::jack::{Control, ProcessScope, RawMidi};
 pub(crate) use ratatui::{prelude::Rect, widgets::{Widget, canvas::{Canvas, Line}}};
 pub(crate) use Color::*;
 

crates/device/src/pool/pool_model.rs

@@ -18,7 +18,7 @@ pub struct Pool {
     //.flatten()));
 impl Default for Pool {
     fn default () -> Self {
-        use PoolMode::*;
+        //use PoolMode::*;
         Self {
             visible: true,
             clips:   Arc::from(RwLock::from(vec![])),

crates/device/src/pool/pool_view.rs

@@ -7,7 +7,7 @@ content!(TuiOut: |self: PoolView<'a>| {
     //let color  = self.1.clip().map(|c|c.read().unwrap().color).unwrap_or_else(||Tui::g(32).into());
     //let on_bg  = |x|x;//Bsp::b(Repeat(" "), Tui::bg(color.darkest.rgb, x));
     //let border = |x|x;//Outer(Style::default().fg(color.dark.rgb).bg(color.darkest.rgb)).enclose(x);
-    let height = pool.clips.read().unwrap().len() as u16;
+    //let height = pool.clips.read().unwrap().len() as u16;
     Fixed::x(20, Fill::y(Align::n(Map::new(
         ||pool.clips().clone().into_iter(),
         move|clip: Arc<RwLock<MidiClip>>, i: usize|{

crates/device/src/port/port_midi_in.rs

@@ -84,7 +84,7 @@ pub trait HasMidiIns {
             .collect::<Vec<_>>()
     }
     fn midi_ins_with_sizes <'a> (&'a self) ->
-        impl Iterator<Item=(usize, &Arc<str>, &[Connect], usize, usize)> + Send + Sync + 'a
+        impl Iterator<Item=(usize, &'a Arc<str>, &'a [Connect], usize, usize)> + Send + Sync + 'a
     {
         let mut y = 0;
         self.midi_ins().iter().enumerate().map(move|(i, input)|{

crates/device/src/port/port_midi_out.rs

@@ -119,7 +119,7 @@ pub trait HasMidiOuts {
     fn midi_outs (&self) -> &Vec<MidiOutput>;
     fn midi_outs_mut (&mut self) -> &mut Vec<MidiOutput>;
     fn midi_outs_with_sizes <'a> (&'a self) ->
-        impl Iterator<Item=(usize, &Arc<str>, &[Connect], usize, usize)> + Send + Sync + 'a
+        impl Iterator<Item=(usize, &'a Arc<str>, &'a [Connect], usize, usize)> + Send + Sync + 'a
     {
         let mut y = 0;
         self.midi_outs().iter().enumerate().map(move|(i, output)|{

crates/device/src/sampler/sampler_view.rs

@@ -7,8 +7,8 @@ impl Sampler {
         let cells_y     = 8u16;
         let cell_width  = 10u16;
         let cell_height = 2u16;
-        let width       = cells_x * cell_width;
-        let height      = cells_y * cell_height;
+        //let width       = cells_x * cell_width;
+        //let height      = cells_y * cell_height;
         let cols = Map::east(
             cell_width,
             move||0..cells_x,
@@ -205,8 +205,8 @@ fn draw_viewer (sample: Option<&Arc<RwLock<Sample>>>) -> impl Content<TuiOut> +
             Canvas::default()
                 .x_bounds([0.0, width  as f64])
                 .y_bounds([0.0, height as f64])
-                .paint(|ctx| {
-                    let text = "press record to begin sampling";
+                .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,

crates/engine/src/lib.rs

@@ -88,12 +88,10 @@ mod time; pub use self::time::*;
 mod note; pub use self::note::*;
 pub mod jack; pub use self::jack::*;
 pub mod midi; pub use self::midi::*;
-
 pub(crate) use std::sync::{Arc, RwLock, atomic::{AtomicUsize, AtomicBool, Ordering::Relaxed}};
 pub(crate) use std::fmt::Debug;
 pub(crate) use std::ops::{Add, Sub, Mul, Div, Rem};
-
-pub(crate) use ::tengri::{from, Usually, tui::*, dsl::*};
+pub(crate) use ::tengri::{from, Usually};
 
 pub use ::atomic_float; pub(crate) use atomic_float::*;
 

crates/engine/src/midi.rs

@@ -1,5 +1,3 @@
-use crate::*;
-
 pub use ::midly::{
     Smf,
     TrackEventKind,

deps/tengri

@@ -1 +1 @@
-Subproject commit a1190a24a1bdea774cedf86fff7b7e407c0a4cc7
+Subproject commit d7884f6289ac6c7a88f806f4453fb7c246c87f0b