From b78b55faa2443f799a430fbdbb98178d4af71032 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Sun, 29 Dec 2024 18:39:20 +0100
Subject: [PATCH] implement sync_lead and sync_follow flags for groovebox

---
 bin/cli_groovebox.rs | 30 +++++++++++++++++++-----------
 rust-jack            |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/bin/cli_groovebox.rs b/bin/cli_groovebox.rs
index 59e3c663..ab516e84 100644
--- a/bin/cli_groovebox.rs
+++ b/bin/cli_groovebox.rs
@@ -5,31 +5,34 @@ pub fn main () -> Usually<()> { GrooveboxCli::parse().run() }
 pub struct GrooveboxCli {
     /// Name of JACK client
     #[arg(short, long)]
-    name:      Option<String>,
+    name:        Option<String>,
     /// Whether to include a transport toolbar (default: true)
     #[arg(short, long, default_value_t = true)]
-    transport: bool,
+    transport:   bool,
     /// Whether to attempt to become transport master
-    #[arg(short, long, default_value_t = true)]
-    sync:      bool,
+    #[arg(short='S', long, default_value_t = false)]
+    sync_lead:   bool,
+    /// Whether to attempt to become transport master
+    #[arg(short='s', long, default_value_t = true)]
+    sync_follow: bool,
     /// MIDI outs to connect to MIDI input
     #[arg(short='i', long)]
-    midi_from: Vec<String>,
+    midi_from:   Vec<String>,
     /// MIDI ins to connect from MIDI output
     #[arg(short='o', long)]
-    midi_to:   Vec<String>,
+    midi_to:     Vec<String>,
     /// Audio outs to connect to left input
     #[arg(short='l', long)]
-    l_from:    Vec<String>,
+    l_from:      Vec<String>,
     /// Audio outs to connect to right input
     #[arg(short='r', long)]
-    r_from:    Vec<String>,
+    r_from:      Vec<String>,
     /// Audio ins to connect from left output
     #[arg(short='L', long)]
-    l_to:      Vec<String>,
+    l_to:        Vec<String>,
     /// Audio ins to connect from right output
     #[arg(short='R', long)]
-    r_to:      Vec<String>,
+    r_to:        Vec<String>,
 }
 impl GrooveboxCli {
     fn run (&self) -> Usually<()> {
@@ -43,12 +46,17 @@ impl GrooveboxCli {
             jack.connect_audio_from(&app.sampler.audio_ins[1], &self.r_from)?;
             jack.connect_audio_to(&app.sampler.audio_outs[0],  &self.l_to)?;
             jack.connect_audio_to(&app.sampler.audio_outs[1],  &self.r_to)?;
-            if self.sync {
+            if self.sync_lead {
                 jack.read().unwrap().client().register_timebase_callback(false, |mut state|{
                     app.clock().playhead.update_from_sample(state.position.frame() as f64);
                     state.position.bbt = Some(app.clock().bbt());
                     state.position
                 })?
+            } else if self.sync_follow {
+                jack.read().unwrap().client().register_timebase_callback(false, |state|{
+                    app.clock().playhead.update_from_sample(state.position.frame() as f64);
+                    state.position
+                })?
             }
             Ok(app)
         })?)?;
diff --git a/rust-jack b/rust-jack
index 76f4bef0..d0978895 160000
--- a/rust-jack
+++ b/rust-jack
@@ -1 +1 @@
-Subproject commit 76f4bef07e3f9115e8efba0bc053a9bad7e25a19
+Subproject commit d09788959fe1cc937b27e8bfb2b695f84b406885