Merge pull request #777 from mizuki0629/asio-sys

Remove unnecessary Lazy Mutex
This commit is contained in:
est31 2023-04-14 13:43:00 +02:00 • committed by GitHub
commit d4ba28df73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -186,14 +186,12 @@ struct AsioCallbacks {
) -> *mut ai::ASIOTime, ) -> *mut ai::ASIOTime,
} }
static ASIO_CALLBACKS: Lazy<Mutex<AsioCallbacks>> = Lazy::new(|| { static ASIO_CALLBACKS: AsioCallbacks = AsioCallbacks {
Mutex::new(AsioCallbacks { buffer_switch,
buffer_switch, sample_rate_did_change,
sample_rate_did_change, asio_message,
asio_message, buffer_switch_time_info,
buffer_switch_time_info, };
})
});
/// All the possible types from ASIO. /// All the possible types from ASIO.
/// This is a direct copy of the asioMessage selectors /// This is a direct copy of the asioMessage selectors
@ -534,16 +532,12 @@ impl Driver {
if let DriverState::Prepared = *state { if let DriverState::Prepared = *state {
state.dispose_buffers()?; state.dispose_buffers()?;
} }
// To pass as ai::ASIOCallbacks
let callbacks = &mut (*ASIO_CALLBACKS.lock().unwrap());
unsafe { unsafe {
asio_result!(ai::ASIOCreateBuffers( asio_result!(ai::ASIOCreateBuffers(
buffer_infos.as_mut_ptr() as *mut _, buffer_infos.as_mut_ptr() as *mut _,
num_channels as i32, num_channels as i32,
buffer_size, buffer_size,
callbacks as *mut _ as *mut _, &ASIO_CALLBACKS as *const _ as *mut _,
))?; ))?;
} }
*state = DriverState::Prepared; *state = DriverState::Prepared;