wip: down to 25 errors woo

crates/engine/Cargo.toml

@@ -5,6 +5,7 @@ version = { workspace = true }
 
 [dependencies]
 tengri       = { workspace = true }
+tengri_proc  = { workspace = true }
 jack         = { workspace = true }
 midly        = { workspace = true }
 uuid         = { workspace = true }

crates/engine/src/jack/jack_client.rs

@@ -2,6 +2,12 @@ use crate::*;
 use super::*;
 use self::JackState::*;
 
+impl<T: Has<Jack>> HasJack for T {
+    fn jack (&self) -> &Jack {
+        self.get()
+    }
+}
+
 /// Things that can provide a [jack::Client] reference.
 pub trait HasJack {
     /// Return the internal [jack::Client] handle

crates/engine/src/lib.rs

@@ -9,7 +9,7 @@ pub(crate) use std::sync::{Arc, atomic::{AtomicUsize, AtomicBool, Ordering::Rela
 pub(crate) use std::fmt::Debug;
 pub(crate) use std::ops::{Add, Sub, Mul, Div, Rem};
 
-pub(crate) use ::tengri::{from, Usually, tui::*};
+pub(crate) use ::tengri::{from, Usually, Perhaps, tui::*};
 
 pub use ::atomic_float; pub(crate) use atomic_float::*;
 

crates/engine/src/midi/midi_in.rs

@@ -1,5 +1,9 @@
 use crate::*;
 
+#[tengri_proc::command(JackMidiIn)]
+impl MidiInputCommand {
+}
+
 impl<T: Has<Vec<JackMidiIn>>> HasMidiIns for T {
     fn midi_ins (&self) -> &Vec<JackMidiIn> {
         self.get()
@@ -32,11 +36,20 @@ pub trait HasMidiIns {
             data
         })
     }
-    fn midi_in_add (&mut self, jack: &Jack) -> Usually<()> {
+}
+
+pub type CollectedMidiInput<'a> = Vec<Vec<(u32, Result<LiveEvent<'a>, MidiError>)>>;
+
+impl<T: HasMidiIns + HasJack> AddMidiIn for T {
+    fn midi_in_add (&mut self) -> Usually<()> {
         let index = self.midi_ins().len();
-        self.midi_ins_mut().push(JackMidiIn::new(jack, &format!("M/{index}"), &[])?);
+        let port  = JackMidiIn::new(self.jack(), &format!("M/{index}"), &[])?;
+        self.midi_ins_mut().push(port);
         Ok(())
     }
 }
 
-pub type CollectedMidiInput<'a> = Vec<Vec<(u32, Result<LiveEvent<'a>, MidiError>)>>;
+/// May create new MIDI input ports.
+pub trait AddMidiIn {
+    fn midi_in_add (&mut self) -> Usually<()>;
+}

crates/engine/src/midi/midi_out.rs

@@ -1,5 +1,9 @@
 use crate::*;
 
+#[tengri_proc::command(JackMidiOut)]
+impl MidiOutputCommand {
+}
+
 impl<T: Has<Vec<JackMidiOut>>> HasMidiOuts for T {
     fn midi_outs (&self) -> &Vec<JackMidiOut> {
         self.get()
@@ -25,9 +29,19 @@ pub trait HasMidiOuts {
             data
         })
     }
-    fn midi_out_add (&mut self, jack: &Jack) -> Usually<()> {
+}
+
+/// Trail for thing that may gain new MIDI ports.
+impl<T: HasMidiOuts + HasJack> AddMidiOut for T {
+    fn midi_out_add (&mut self) -> Usually<()> {
         let index = self.midi_outs().len();
-        self.midi_outs_mut().push(JackMidiOut::new(&jack, &format!("{index}/M"), &[])?);
+        let port  = JackMidiOut::new(self.jack(), &format!("{index}/M"), &[])?;
+        self.midi_outs_mut().push(port);
         Ok(())
     }
 }
+
+/// May create new MIDI output ports.
+pub trait AddMidiOut {
+    fn midi_out_add (&mut self) -> Usually<()>;
+}