implemented buffersizes for asio
This commit is contained in:
parent
6edee6c6c2
commit
9e660da433
11 changed files with 142 additions and 65 deletions
|
|
@ -19,6 +19,7 @@ pub enum AsioError {
|
|||
HardwareStuck,
|
||||
NoRate,
|
||||
ASE_NoMemory,
|
||||
InvalidBufferSize,
|
||||
UnknownError,
|
||||
}
|
||||
|
||||
|
|
@ -63,6 +64,7 @@ impl fmt::Display for AsioError {
|
|||
"sample clock or rate cannot be determined or is not present"
|
||||
),
|
||||
AsioError::ASE_NoMemory => write!(f, "not enough memory for completing the request"),
|
||||
AsioError::InvalidBufferSize => write!(f, "buffersize out of range for device"),
|
||||
AsioError::UnknownError => write!(f, "Error not in SDK"),
|
||||
}
|
||||
}
|
||||
|
|
@ -94,6 +96,7 @@ impl Error for AsioError {
|
|||
AsioError::HardwareStuck => "hardware is not running when sample position is inquired",
|
||||
AsioError::NoRate => "sample clock or rate cannot be determined or is not present",
|
||||
AsioError::ASE_NoMemory => "not enough memory for completing the request",
|
||||
AsioError::InvalidBufferSize => "buffersize out of range for device",
|
||||
AsioError::UnknownError => "Error not in SDK",
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -385,6 +385,14 @@ impl Driver {
|
|||
Ok(channel)
|
||||
}
|
||||
|
||||
/// Get the min and max supported buffersize of the driver.
|
||||
pub fn buffersize_range(&self) -> Result<(c_long, c_long), AsioError> {
|
||||
let buffer_sizes = asio_get_buffer_sizes()?;
|
||||
let min = buffer_sizes.min;
|
||||
let max = buffer_sizes.max;
|
||||
Ok((min, max))
|
||||
}
|
||||
|
||||
/// Get current sample rate of the driver.
|
||||
pub fn sample_rate(&self) -> Result<c_double, AsioError> {
|
||||
let mut rate: c_double = 0.0;
|
||||
|
|
@ -431,8 +439,10 @@ impl Driver {
|
|||
///
|
||||
/// This will destroy any already allocated buffers.
|
||||
///
|
||||
/// The preferred buffer size from ASIO is used.
|
||||
fn create_buffers(&self, buffer_infos: &mut [AsioBufferInfo]) -> Result<c_long, AsioError> {
|
||||
/// If buffersize is None then the preferred buffer size from ASIO is used,
|
||||
/// otherwise the desired buffersize is used if the requeted size is within
|
||||
/// the range of accepted buffersizes for the device.
|
||||
fn create_buffers(&self, buffer_infos: &mut [AsioBufferInfo], buffer_size: Option<i32>) -> Result<c_long, AsioError> {
|
||||
let num_channels = buffer_infos.len();
|
||||
|
||||
// To pass as ai::ASIOCallbacks
|
||||
|
|
@ -449,6 +459,17 @@ impl Driver {
|
|||
);
|
||||
}
|
||||
|
||||
let buffer_size = match buffer_size {
|
||||
Some(v) => {
|
||||
if v <= buffer_sizes.max {
|
||||
v
|
||||
} else {
|
||||
return Err(AsioError::InvalidBufferSize)
|
||||
}
|
||||
},
|
||||
None => buffer_sizes.pref,
|
||||
};
|
||||
|
||||
// Ensure the driver is in the `Initialized` state.
|
||||
if let DriverState::Running = *state {
|
||||
state.stop()?;
|
||||
|
|
@ -460,23 +481,27 @@ impl Driver {
|
|||
asio_result!(ai::ASIOCreateBuffers(
|
||||
buffer_infos.as_mut_ptr() as *mut _,
|
||||
num_channels as i32,
|
||||
buffer_sizes.pref,
|
||||
buffer_size,
|
||||
&mut callbacks as *mut _ as *mut _,
|
||||
))?;
|
||||
}
|
||||
*state = DriverState::Prepared;
|
||||
|
||||
Ok(buffer_sizes.pref)
|
||||
Ok(buffer_size)
|
||||
}
|
||||
|
||||
/// Creates the streams.
|
||||
///
|
||||
/// `buffer_size` sets the desired buffer_size. If None is passed in, then the
|
||||
/// default buffersize for the device is used.
|
||||
///
|
||||
/// Both input and output streams need to be created together as a single slice of
|
||||
/// `ASIOBufferInfo`.
|
||||
fn create_streams(
|
||||
&self,
|
||||
mut input_buffer_infos: Vec<AsioBufferInfo>,
|
||||
mut output_buffer_infos: Vec<AsioBufferInfo>,
|
||||
buffer_size: Option<i32>,
|
||||
) -> Result<AsioStreams, AsioError> {
|
||||
let (input, output) = match (
|
||||
input_buffer_infos.is_empty(),
|
||||
|
|
@ -489,7 +514,7 @@ impl Driver {
|
|||
let mut all_buffer_infos = input_buffer_infos;
|
||||
all_buffer_infos.append(&mut output_buffer_infos);
|
||||
// Create the buffers. On success, split the output and input again.
|
||||
let buffer_size = self.create_buffers(&mut all_buffer_infos)?;
|
||||
let buffer_size = self.create_buffers(&mut all_buffer_infos, buffer_size)?;
|
||||
let output_buffer_infos = all_buffer_infos.split_off(split_point);
|
||||
let input_buffer_infos = all_buffer_infos;
|
||||
let input = Some(AsioStream {
|
||||
|
|
@ -504,7 +529,7 @@ impl Driver {
|
|||
}
|
||||
// Just input
|
||||
(false, true) => {
|
||||
let buffer_size = self.create_buffers(&mut input_buffer_infos)?;
|
||||
let buffer_size = self.create_buffers(&mut input_buffer_infos, buffer_size)?;
|
||||
let input = Some(AsioStream {
|
||||
buffer_infos: input_buffer_infos,
|
||||
buffer_size,
|
||||
|
|
@ -514,7 +539,7 @@ impl Driver {
|
|||
}
|
||||
// Just output
|
||||
(true, false) => {
|
||||
let buffer_size = self.create_buffers(&mut output_buffer_infos)?;
|
||||
let buffer_size = self.create_buffers(&mut output_buffer_infos, buffer_size)?;
|
||||
let input = None;
|
||||
let output = Some(AsioStream {
|
||||
buffer_infos: output_buffer_infos,
|
||||
|
|
@ -536,18 +561,22 @@ impl Driver {
|
|||
/// For this reason we take the output stream if it exists.
|
||||
///
|
||||
/// `num_channels` is the desired number of input channels.
|
||||
///
|
||||
/// `buffer_size` sets the desired buffer_size. If None is passed in, then the
|
||||
/// default buffersize for the device is used.
|
||||
///
|
||||
/// This returns a full AsioStreams with both input and output if output was active.
|
||||
pub fn prepare_input_stream(
|
||||
&self,
|
||||
output: Option<AsioStream>,
|
||||
num_channels: usize,
|
||||
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);
|
||||
self.create_streams(input_buffer_infos, output_buffer_infos)
|
||||
self.create_streams(input_buffer_infos, output_buffer_infos, buffer_size)
|
||||
}
|
||||
|
||||
/// Prepare the output stream.
|
||||
|
|
@ -559,17 +588,21 @@ impl Driver {
|
|||
///
|
||||
/// `num_channels` is the desired number of output channels.
|
||||
///
|
||||
/// `buffer_size` sets the desired buffer_size. If None is passed in, then the
|
||||
/// default buffersize for the device is used.
|
||||
///
|
||||
/// This returns a full AsioStreams with both input and output if input was active.
|
||||
pub fn prepare_output_stream(
|
||||
&self,
|
||||
input: Option<AsioStream>,
|
||||
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 output_buffer_infos = prepare_buffer_infos(false, num_channels);
|
||||
self.create_streams(input_buffer_infos, output_buffer_infos)
|
||||
self.create_streams(input_buffer_infos, output_buffer_infos, buffer_size)
|
||||
}
|
||||
|
||||
/// Releases buffers allocations.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue