simplify track construction

crates/app/src/model/track.rs

@@ -23,36 +23,23 @@ has_player!(|self: Track|self.player);
 
 impl Track {
     pub const MIN_WIDTH: usize = 9;
-    /// Create a new track containing a sequencer.
+    /// Create a new track with only the default [MidiPlayer].
-    pub fn new_sequencer () -> Self {
+    pub fn new () -> Self {
-        let mut track = Self::default();
+        Self::default()
-        track.devices.push(Device::Sequencer(MidiPlayer::default()));
-        track
     }
-    /// Create a new track containing a sequencer and sampler.
+    /// Create a new track connecting the [MidiPlayer] to a [Sampler].
-    pub fn new_groovebox (
+    pub fn new_with_sampler (
         jack:       &Jack,
         midi_from:  &[PortConnect],
         audio_from: &[&[PortConnect];2],
         audio_to:   &[&[PortConnect];2],
     ) -> Usually<Self> {
         let mut track = Self::new_sequencer();
-        track.devices.push(Device::Sampler(
+        let name = jack.with_client(|c|c.name().to_string());
-            Sampler::new(jack, &"sampler", midi_from, audio_from, audio_to)?
+        let midi = track.player.midi_outs[0].name();
-        ));
+        let port = PortConnect::exact(format!("{name}:{midi}"));
-        Ok(track)
+        let sampler = Sampler::new(jack, &"sampler", &[port], audio_from, audio_to)?;
-    }
+        track.devices.push(Device::Sampler(sampler));
-    /// Create a new track containing a sampler.
-    pub fn new_sampler (
-        jack:       &Jack,
-        midi_from:  &[PortConnect],
-        audio_from: &[&[PortConnect];2],
-        audio_to:   &[&[PortConnect];2],
-    ) -> Usually<Self> {
-        let mut track = Self::default();
-        track.devices.push(Device::Sampler(
-            Sampler::new(jack, &"sampler", midi_from, audio_from, audio_to)?
-        ));
         Ok(track)
     }
     pub fn width_inc (&mut self) {

crates/cli/tek.rs

@@ -136,13 +136,15 @@ impl Cli {
                 },
                 tracks: match mode {
                     LaunchMode::Sequencer => vec![
-                        Track::new_sequencer()
+                        Track::new()
                     ],
-                    LaunchMode::Groovebox => vec![
+                    LaunchMode::Groovebox | LaunchMode::Sampler => vec![
-                        Track::new_groovebox(jack, midi_froms.as_slice(), audio_froms, audio_tos)?
+                        Track::new_with_sampler(
-                    ],
+                            jack,
-                    LaunchMode::Sampler => vec![
+                            midi_froms.as_slice(),
-                        Track::new_sampler(jack, midi_froms.as_slice(), audio_froms, audio_tos)?
+                            audio_froms,
+                            audio_tos,
+                        )?
                     ],
                     _ => vec![]
                 },