Replace old implementation with contrib version.

examples/sine.rs

@@ -53,7 +53,7 @@ fn main() {
             // Continue as normal
             jack::Control::Continue
         },
-        move |_, _| jack::Control::Continue,
+        move |_, _, _| jack::Control::Continue,
     );
 
     // 4. Activate the client. Also connect the ports to the system audio.

src/client/handler_impls.rs

@@ -13,25 +13,5 @@ impl ProcessHandler for () {
 
 /// Wrap a closure that can handle the `process` callback. This is called every time data from ports
 /// is available from JACK.
-pub struct ClosureProcessHandler<F: 'static + Send + FnMut(&Client, &ProcessScope) -> Control> {
-    pub process_fn: F,
-}
-
-impl<F> ClosureProcessHandler<F>
-where
-    F: 'static + Send + FnMut(&Client, &ProcessScope) -> Control,
-{
-    #[deprecated = "Use jack::contrib::ClosureProcessHandler instead of jack::ClosureProcessHandler"]
-    pub fn new(f: F) -> ClosureProcessHandler<F> {
-        ClosureProcessHandler { process_fn: f }
-    }
-}
-
-impl<F> ProcessHandler for ClosureProcessHandler<F>
-where
-    F: 'static + Send + FnMut(&Client, &ProcessScope) -> Control,
-{
-    fn process(&mut self, c: &Client, ps: &ProcessScope) -> Control {
-        (self.process_fn)(c, ps)
-    }
-}
+#[deprecated = "Prefer using jack::contrib::ClosureProcessHandler directly."]
+pub type ClosureProcessHandler<F> = crate::contrib::ClosureProcessHandler<(), F>;

src/client/mod.rs

@@ -17,6 +17,7 @@ pub use self::client_options::ClientOptions;
 pub use self::client_status::ClientStatus;
 pub use self::common::CLIENT_NAME_SIZE;
 
+#[allow(deprecated)]
 pub use self::handler_impls::ClosureProcessHandler;
 
 // client.rs excluding functionality that involves ports or callbacks

src/lib.rs

@@ -33,9 +33,11 @@
 //! callback. For example, `Port<AudioIn>::as_mut_slice` returns a audio buffer that can be written
 //! to.
 
+#[allow(deprecated)]
+pub use crate::client::ClosureProcessHandler;
 pub use crate::client::{
-    AsyncClient, Client, ClientOptions, ClientStatus, ClosureProcessHandler, CycleTimes,
-    InternalClientID, NotificationHandler, ProcessHandler, ProcessScope, CLIENT_NAME_SIZE,
+    AsyncClient, Client, ClientOptions, ClientStatus, CycleTimes, InternalClientID,
+    NotificationHandler, ProcessHandler, ProcessScope, CLIENT_NAME_SIZE,
 };
 pub use crate::jack_enums::{Control, Error, LatencyType};
 pub use crate::logging::{set_logger, LoggerType};
@@ -68,6 +70,7 @@ mod properties;
 mod ringbuffer;
 mod transport;
 
+/// A collection of useful but optional functionality.
 pub mod contrib {
     mod closure;