sharing asio streams
This commit is contained in:
parent
76eb07a274
commit
8193bc9f79
2 changed files with 363 additions and 345 deletions
|
|
@ -16,7 +16,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
|
|||
use SampleFormat;
|
||||
|
||||
pub struct EventLoop {
|
||||
asio_streams: Arc<Mutex<Vec<Option<sys::AsioStream>>>>,
|
||||
asio_streams: Arc<Mutex<sys::AsioStreams>>,
|
||||
stream_count: AtomicUsize,
|
||||
callbacks: Arc<Mutex<Vec<&'static mut (FnMut(StreamId, StreamData) + Send)>>>,
|
||||
}
|
||||
|
|
@ -55,12 +55,58 @@ struct Buffers {
|
|||
impl EventLoop {
|
||||
pub fn new() -> EventLoop {
|
||||
EventLoop {
|
||||
asio_streams: Arc::new(Mutex::new(Vec::new())),
|
||||
asio_streams: Arc::new(Mutex::new(sys::AsioStreams{input: None, output: None})),
|
||||
stream_count: AtomicUsize::new(0),
|
||||
callbacks: Arc::new(Mutex::new(Vec::new())),
|
||||
}
|
||||
}
|
||||
|
||||
fn get_input_stream(&self, drivers: &sys::Drivers, num_channels: usize) -> Result<usize, CreationError> {
|
||||
let ref mut streams = *self.asio_streams.lock().unwrap();
|
||||
match streams.input {
|
||||
Some(ref input) => Ok(input.buffer_size as usize),
|
||||
None => {
|
||||
let output = streams.output.take();
|
||||
drivers.prepare_input_stream(output, num_channels)
|
||||
.map(|new_streams| {
|
||||
let bs = match new_streams.input {
|
||||
Some(ref inp) => inp.buffer_size as usize,
|
||||
None => unreachable!(),
|
||||
};
|
||||
*streams = new_streams;
|
||||
bs
|
||||
})
|
||||
.map_err(|ref e| {
|
||||
println!("Error preparing stream: {}", e);
|
||||
CreationError::DeviceNotAvailable
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn get_output_stream(&self, drivers: &sys::Drivers, num_channels: usize) -> Result<usize, CreationError> {
|
||||
let ref mut streams = *self.asio_streams.lock().unwrap();
|
||||
match streams.output {
|
||||
Some(ref output) => Ok(output.buffer_size as usize),
|
||||
None => {
|
||||
let input = streams.input.take();
|
||||
drivers.prepare_output_stream(input, num_channels)
|
||||
.map(|new_streams| {
|
||||
let bs = match new_streams.output {
|
||||
Some(ref out) => out.buffer_size as usize,
|
||||
None => unreachable!(),
|
||||
};
|
||||
*streams = new_streams;
|
||||
bs
|
||||
})
|
||||
.map_err(|ref e| {
|
||||
println!("Error preparing stream: {}", e);
|
||||
CreationError::DeviceNotAvailable
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build_input_stream(
|
||||
&self,
|
||||
device: &Device,
|
||||
|
|
@ -72,190 +118,20 @@ impl EventLoop {
|
|||
} = device;
|
||||
let num_channels = format.channels.clone();
|
||||
let stream_type = drivers.get_data_type().expect("Couldn't load data type");
|
||||
match drivers.prepare_input_stream(num_channels as usize) {
|
||||
Ok(stream) => {
|
||||
let cpal_num_samples =
|
||||
(stream.buffer_size as usize) * num_channels as usize;
|
||||
{
|
||||
self.asio_streams.lock().unwrap().push(Some(stream));
|
||||
}
|
||||
let count = self.stream_count.load(Ordering::SeqCst);
|
||||
self.stream_count.store(count + 1, Ordering::SeqCst);
|
||||
let asio_streams = self.asio_streams.clone();
|
||||
let callbacks = self.callbacks.clone();
|
||||
let bytes_per_channel = format.data_type.sample_size();
|
||||
|
||||
// Create buffers
|
||||
let channel_len = cpal_num_samples
|
||||
/ num_channels as usize;
|
||||
|
||||
|
||||
let mut buffers = match format.data_type{
|
||||
SampleFormat::I16 => {
|
||||
Buffers{
|
||||
i16_buff: I16Buffer{
|
||||
cpal: vec![0 as i16; cpal_num_samples],
|
||||
channel: (0..num_channels)
|
||||
.map(|_| Vec::with_capacity(channel_len))
|
||||
.collect()},
|
||||
u16_buff: U16Buffer::default(),
|
||||
f32_buff: F32Buffer::default(),
|
||||
}
|
||||
}
|
||||
SampleFormat::U16 => {
|
||||
Buffers{
|
||||
i16_buff: I16Buffer::default(),
|
||||
u16_buff: U16Buffer{
|
||||
cpal: vec![0 as u16; cpal_num_samples],
|
||||
channel: (0..num_channels)
|
||||
.map(|_| Vec::with_capacity(channel_len))
|
||||
.collect()},
|
||||
f32_buff: F32Buffer::default(),
|
||||
}
|
||||
}
|
||||
SampleFormat::F32 => {
|
||||
Buffers{
|
||||
i16_buff: I16Buffer::default(),
|
||||
u16_buff: U16Buffer::default(),
|
||||
f32_buff: F32Buffer{
|
||||
cpal: vec![0 as f32; cpal_num_samples],
|
||||
channel: (0..num_channels)
|
||||
.map(|_| Vec::with_capacity(channel_len))
|
||||
.collect()},
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
sys::set_callback(true, move |index| unsafe {
|
||||
if let Some(ref asio_stream) = asio_streams.lock().unwrap()[count - 1] {
|
||||
// Number of samples needed total
|
||||
let mut callbacks = callbacks.lock().unwrap();
|
||||
|
||||
// Assuming only one callback, probably needs to change
|
||||
match callbacks.first_mut() {
|
||||
Some(callback) => {
|
||||
macro_rules! try_callback {
|
||||
($SampleFormat:ident,
|
||||
$SampleType:ty,
|
||||
$SampleTypeIdent:ident,
|
||||
$AsioType:ty,
|
||||
$AsioTypeIdent:ident,
|
||||
$Buffers:expr,
|
||||
$BuffersType:ty,
|
||||
$BuffersTypeIdent:ident
|
||||
) => {
|
||||
|
||||
// For each channel write the cpal data to
|
||||
// the asio buffer
|
||||
// Also need to check for Endian
|
||||
|
||||
for (i, channel) in $Buffers.channel.iter_mut().enumerate(){
|
||||
let buff_ptr = asio_stream
|
||||
.buffer_infos[i]
|
||||
.buffers[index as usize] as *mut $AsioType;
|
||||
let asio_buffer: &'static [$AsioType] =
|
||||
std::slice::from_raw_parts(
|
||||
buff_ptr,
|
||||
asio_stream.buffer_size as usize);
|
||||
for asio_s in asio_buffer.iter(){
|
||||
channel.push( (*asio_s as i64 *
|
||||
::std::$SampleTypeIdent::MAX as i64 /
|
||||
::std::$AsioTypeIdent::MAX as i64) as $SampleType);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// interleave all the channels
|
||||
{
|
||||
let $BuffersTypeIdent {
|
||||
cpal: ref mut c_buffer,
|
||||
channel: ref mut channels,
|
||||
} = $Buffers;
|
||||
au::interleave(&channels, c_buffer);
|
||||
for c in channels.iter_mut() {
|
||||
c.clear();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
let buff = InputBuffer{
|
||||
buffer: &mut $Buffers.cpal,
|
||||
};
|
||||
callback(
|
||||
StreamId(count),
|
||||
StreamData::Input{
|
||||
buffer: UnknownTypeInputBuffer::$SampleFormat(
|
||||
::InputBuffer{
|
||||
buffer: Some(super::super::InputBuffer::Asio(buff))
|
||||
})
|
||||
}
|
||||
);
|
||||
}
|
||||
};
|
||||
// Generic over types
|
||||
// TODO check for endianess
|
||||
match stream_type {
|
||||
sys::AsioSampleType::ASIOSTInt32LSB => {
|
||||
try_callback!(I16, i16, i16, i32, i32,
|
||||
buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTInt16LSB => {
|
||||
try_callback!(I16, i16, i16, i16, i16,
|
||||
buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTFloat32LSB => {
|
||||
try_callback!(F32, f32, f32, f32, f32,
|
||||
buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTFloat64LSB => {
|
||||
try_callback!(F32, f32, f32, f64, f64,
|
||||
buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
}
|
||||
_ => println!("unsupported format {:?}", stream_type),
|
||||
}
|
||||
}
|
||||
None => return (),
|
||||
}
|
||||
}
|
||||
});
|
||||
Ok(StreamId(count))
|
||||
}
|
||||
Err(ref e) => {
|
||||
println!("Error preparing stream: {}", e);
|
||||
Err(CreationError::DeviceNotAvailable)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build_output_stream(
|
||||
&self,
|
||||
device: &Device,
|
||||
format: &Format,
|
||||
) -> Result<StreamId, CreationError> {
|
||||
let Device {
|
||||
drivers,
|
||||
..
|
||||
} = device;
|
||||
let num_channels = format.channels.clone();
|
||||
let stream_type = drivers.get_data_type().expect("Couldn't load data type");
|
||||
match drivers.prepare_output_stream(num_channels as usize) {
|
||||
Ok(stream) => {
|
||||
let cpal_num_samples =
|
||||
(stream.buffer_size as usize) * num_channels as usize;
|
||||
{
|
||||
self.asio_streams.lock().unwrap().push(Some(stream));
|
||||
}
|
||||
self.get_input_stream(&drivers, num_channels as usize).map(|stream_buffer_size| {
|
||||
let cpal_num_samples = stream_buffer_size * num_channels as usize;
|
||||
let count = self.stream_count.load(Ordering::SeqCst);
|
||||
self.stream_count.store(count + 1, Ordering::SeqCst);
|
||||
let asio_streams = self.asio_streams.clone();
|
||||
let callbacks = self.callbacks.clone();
|
||||
let bytes_per_channel = format.data_type.sample_size();
|
||||
|
||||
// Create buffers
|
||||
let channel_len = cpal_num_samples
|
||||
/ num_channels as usize;
|
||||
|
||||
|
||||
let mut re_buffers = match format.data_type{
|
||||
let mut buffers = match format.data_type{
|
||||
SampleFormat::I16 => {
|
||||
Buffers{
|
||||
i16_buff: I16Buffer{
|
||||
|
|
@ -291,8 +167,8 @@ pub fn build_output_stream(
|
|||
}
|
||||
};
|
||||
|
||||
sys::set_callback(false, move |index| unsafe {
|
||||
if let Some(ref asio_stream) = asio_streams.lock().unwrap()[count - 1] {
|
||||
sys::set_callback(move |index| unsafe {
|
||||
if let Some(ref asio_stream) = asio_streams.lock().unwrap().input {
|
||||
// Number of samples needed total
|
||||
let mut callbacks = callbacks.lock().unwrap();
|
||||
|
||||
|
|
@ -301,81 +177,80 @@ pub fn build_output_stream(
|
|||
Some(callback) => {
|
||||
macro_rules! try_callback {
|
||||
($SampleFormat:ident,
|
||||
$SampleType:ty,
|
||||
$SampleTypeIdent:ident,
|
||||
$AsioType:ty,
|
||||
$AsioTypeIdent:ident,
|
||||
$Buffers:expr,
|
||||
$BuffersType:ty,
|
||||
$BuffersTypeIdent:ident
|
||||
) => {
|
||||
let mut my_buffers = $Buffers;
|
||||
// Buffer that is filled by cpal.
|
||||
//let mut cpal_buffer: Vec<$SampleType> = vec![0 as $SampleType; cpal_num_samples];
|
||||
// Call in block because of mut borrow
|
||||
{
|
||||
let buff = OutputBuffer{
|
||||
buffer: &mut my_buffers.cpal
|
||||
};
|
||||
callback(
|
||||
StreamId(count),
|
||||
StreamData::Output{
|
||||
buffer: UnknownTypeOutputBuffer::$SampleFormat(
|
||||
::OutputBuffer{
|
||||
target: Some(super::super::OutputBuffer::Asio(buff))
|
||||
})
|
||||
}
|
||||
);
|
||||
}
|
||||
// Deinter all the channels
|
||||
{
|
||||
let $BuffersTypeIdent {
|
||||
cpal: ref mut c_buffer,
|
||||
channel: ref mut channels,
|
||||
} = my_buffers;
|
||||
au::deinterleave(&c_buffer[..], channels);
|
||||
}
|
||||
$SampleType:ty,
|
||||
$SampleTypeIdent:ident,
|
||||
$AsioType:ty,
|
||||
$AsioTypeIdent:ident,
|
||||
$Buffers:expr,
|
||||
$BuffersType:ty,
|
||||
$BuffersTypeIdent:ident
|
||||
) => {
|
||||
|
||||
// For each channel write the cpal data to
|
||||
// the asio buffer
|
||||
// Also need to check for Endian
|
||||
for (i, channel) in my_buffers.channel.iter().enumerate(){
|
||||
let buff_ptr = (asio_stream
|
||||
|
||||
for (i, channel) in $Buffers.channel.iter_mut().enumerate(){
|
||||
let buff_ptr = asio_stream
|
||||
.buffer_infos[i]
|
||||
.buffers[index as usize] as *mut $AsioType)
|
||||
.offset(asio_stream.buffer_size as isize * i as isize);
|
||||
let asio_buffer: &'static mut [$AsioType] =
|
||||
std::slice::from_raw_parts_mut(
|
||||
.buffers[index as usize] as *mut $AsioType;
|
||||
let asio_buffer: &'static [$AsioType] =
|
||||
std::slice::from_raw_parts(
|
||||
buff_ptr,
|
||||
asio_stream.buffer_size as usize);
|
||||
for (asio_s, cpal_s) in asio_buffer.iter_mut()
|
||||
.zip(channel){
|
||||
*asio_s = (*cpal_s as i64 *
|
||||
::std::$AsioTypeIdent::MAX as i64 /
|
||||
::std::$SampleTypeIdent::MAX as i64) as $AsioType;
|
||||
}
|
||||
|
||||
for asio_s in asio_buffer.iter(){
|
||||
channel.push( (*asio_s as i64 *
|
||||
::std::$SampleTypeIdent::MAX as i64 /
|
||||
::std::$AsioTypeIdent::MAX as i64) as $SampleType);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
// interleave all the channels
|
||||
{
|
||||
let $BuffersTypeIdent {
|
||||
cpal: ref mut c_buffer,
|
||||
channel: ref mut channels,
|
||||
} = $Buffers;
|
||||
au::interleave(&channels, c_buffer);
|
||||
for c in channels.iter_mut() {
|
||||
c.clear();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
let buff = InputBuffer{
|
||||
buffer: &mut $Buffers.cpal,
|
||||
};
|
||||
callback(
|
||||
StreamId(count),
|
||||
StreamData::Input{
|
||||
buffer: UnknownTypeInputBuffer::$SampleFormat(
|
||||
::InputBuffer{
|
||||
buffer: Some(super::super::InputBuffer::Asio(buff))
|
||||
})
|
||||
}
|
||||
);
|
||||
}
|
||||
};
|
||||
// Generic over types
|
||||
// TODO check for endianess
|
||||
match stream_type {
|
||||
sys::AsioSampleType::ASIOSTInt32LSB => {
|
||||
try_callback!(I16, i16, i16, i32, i32,
|
||||
&mut re_buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTInt16LSB => {
|
||||
try_callback!(I16, i16, i16, i16, i16,
|
||||
&mut re_buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTFloat32LSB => {
|
||||
try_callback!(F32, f32, f32, f32, f32,
|
||||
&mut re_buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTFloat64LSB => {
|
||||
try_callback!(F32, f32, f32, f64, f64,
|
||||
&mut re_buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
}
|
||||
_ => println!("unsupported format {:?}", stream_type),
|
||||
}
|
||||
|
|
@ -384,13 +259,166 @@ pub fn build_output_stream(
|
|||
}
|
||||
}
|
||||
});
|
||||
Ok(StreamId(count))
|
||||
}
|
||||
Err(ref e) => {
|
||||
println!("Error preparing stream: {}", e);
|
||||
Err(CreationError::DeviceNotAvailable)
|
||||
}
|
||||
StreamId(count)
|
||||
})
|
||||
}
|
||||
|
||||
pub fn build_output_stream(
|
||||
&self,
|
||||
device: &Device,
|
||||
format: &Format,
|
||||
) -> Result<StreamId, CreationError> {
|
||||
let Device {
|
||||
drivers,
|
||||
..
|
||||
} = device;
|
||||
let num_channels = format.channels.clone();
|
||||
let stream_type = drivers.get_data_type().expect("Couldn't load data type");
|
||||
self.get_output_stream(&drivers, num_channels as usize).map(|stream_buffer_size| {
|
||||
let cpal_num_samples = stream_buffer_size * num_channels as usize;
|
||||
let count = self.stream_count.load(Ordering::SeqCst);
|
||||
self.stream_count.store(count + 1, Ordering::SeqCst);
|
||||
let asio_streams = self.asio_streams.clone();
|
||||
let callbacks = self.callbacks.clone();
|
||||
let bytes_per_channel = format.data_type.sample_size();
|
||||
// Create buffers
|
||||
let channel_len = cpal_num_samples
|
||||
/ num_channels as usize;
|
||||
|
||||
|
||||
let mut re_buffers = match format.data_type{
|
||||
SampleFormat::I16 => {
|
||||
Buffers{
|
||||
i16_buff: I16Buffer{
|
||||
cpal: vec![0 as i16; cpal_num_samples],
|
||||
channel: (0..num_channels)
|
||||
.map(|_| Vec::with_capacity(channel_len))
|
||||
.collect()},
|
||||
u16_buff: U16Buffer::default(),
|
||||
f32_buff: F32Buffer::default(),
|
||||
}
|
||||
}
|
||||
SampleFormat::U16 => {
|
||||
Buffers{
|
||||
i16_buff: I16Buffer::default(),
|
||||
u16_buff: U16Buffer{
|
||||
cpal: vec![0 as u16; cpal_num_samples],
|
||||
channel: (0..num_channels)
|
||||
.map(|_| Vec::with_capacity(channel_len))
|
||||
.collect()},
|
||||
f32_buff: F32Buffer::default(),
|
||||
}
|
||||
}
|
||||
SampleFormat::F32 => {
|
||||
Buffers{
|
||||
i16_buff: I16Buffer::default(),
|
||||
u16_buff: U16Buffer::default(),
|
||||
f32_buff: F32Buffer{
|
||||
cpal: vec![0 as f32; cpal_num_samples],
|
||||
channel: (0..num_channels)
|
||||
.map(|_| Vec::with_capacity(channel_len))
|
||||
.collect()},
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
sys::set_callback(move |index| unsafe {
|
||||
if let Some(ref asio_stream) = asio_streams.lock().unwrap().output {
|
||||
// Number of samples needed total
|
||||
let mut callbacks = callbacks.lock().unwrap();
|
||||
|
||||
// Assuming only one callback, probably needs to change
|
||||
match callbacks.first_mut() {
|
||||
Some(callback) => {
|
||||
macro_rules! try_callback {
|
||||
($SampleFormat:ident,
|
||||
$SampleType:ty,
|
||||
$SampleTypeIdent:ident,
|
||||
$AsioType:ty,
|
||||
$AsioTypeIdent:ident,
|
||||
$Buffers:expr,
|
||||
$BuffersType:ty,
|
||||
$BuffersTypeIdent:ident
|
||||
) => {
|
||||
let mut my_buffers = $Buffers;
|
||||
// Buffer that is filled by cpal.
|
||||
//let mut cpal_buffer: Vec<$SampleType> = vec![0 as $SampleType; cpal_num_samples];
|
||||
// Call in block because of mut borrow
|
||||
{
|
||||
let buff = OutputBuffer{
|
||||
buffer: &mut my_buffers.cpal
|
||||
};
|
||||
callback(
|
||||
StreamId(count),
|
||||
StreamData::Output{
|
||||
buffer: UnknownTypeOutputBuffer::$SampleFormat(
|
||||
::OutputBuffer{
|
||||
target: Some(super::super::OutputBuffer::Asio(buff))
|
||||
})
|
||||
}
|
||||
);
|
||||
}
|
||||
// Deinter all the channels
|
||||
{
|
||||
let $BuffersTypeIdent {
|
||||
cpal: ref mut c_buffer,
|
||||
channel: ref mut channels,
|
||||
} = my_buffers;
|
||||
au::deinterleave(&c_buffer[..], channels);
|
||||
}
|
||||
|
||||
// For each channel write the cpal data to
|
||||
// the asio buffer
|
||||
// TODO need to check for Endian
|
||||
for (i, channel) in my_buffers.channel.iter().enumerate(){
|
||||
let buff_ptr = (asio_stream
|
||||
.buffer_infos[i]
|
||||
.buffers[index as usize] as *mut $AsioType)
|
||||
// I'm not sure if this is needed anymore
|
||||
// Why should we offset the pointer?
|
||||
.offset(asio_stream.buffer_size as isize * i as isize);
|
||||
let asio_buffer: &'static mut [$AsioType] =
|
||||
std::slice::from_raw_parts_mut(
|
||||
buff_ptr,
|
||||
asio_stream.buffer_size as usize);
|
||||
for (asio_s, cpal_s) in asio_buffer.iter_mut()
|
||||
.zip(channel){
|
||||
*asio_s = (*cpal_s as i64 *
|
||||
::std::$AsioTypeIdent::MAX as i64 /
|
||||
::std::$SampleTypeIdent::MAX as i64) as $AsioType;
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
// Generic over types
|
||||
// TODO check for endianess
|
||||
match stream_type {
|
||||
sys::AsioSampleType::ASIOSTInt32LSB => {
|
||||
try_callback!(I16, i16, i16, i32, i32,
|
||||
&mut re_buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTInt16LSB => {
|
||||
try_callback!(I16, i16, i16, i16, i16,
|
||||
&mut re_buffers.i16_buff, I16Buffer, I16Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTFloat32LSB => {
|
||||
try_callback!(F32, f32, f32, f32, f32,
|
||||
&mut re_buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
}
|
||||
sys::AsioSampleType::ASIOSTFloat64LSB => {
|
||||
try_callback!(F32, f32, f32, f64, f64,
|
||||
&mut re_buffers.f32_buff, F32Buffer, F32Buffer);
|
||||
}
|
||||
_ => println!("unsupported format {:?}", stream_type),
|
||||
}
|
||||
}
|
||||
None => return (),
|
||||
}
|
||||
}
|
||||
});
|
||||
StreamId(count)
|
||||
})
|
||||
}
|
||||
|
||||
pub fn play_stream(&self, stream: StreamId) {
|
||||
|
|
@ -400,12 +428,20 @@ pub fn play_stream(&self, stream: StreamId) {
|
|||
pub fn pause_stream(&self, stream: StreamId) {
|
||||
sys::stop();
|
||||
}
|
||||
|
||||
// TODO the logic for this is wrong
|
||||
// We are not destroying AsioStreams but CPAL streams
|
||||
// Asio Streams should only be destroyed if there are no
|
||||
// CPAL streams left
|
||||
pub fn destroy_stream(&self, stream_id: StreamId) {
|
||||
/*
|
||||
let mut asio_streams_lock = self.asio_streams.lock().unwrap();
|
||||
let old_stream = mem::replace(asio_streams_lock.get_mut(stream_id.0 - 1).expect("stream count out of bounds"), None);
|
||||
if let Some(old_stream) = old_stream {
|
||||
sys::destroy_stream(old_stream);
|
||||
}
|
||||
*/
|
||||
unimplemented!()
|
||||
}
|
||||
pub fn run<F>(&self, mut callback: F) -> !
|
||||
where
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue