From c36802bad9de0b6c008bc58987c2606ca564b4bc Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Sun, 29 Dec 2024 00:00:42 +0100
Subject: [PATCH] use rust-jack from submodule

---
 Cargo.lock                      | 34 +++++++++++++++++++++++++--------
 crates/tek/Cargo.toml           |  2 +-
 crates/tek/src/midi/midi_rec.rs |  3 ++-
 rust-jack                       |  2 +-
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cf73e7ff..9b015ea2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -261,6 +261,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.5"
@@ -311,6 +320,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -442,10 +461,11 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 [[package]]
 name = "jack"
 version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78a4ae24f4ee29676aef8330fed1104e72f314cab16643dbeb61bfd99b4a8273"
 dependencies = [
+ "approx",
  "bitflags 2.6.0",
+ "crossbeam-channel",
+ "ctor",
  "jack-sys",
  "lazy_static",
  "libc",
@@ -455,10 +475,8 @@ dependencies = [
 [[package]]
 name = "jack-sys"
 version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6013b7619b95a22b576dfb43296faa4ecbe40abbdb97dfd22ead520775fc86ab"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "lazy_static",
  "libc",
  "libloading",
@@ -490,12 +508,12 @@ checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "winapi",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
diff --git a/crates/tek/Cargo.toml b/crates/tek/Cargo.toml
index 71d2ad10..00c324a6 100644
--- a/crates/tek/Cargo.toml
+++ b/crates/tek/Cargo.toml
@@ -11,7 +11,7 @@ backtrace = "0.3.72"
 better-panic = "0.3.0"
 clojure-reader = "0.1.0"
 crossterm = "0.27"
-jack = "0.13"
+jack = { path = "../../rust-jack" }
 livi = "0.7.4"
 midly = "0.5"
 once_cell = "1.19.0"
diff --git a/crates/tek/src/midi/midi_rec.rs b/crates/tek/src/midi/midi_rec.rs
index 02e75213..6d65e427 100644
--- a/crates/tek/src/midi/midi_rec.rs
+++ b/crates/tek/src/midi/midi_rec.rs
@@ -16,10 +16,11 @@ pub trait MidiRecordApi: HasClock + HasPlayPhrase + HasMidiIns {
     fn monitor (&mut self, scope: &ProcessScope, midi_buf: &mut Vec<Vec<Vec<u8>>>) {
         // For highlighting keys and note repeat
         let notes_in = self.notes_in().clone();
+        let monitoring = self.monitoring();
         for input in self.midi_ins_mut().iter() {
             for (sample, event, bytes) in parse_midi_input(input.iter(scope)) {
                 if let LiveEvent::Midi { message, .. } = event {
-                    if self.monitoring() {
+                    if monitoring {
                         midi_buf[sample].push(bytes.to_vec());
                     }
                     update_keys(&mut notes_in.write().unwrap(), &message);
diff --git a/rust-jack b/rust-jack
index 29e8b0be..5256af1d 160000
--- a/rust-jack
+++ b/rust-jack
@@ -1 +1 @@
-Subproject commit 29e8b0be4b34e4f0f669d34cecf9a4a638d27739
+Subproject commit 5256af1ddea221dd78f22e48c0a72a3842cad26d