wip4 (81e): kinda

crates/tek/src/api/mod.rs

@@ -47,7 +47,7 @@ impl JackActivate for JackClient {
                 Control::Quit
             }
         });
-        let frames = tek_core::jack::contrib::ClosureProcessHandler::new(frame as BoxedAudioHandler);
+        let frames = ClosureProcessHandler::new(frame as BoxedAudioHandler);
         let mut buffer = Self::Activating;
         std::mem::swap(&mut*client.write().unwrap(), &mut buffer);
         *client.write().unwrap() = Self::Active(Client::from(buffer).activate_async(events, frames)?);
@@ -101,7 +101,7 @@ pub trait Ports {
     }
 }
 
-fn register_ports<T: tek_core::jack::PortSpec + Copy>(
+fn register_ports<T: PortSpec + Copy>(
     client: &Client,
     names: Vec<String>,
     spec: T,

crates/tek/src/api/phrase.rs

@@ -1,6 +1,4 @@
 use crate::*;
-use tek_core::midly::Smf;
-use std::path::PathBuf;
 
 pub trait HasPhrases {
     fn phrases (&self) -> &Vec<Arc<RwLock<Phrase>>>;

crates/tek/src/cli_arranger.rs

@@ -1,5 +1,4 @@
-use tek_api::{JackActivate, ArrangerTracksApi, HasScenes};
+use crate::*;
-use tek_core::{*, clap::{self, Parser}};
 
 pub fn main () -> Usually<()> {
     ArrangerCli::parse().run()

crates/tek/src/cli_sequencer.rs

@@ -1,5 +1,4 @@
-use tek_api::JackActivate;
+use crate::*;
-use crate::{*, jack::{MidiIn, MidiOut}, clap::{self, Parser}};
 
 pub fn main () -> Usually<()> {
     SequencerCli::parse().run()

crates/tek/src/cli_transport.rs

@@ -1,5 +1,4 @@
-use tek_api::JackActivate;
+use crate::*;
-use tek_core::{*, clap::{self, Parser}};
 
 /// Application entrypoint.
 pub fn main () -> Usually<()> {

crates/tek/src/core/output.rs

@@ -67,16 +67,7 @@ impl<E: Engine, R: Render<E>> Render<E> for &R {
     }
 }
 
-//impl<E: Engine> Render<E> for &dyn Render<E> {
+impl<E: Engine> Render<E> for &dyn Render<E> {
-    //fn min_size (&self, to: E::Size)  -> Perhaps<E::Size> {
-        //(*self).min_size(to)
-    //}
-    //fn render (&self, to: &mut E::Output) -> Usually<()> {
-        //(*self).render(to)
-    //}
-//}
-
-impl<E: Engine> Render<E> for &mut dyn Render<E> {
     fn min_size (&self, to: E::Size)  -> Perhaps<E::Size> {
         (*self).min_size(to)
     }
@@ -85,6 +76,15 @@ impl<E: Engine> Render<E> for &mut dyn Render<E> {
     }
 }
 
+//impl<E: Engine> Render<E> for &mut dyn Render<E> {
+    //fn min_size (&self, to: E::Size)  -> Perhaps<E::Size> {
+        //(*self).min_size(to)
+    //}
+    //fn render (&self, to: &mut E::Output) -> Usually<()> {
+        //(*self).render(to)
+    //}
+//}
+
 impl<'a, E: Engine> Render<E> for Box<dyn Render<E> + 'a> {
     fn min_size (&self, to: E::Size) -> Perhaps<E::Size> {
         (**self).min_size(to)

crates/tek/src/lib.rs

@@ -1,42 +1,52 @@
-pub(crate) use ratatui;
-
-pub(crate) use jack;
-pub(crate) use jack::{
-    Client, ProcessScope, Control, CycleTimes,
-    Port, MidiIn, MidiOut, AudioIn, AudioOut, Unowned,
-    Transport, TransportState, MidiIter, RawMidi
-};
-
-pub(crate) use midly;
-pub(crate) use midly::{
-    *, live::LiveEvent, num::u7
-};
-
-pub(crate) use clap;
-
 pub(crate) use std::sync::{Arc, Mutex, RwLock};
 pub(crate) use std::sync::atomic::{Ordering, AtomicBool, AtomicUsize};
 pub(crate) use std::collections::BTreeMap;
 pub(crate) use std::marker::PhantomData;
+pub(crate) use std::thread::{spawn, JoinHandle};
+pub(crate) use std::path::PathBuf;
+pub(crate) use std::ffi::OsString;
+pub(crate) use std::time::Duration;
+pub(crate) use std::io::{Stdout, stdout};
 pub(crate) use std::error::Error;
 
+pub(crate) use ratatui;
+pub(crate) use ratatui::{
+    prelude::{Style, Color, Buffer},
+    style::{Stylize, Modifier},
+    backend::{Backend, CrosstermBackend, ClearType}
+};
+
+pub(crate) use jack;
+pub(crate) use jack::{
+    Client, ProcessScope, Control, CycleTimes,
+    Port, PortSpec, MidiIn, MidiOut, AudioIn, AudioOut, Unowned,
+    Transport, TransportState, MidiIter, RawMidi,
+    contrib::ClosureProcessHandler,
+};
+
+pub(crate) use midly;
+pub(crate) use midly::{
+    Smf,
+    MidiMessage,
+    TrackEventKind,
+    live::LiveEvent,
+    num::u7
+};
+
+pub(crate) use palette::{
+    *,
+    convert::*,
+    okhsl::*
+};
+
+pub(crate) use clap;
+
 pub(crate) use crossterm::{ExecutableCommand};
 pub(crate) use crossterm::terminal::{EnterAlternateScreen, LeaveAlternateScreen, enable_raw_mode, disable_raw_mode};
 pub(crate) use crossterm::event::{KeyCode, KeyModifiers, KeyEvent, KeyEventKind, KeyEventState};
-pub(crate) use tek_core::midly::{num::u7, MidiMessage};
-pub(crate) use std::sync::{Arc, RwLock};
-pub(crate) use std::path::PathBuf;
-pub(crate) use std::ffi::OsString;
 pub(crate) use better_panic::{Settings, Verbosity};
-pub(crate) use std::thread::{spawn, JoinHandle};
-pub(crate) use std::time::Duration;
-pub(crate) use ratatui::prelude::{Style, Color, Buffer};
-pub(crate) use ratatui::style::{Stylize, Modifier};
-pub(crate) use ratatui::backend::{Backend, CrosstermBackend, ClearType};
-pub(crate) use std::io::{Stdout, stdout};
 
 pub(crate) use atomic_float::*;
-pub(crate) use palette::{*, convert::*, okhsl::*};
 
 use std::ops::{Add, Sub, Mul, Div, Rem};
 use std::cmp::{Ord, Eq, PartialEq};

crates/tek/src/todo_cli_mixer.rs

@@ -1,4 +1,4 @@
-use tek_core::{*, clap::{self, Parser}};
+use crate::*;
 
 pub fn main () -> Usually<()> {
     MixerCli::parse().run()

crates/tek/src/todo_cli_plugin.rs

@@ -1,4 +1,4 @@
-use tek_core::{*, clap::{self, Parser}};
+use crate::*;
 
 pub fn main () -> Usually<()> {
     PluginCli::parse().run()

crates/tek/src/todo_cli_sampler.rs

@@ -1,4 +1,4 @@
-use tek_core::{*, clap::{self, Parser}};
+use crate::*;
 
 pub fn main () -> Usually<()> {
     SamplerCli::parse().run()