parent
bbb58ab767
commit
52c7a9d680
6 changed files with 34 additions and 33 deletions
|
|
@ -2,5 +2,6 @@
|
|||
#![allow(non_camel_case_types)]
|
||||
#![allow(non_snake_case)]
|
||||
#![allow(dead_code)]
|
||||
#![allow(clippy::missing_safety_doc)]
|
||||
|
||||
include!(concat!(env!("OUT_DIR"), "/asio_bindings.rs"));
|
||||
|
|
|
|||
|
|
@ -43,15 +43,14 @@ impl fmt::Display for LoadDriverError {
|
|||
LoadDriverError::LoadDriverFailed => {
|
||||
write!(
|
||||
f,
|
||||
"{}",
|
||||
"ASIO `loadDriver` function returned `false` indicating failure"
|
||||
)
|
||||
}
|
||||
LoadDriverError::InitializationFailed(ref err) => {
|
||||
write!(f, "{}", err)
|
||||
write!(f, "{err}")
|
||||
}
|
||||
LoadDriverError::DriverAlreadyExists => {
|
||||
write!(f, "{}", "ASIO only supports loading one driver at a time")
|
||||
write!(f, "ASIO only supports loading one driver at a time")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,14 @@ pub mod errors;
|
|||
|
||||
use self::errors::{AsioError, AsioErrorWrapper, LoadDriverError};
|
||||
use num_traits::FromPrimitive;
|
||||
use once_cell::sync::Lazy;
|
||||
use std::ffi::CStr;
|
||||
use std::ffi::CString;
|
||||
|
||||
use std::ffi::{CStr, CString};
|
||||
use std::os::raw::{c_char, c_double, c_long, c_void};
|
||||
use std::sync::{Arc, Mutex, MutexGuard, Weak};
|
||||
use std::ptr::null_mut;
|
||||
use std::sync::{
|
||||
atomic::{AtomicBool, Ordering},
|
||||
Arc, Mutex, MutexGuard, Weak,
|
||||
};
|
||||
|
||||
// Bindings import
|
||||
use self::asio_import as ai;
|
||||
|
|
@ -16,7 +19,7 @@ use self::asio_import as ai;
|
|||
/// A handle to the ASIO API.
|
||||
///
|
||||
/// There should only be one instance of this type at any point in time.
|
||||
#[derive(Debug)]
|
||||
#[derive(Debug, Default)]
|
||||
pub struct Asio {
|
||||
// Keeps track of whether or not a driver is already loaded.
|
||||
//
|
||||
|
|
@ -307,18 +310,15 @@ pub struct CallbackId(usize);
|
|||
///
|
||||
/// This is required because of how ASIO calls the `buffer_switch` function with no data
|
||||
/// parameters.
|
||||
///
|
||||
/// Options are used so that when a callback is removed we don't change the Vec indices.
|
||||
///
|
||||
/// The indices are how we match a callback with a stream.
|
||||
static BUFFER_CALLBACK: Lazy<Mutex<Vec<(CallbackId, BufferCallback)>>> =
|
||||
Lazy::new(|| Mutex::new(Vec::new()));
|
||||
static BUFFER_CALLBACK: Mutex<Vec<(CallbackId, BufferCallback)>> = Mutex::new(Vec::new());
|
||||
|
||||
/// Indicates that ASIOOutputReady should be called
|
||||
static CALL_OUTPUT_READY: AtomicBool = AtomicBool::new(false);
|
||||
|
||||
impl Asio {
|
||||
/// Initialise the ASIO API.
|
||||
pub fn new() -> Self {
|
||||
let loaded_driver = Mutex::new(Weak::new());
|
||||
Asio { loaded_driver }
|
||||
Self::default()
|
||||
}
|
||||
|
||||
/// Returns the name for each available driver.
|
||||
|
|
@ -334,7 +334,7 @@ impl Asio {
|
|||
let mut driver_names: [[c_char; MAX_DRIVER_NAME_LEN]; MAX_DRIVERS] =
|
||||
[[0; MAX_DRIVER_NAME_LEN]; MAX_DRIVERS];
|
||||
// Pointer to each driver name.
|
||||
let mut driver_name_ptrs: [*mut i8; MAX_DRIVERS] = [0 as *mut i8; MAX_DRIVERS];
|
||||
let mut driver_name_ptrs: [*mut i8; MAX_DRIVERS] = [null_mut(); MAX_DRIVERS];
|
||||
for (ptr, name) in driver_name_ptrs.iter_mut().zip(&mut driver_names[..]) {
|
||||
*ptr = (*name).as_mut_ptr();
|
||||
}
|
||||
|
|
@ -525,6 +525,11 @@ impl Driver {
|
|||
None => buffer_sizes.pref,
|
||||
};
|
||||
|
||||
CALL_OUTPUT_READY.store(
|
||||
asio_result!(unsafe { ai::ASIOOutputReady() }).is_ok(),
|
||||
Ordering::Release,
|
||||
);
|
||||
|
||||
// Ensure the driver is in the `Initialized` state.
|
||||
if let DriverState::Running = *state {
|
||||
state.stop()?;
|
||||
|
|
@ -628,9 +633,7 @@ impl Driver {
|
|||
buffer_size: Option<i32>,
|
||||
) -> Result<AsioStreams, AsioError> {
|
||||
let input_buffer_infos = prepare_buffer_infos(true, num_channels);
|
||||
let output_buffer_infos = output
|
||||
.map(|output| output.buffer_infos)
|
||||
.unwrap_or_else(Vec::new);
|
||||
let output_buffer_infos = output.map(|output| output.buffer_infos).unwrap_or_default();
|
||||
self.create_streams(input_buffer_infos, output_buffer_infos, buffer_size)
|
||||
}
|
||||
|
||||
|
|
@ -653,9 +656,7 @@ impl Driver {
|
|||
num_channels: usize,
|
||||
buffer_size: Option<i32>,
|
||||
) -> Result<AsioStreams, AsioError> {
|
||||
let input_buffer_infos = input
|
||||
.map(|input| input.buffer_infos)
|
||||
.unwrap_or_else(Vec::new);
|
||||
let input_buffer_infos = input.map(|input| input.buffer_infos).unwrap_or_default();
|
||||
let output_buffer_infos = prepare_buffer_infos(false, num_channels);
|
||||
self.create_streams(input_buffer_infos, output_buffer_infos, buffer_size)
|
||||
}
|
||||
|
|
@ -903,7 +904,7 @@ fn _channel_name_to_utf8(bytes: &[c_char]) -> std::borrow::Cow<str> {
|
|||
/// Indicates the stream sample rate has changed.
|
||||
///
|
||||
/// TODO: Provide some way of allowing CPAL to handle this.
|
||||
extern "C" fn sample_rate_did_change(s_rate: c_double) -> () {
|
||||
extern "C" fn sample_rate_did_change(s_rate: c_double) {
|
||||
eprintln!("unhandled sample rate change to {}", s_rate);
|
||||
}
|
||||
|
||||
|
|
@ -1002,6 +1003,11 @@ extern "C" fn buffer_switch_time_info(
|
|||
for &mut (_, ref mut bc) in bcs.iter_mut() {
|
||||
bc.run(&callback_info);
|
||||
}
|
||||
|
||||
if CALL_OUTPUT_READY.load(Ordering::Acquire) {
|
||||
unsafe { ai::ASIOOutputReady() };
|
||||
}
|
||||
|
||||
time
|
||||
}
|
||||
|
||||
|
|
@ -1010,7 +1016,7 @@ extern "C" fn buffer_switch_time_info(
|
|||
/// Here we run the callback for each stream.
|
||||
///
|
||||
/// `double_buffer_index` is either `0` or `1` indicating which buffer to fill.
|
||||
extern "C" fn buffer_switch(double_buffer_index: c_long, direct_process: c_long) -> () {
|
||||
extern "C" fn buffer_switch(double_buffer_index: c_long, direct_process: c_long) {
|
||||
// Emulate the time info provided by the `buffer_switch_time_info` callback.
|
||||
// This is an attempt at matching the behaviour in `hostsample.cpp` from the SDK.
|
||||
let mut time = unsafe {
|
||||
|
|
@ -1041,7 +1047,7 @@ extern "C" fn buffer_switch(double_buffer_index: c_long, direct_process: c_long)
|
|||
// kSampleRateChanged = 1 << 4,
|
||||
// kClockSourceChanged = 1 << 5
|
||||
// } AsioTimeInfoFlags;
|
||||
.0 as i32;
|
||||
.0;
|
||||
}
|
||||
time
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue