From 6ecfec4ed0e4e31f816f90831014f3a701de2e7d Mon Sep 17 00:00:00 2001
From: Will <wmedrano@users.noreply.github.com>
Date: Mon, 9 Sep 2024 18:15:56 -0700
Subject: [PATCH] Bump Jack to v0.12 (#910)

* Bump to version 0.12.

* Fix some cargo clippy lints.

* Partially revert temp_buffer_to_data to be closer to original.

* Suppress too many arguments lint.
---
 Cargo.toml              |  2 +-
 src/host/jack/mod.rs    |  7 ++-----
 src/host/jack/stream.rs | 27 ++++++++++++++-------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5ccf1776b..0d955d6d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ num-traits = { version = "0.2.6", optional = true }
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd"))'.dependencies]
 alsa = "0.9"
 libc = "0.2"
-jack = { version = "0.11", optional = true }
+jack = { version = "0.12", optional = true }
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 core-foundation-sys = "0.8.2" # For linking to CoreFoundation.framework and handling device name `CFString`s.
diff --git a/src/host/jack/mod.rs b/src/host/jack/mod.rs
index e1e244e96..d4a28ecea 100644
--- a/src/host/jack/mod.rs
+++ b/src/host/jack/mod.rs
@@ -170,11 +170,8 @@ fn get_client(name: &str, client_options: jack::ClientOptions) -> Result<jack::C
             } else if status.intersects(jack::ClientStatus::INVALID_OPTION) {
                 return Err(String::from("Error connecting to JACK server: The operation contained an invalid or unsupported option!"));
             }
-
-            return Ok(client);
-        }
-        Err(e) => {
-            return Err(format!("Failed to open client because of error: {:?}", e));
+            Ok(client)
         }
+        Err(e) => Err(format!("Failed to open client because of error: {:?}", e)),
     }
 }
diff --git a/src/host/jack/stream.rs b/src/host/jack/stream.rs
index 95a3e3b40..820e22ccc 100644
--- a/src/host/jack/stream.rs
+++ b/src/host/jack/stream.rs
@@ -37,7 +37,7 @@ impl Stream {
         let mut port_names: Vec<String> = vec![];
         // Create ports
         for i in 0..channels {
-            let port_try = client.register_port(&format!("in_{}", i), jack::AudioIn::default());
+            let port_try = client.register_port(&format!("in_{}", i), jack::AudioIn);
             match port_try {
                 Ok(port) => {
                     // Get the port name in order to later connect it automatically
@@ -102,7 +102,7 @@ impl Stream {
         let mut port_names: Vec<String> = vec![];
         // Create ports
         for i in 0..channels {
-            let port_try = client.register_port(&format!("out_{}", i), jack::AudioOut::default());
+            let port_try = client.register_port(&format!("out_{}", i), jack::AudioOut);
             match port_try {
                 Ok(port) => {
                     // Get the port name in order to later connect it automatically
@@ -218,6 +218,9 @@ impl StreamTrait for Stream {
     }
 }
 
+type InputDataCallback = Box<dyn FnMut(&Data, &InputCallbackInfo) + Send + 'static>;
+type OutputDataCallback = Box<dyn FnMut(&mut Data, &OutputCallbackInfo) + Send + 'static>;
+
 struct LocalProcessHandler {
     /// No new ports are allowed to be created after the creation of the LocalProcessHandler as that would invalidate the buffer sizes
     out_ports: Vec<jack::Port<jack::AudioOut>>,
@@ -225,8 +228,8 @@ struct LocalProcessHandler {
 
     sample_rate: SampleRate,
     buffer_size: usize,
-    input_data_callback: Option<Box<dyn FnMut(&Data, &InputCallbackInfo) + Send + 'static>>,
-    output_data_callback: Option<Box<dyn FnMut(&mut Data, &OutputCallbackInfo) + Send + 'static>>,
+    input_data_callback: Option<InputDataCallback>,
+    output_data_callback: Option<OutputDataCallback>,
 
     // JACK audio samples are 32-bit float (unless you do some custom dark magic)
     temp_input_buffer: Vec<f32>,
@@ -238,15 +241,14 @@ struct LocalProcessHandler {
 }
 
 impl LocalProcessHandler {
+    #[allow(too_many_arguments)]
     fn new(
         out_ports: Vec<jack::Port<jack::AudioOut>>,
         in_ports: Vec<jack::Port<jack::AudioIn>>,
         sample_rate: SampleRate,
         buffer_size: usize,
-        input_data_callback: Option<Box<dyn FnMut(&Data, &InputCallbackInfo) + Send + 'static>>,
-        output_data_callback: Option<
-            Box<dyn FnMut(&mut Data, &OutputCallbackInfo) + Send + 'static>,
-        >,
+        input_data_callback: Option<InputDataCallback>,
+        output_data_callback: Option<OutputDataCallback>,
         playing: Arc<AtomicBool>,
         error_callback_ptr: ErrorCallbackPtr,
     ) -> Self {
@@ -270,12 +272,11 @@ impl LocalProcessHandler {
     }
 }
 
-fn temp_buffer_to_data(temp_input_buffer: &mut Vec<f32>, total_buffer_size: usize) -> Data {
-    let slice = &temp_input_buffer[0..total_buffer_size];
-    let data = slice.as_ptr() as *mut ();
+fn temp_buffer_to_data(temp_input_buffer: &mut [f32], total_buffer_size: usize) -> Data {
+    let slice = &mut temp_input_buffer[0..total_buffer_size];
+    let data: *mut () = slice.as_mut_ptr().cast();
     let len = total_buffer_size;
-    let data = unsafe { Data::from_parts(data, len, JACK_SAMPLE_FORMAT) };
-    data
+    unsafe { Data::from_parts(data, len, JACK_SAMPLE_FORMAT) }
 }
 
 impl jack::ProcessHandler for LocalProcessHandler {