From f46430828d5043025aa4b48186654e670b312007 Mon Sep 17 00:00:00 2001 From: mizuki0629 Date: Fri, 14 Apr 2023 20:00:45 +0900 Subject: [PATCH] Remove unnecessary Lazy Mutex --- asio-sys/src/bindings/mod.rs | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/asio-sys/src/bindings/mod.rs b/asio-sys/src/bindings/mod.rs index c39b8c8..e4eef14 100644 --- a/asio-sys/src/bindings/mod.rs +++ b/asio-sys/src/bindings/mod.rs @@ -186,14 +186,12 @@ struct AsioCallbacks { ) -> *mut ai::ASIOTime, } -static ASIO_CALLBACKS: Lazy> = Lazy::new(|| { - Mutex::new(AsioCallbacks { - buffer_switch, - sample_rate_did_change, - asio_message, - buffer_switch_time_info, - }) -}); +static ASIO_CALLBACKS: AsioCallbacks = AsioCallbacks { + buffer_switch, + sample_rate_did_change, + asio_message, + buffer_switch_time_info, +}; /// All the possible types from ASIO. /// This is a direct copy of the asioMessage selectors @@ -534,16 +532,12 @@ impl Driver { if let DriverState::Prepared = *state { state.dispose_buffers()?; } - - // To pass as ai::ASIOCallbacks - let callbacks = &mut (*ASIO_CALLBACKS.lock().unwrap()); - unsafe { asio_result!(ai::ASIOCreateBuffers( buffer_infos.as_mut_ptr() as *mut _, num_channels as i32, buffer_size, - callbacks as *mut _ as *mut _, + &ASIO_CALLBACKS as *const _ as *mut _, ))?; } *state = DriverState::Prepared;