wip: AudioEngine (new jack init)

crates/tek_sequencer/src/arranger.rs

@@ -50,6 +50,8 @@ pub enum ArrangerStatusBar {
 }
 /// Represents the tracks and scenes of the composition.
 pub struct Arrangement<E: Engine> {
+    /// Global JACK client
+    pub jack:     Arc<JackClient>,
     /// Global timebase
     pub clock:    Arc<TransportTime>,
     /// Name of arranger
@@ -223,8 +225,14 @@ impl<E: Engine> FocusGrid<ArrangerFocus> for Arranger<E> {
 }
 /// General methods for arrangement
 impl<E: Engine> Arrangement<E> {
-    pub fn new (clock: &Arc<TransportTime>, name: &str, phrases: &Arc<RwLock<PhrasePool<E>>>) -> Self {
+    pub fn new (
+        jack:    &Arc<JackClient>,
+        clock:   &Arc<TransportTime>,
+        name:    &str,
+        phrases: &Arc<RwLock<PhrasePool<E>>>
+    ) -> Self {
         Self {
+            jack:     jack.clone(),
             clock:    clock.clone(),
             name:     Arc::new(RwLock::new(name.into())),
             mode:     ArrangementViewMode::Vertical(2),
@@ -400,8 +408,12 @@ impl<E: Engine> Arrangement<E> {
         &mut self, name: Option<&str>, color: Option<ItemColor>
     ) -> Usually<&mut ArrangementTrack> {
         self.tracks.push(name.map_or_else(
-            || ArrangementTrack::new(&self.clock, &self.track_default_name(), color),
-            |name| ArrangementTrack::new(&self.clock, name, color),
+            || ArrangementTrack::new(
+                &self.jack, &self.clock, &self.track_default_name(), color
+            ),
+            |name| ArrangementTrack::new(
+                &self.jack, &self.clock, name, color
+            ),
         ));
         let index = self.tracks.len() - 1;
         Ok(&mut self.tracks[index])
@@ -524,12 +536,17 @@ impl<E: Engine> Arrangement<E> {
     }
 }
 impl ArrangementTrack {
-    pub fn new (clock: &Arc<TransportTime>, name: &str, color: Option<ItemColor>) -> Self {
+    pub fn new (
+        jack:  &Arc<JackClient>,
+        clock: &Arc<TransportTime>,
+        name:  &str,
+        color: Option<ItemColor>
+    ) -> Self {
         Self {
             name:    Arc::new(RwLock::new(name.into())),
             width:   name.len() + 2,
             color:   color.unwrap_or_else(ItemColor::random),
-            player:  PhrasePlayer::new(clock),
+            player:  PhrasePlayer::new(jack, clock),
         }
     }
     pub fn longest_name (tracks: &[Self]) -> usize {

crates/tek_sequencer/src/arranger_cli.rs

@@ -23,7 +23,7 @@ impl ArrangerCli {
         let jack            = JackClient::Inactive(jack);
         let transport       = TransportToolbar::new(None, Some(jack.transport()));
         let phrases         = Arc::new(RwLock::new(PhrasePool::new()));
-        let mut arrangement = Arrangement::new(&transport.clock, "", &phrases);
+        let mut arrangement = Arrangement::new(&jack, &transport.clock, "", &phrases);
         let transport       = Arc::new(RwLock::new(transport));
         if let Some(name) = self.name.as_ref() {
             *arrangement.name.write().unwrap() = name.clone();

crates/tek_sequencer/src/sequencer.rs

@@ -391,7 +391,10 @@ impl Default for Phrase {
 impl PartialEq for Phrase { fn eq (&self, other: &Self) -> bool { self.uuid == other.uuid } }
 impl Eq for Phrase {}
 impl PhrasePlayer {
-    pub fn new (clock: &Arc<TransportTime>) -> Self {
+    pub fn new (
+        jack:  &Arc<JackClient>,
+        clock: &Arc<TransportTime>
+    ) -> Self {
         Self {
             clock:        clock.clone(),
             phrase:       None,

crates/tek_sequencer/src/sequencer_cli.rs

@@ -24,10 +24,10 @@ impl SequencerCli {
         let clock     = transport.read().unwrap().clock.clone();
         let sequencer = Sequencer {
             jack:         None,
+            player:       None,
             focus_cursor: (1, 1),
             phrases:      Arc::new(RwLock::new(PhrasePool::new())),
             editor:       PhraseEditor::new(),
-            player:       PhrasePlayer::new(&clock),
             transport:    self.transport.then_some(transport),
             clock,
         };
@@ -44,11 +44,13 @@ impl SequencerCli {
         }
         let sequencer = Arc::new(RwLock::new(sequencer));
         let jack = jack.activate(&sequencer.clone(), Sequencer::callback)?;
-        let jack = Some(jack.into());
+        let jack = Arc::new(jack);
+        let player = PhrasePlayer::new(&jack, &clock);
         if let Some(ref transport) = sequencer.read().unwrap().transport {
-            transport.write().unwrap().jack = jack.clone();
+            transport.write().unwrap().jack = Some(jack.clone());
         }
-        sequencer.write().unwrap().jack = jack.clone();
+        sequencer.write().unwrap().jack = Some(jack.clone());
+        sequencer.write().unwrap().player = player;
         Tui::run(sequencer).map(|_|())
     }
 }