indentation and no clean up on destroy stream
This commit is contained in:
Tom Gowan
mitchmindtree
parent
b70e27ed87
commit
fd808b95e9
|
|
@ -198,8 +198,8 @@ impl EventLoop {
|
|||
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_input_stream(&drivers, format)
|
||||
.map(|stream_buffer_size| {
|
||||
let input_stream = self.get_input_stream(&drivers, format);
|
||||
input_stream.map(|stream_buffer_size| {
|
||||
let cpal_num_samples = stream_buffer_size * num_channels as usize;
|
||||
let count = self.stream_count.fetch_add(1, Ordering::SeqCst);
|
||||
let asio_streams = self.asio_streams.clone();
|
||||
|
|
@ -239,7 +239,6 @@ impl EventLoop {
|
|||
// This is most performance critical part of the ASIO bindings.
|
||||
sys::set_callback(move |index| unsafe {
|
||||
// if not playing return early
|
||||
// TODO is this lock necessary
|
||||
{
|
||||
if let Some(s) = cpal_streams.lock().unwrap().get(count - 1) {
|
||||
if let Some(s) = s {
|
||||
|
|
@ -250,16 +249,21 @@ impl EventLoop {
|
|||
}
|
||||
}
|
||||
// Get the stream
|
||||
// TODO is this lock necessary
|
||||
if let Some(ref asio_stream) = asio_streams.lock().unwrap().input {
|
||||
let stream_lock = asio_streams.lock().unwrap();
|
||||
let ref asio_stream = match stream_lock.input {
|
||||
Some(ref asio_stream) => asio_stream,
|
||||
None => return (),
|
||||
};
|
||||
|
||||
// Get the callback
|
||||
// TODO is this lock necessary
|
||||
let mut callbacks = callbacks.lock().unwrap();
|
||||
|
||||
// Theres only a single callback because theres only one event loop
|
||||
// TODO is 64bit necessary. Might be using more memory then needed
|
||||
match callbacks.as_mut() {
|
||||
Some(callback) => {
|
||||
let callback = match callbacks.as_mut() {
|
||||
Some(callback) => callback,
|
||||
None => return (),
|
||||
};
|
||||
|
||||
// Macro to convert sample from ASIO to CPAL type
|
||||
macro_rules! convert_sample {
|
||||
// floats types required different conversion
|
||||
|
|
@ -268,16 +272,14 @@ impl EventLoop {
|
|||
$SampleTypeIdent:ident,
|
||||
$Sample:expr
|
||||
) => {
|
||||
(*$Sample as f64
|
||||
/ ::std::$SampleTypeIdent::MAX as f64) as f32
|
||||
(*$Sample as f64 / ::std::$SampleTypeIdent::MAX as f64) as f32
|
||||
};
|
||||
($AsioTypeIdent:ident,
|
||||
f64,
|
||||
$SampleTypeIdent:ident,
|
||||
$Sample:expr
|
||||
) => {
|
||||
*$Sample as f64
|
||||
/ ::std::$SampleTypeIdent::MAX as f64
|
||||
*$Sample as f64 / ::std::$SampleTypeIdent::MAX as f64
|
||||
};
|
||||
($AsioTypeIdent:ident,
|
||||
$SampleType:ty,
|
||||
|
|
@ -285,8 +287,7 @@ impl EventLoop {
|
|||
$Sample:expr
|
||||
) => {
|
||||
(*$Sample as i64 * ::std::$SampleTypeIdent::MAX as i64
|
||||
/ ::std::$AsioTypeIdent::MAX as i64)
|
||||
as $SampleType
|
||||
/ ::std::$AsioTypeIdent::MAX as i64) as $SampleType
|
||||
};
|
||||
};
|
||||
// This creates gets the buffer and interleaves it.
|
||||
|
|
@ -306,14 +307,10 @@ impl EventLoop {
|
|||
// For each channel write the asio buffer to
|
||||
// the cpal buffer
|
||||
|
||||
for (i, channel) in
|
||||
$Buffers.channel.iter_mut().enumerate()
|
||||
{
|
||||
let buff_ptr = asio_stream.buffer_infos[i].buffers
|
||||
[index as usize]
|
||||
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(
|
||||
let asio_buffer: &'static [$AsioType] = std::slice::from_raw_parts(
|
||||
buff_ptr,
|
||||
asio_stream.buffer_size as usize,
|
||||
);
|
||||
|
|
@ -351,15 +348,9 @@ impl EventLoop {
|
|||
callback(
|
||||
StreamId(count),
|
||||
StreamData::Input {
|
||||
buffer: UnknownTypeInputBuffer::$SampleFormat(
|
||||
::InputBuffer {
|
||||
buffer: Some(
|
||||
super::super::InputBuffer::Asio(
|
||||
buff,
|
||||
),
|
||||
),
|
||||
},
|
||||
),
|
||||
buffer: UnknownTypeInputBuffer::$SampleFormat(::InputBuffer {
|
||||
buffer: Some(super::super::InputBuffer::Asio(buff)),
|
||||
}),
|
||||
},
|
||||
);
|
||||
};
|
||||
|
|
@ -480,10 +471,6 @@ impl EventLoop {
|
|||
}
|
||||
_ => println!("unsupported format {:?}", stream_type),
|
||||
}
|
||||
}
|
||||
None => return (),
|
||||
}
|
||||
}
|
||||
});
|
||||
// Create stream and set to paused
|
||||
self.cpal_streams
|
||||
|
|
@ -503,8 +490,8 @@ impl EventLoop {
|
|||
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, format)
|
||||
.map(|stream_buffer_size| {
|
||||
let output_stream = self.get_output_stream(&drivers, format);
|
||||
output_stream.map(|stream_buffer_size| {
|
||||
let cpal_num_samples = stream_buffer_size * num_channels as usize;
|
||||
let count = self.stream_count.fetch_add(1, Ordering::SeqCst);
|
||||
let asio_streams = self.asio_streams.clone();
|
||||
|
|
@ -537,7 +524,6 @@ impl EventLoop {
|
|||
|
||||
sys::set_callback(move |index| unsafe {
|
||||
// if not playing return early
|
||||
// TODO is this lock necessary
|
||||
{
|
||||
if let Some(s) = cpal_streams.lock().unwrap().get(count - 1) {
|
||||
if let Some(s) = s {
|
||||
|
|
@ -547,12 +533,22 @@ impl EventLoop {
|
|||
}
|
||||
}
|
||||
}
|
||||
// Get the output stream
|
||||
// TODO is this lock necessary
|
||||
if let Some(ref asio_stream) = asio_streams.lock().unwrap().output {
|
||||
// Number of samples needed total
|
||||
// Get the stream
|
||||
let stream_lock = asio_streams.lock().unwrap();
|
||||
let ref asio_stream = match stream_lock.output {
|
||||
Some(ref asio_stream) => asio_stream,
|
||||
None => return (),
|
||||
};
|
||||
|
||||
// Get the callback
|
||||
let mut callbacks = callbacks.lock().unwrap();
|
||||
|
||||
// Theres only a single callback because theres only one event loop
|
||||
let callback = match callbacks.as_mut() {
|
||||
Some(callback) => callback,
|
||||
None => return (),
|
||||
};
|
||||
|
||||
// Convert sample depending on the sample type
|
||||
macro_rules! convert_sample {
|
||||
($AsioTypeIdent:ident,
|
||||
|
|
@ -560,16 +556,14 @@ impl EventLoop {
|
|||
$SampleTypeIdent:ident,
|
||||
$Sample:expr
|
||||
) => {
|
||||
(*$Sample as f64
|
||||
/ ::std::$SampleTypeIdent::MAX as f64) as f32
|
||||
(*$Sample as f64 / ::std::$SampleTypeIdent::MAX as f64) as f32
|
||||
};
|
||||
($AsioTypeIdent:ident,
|
||||
f64,
|
||||
$SampleTypeIdent:ident,
|
||||
$Sample:expr
|
||||
) => {
|
||||
*$Sample as f64
|
||||
/ ::std::$SampleTypeIdent::MAX as f64
|
||||
*$Sample as f64 / ::std::$SampleTypeIdent::MAX as f64
|
||||
};
|
||||
($AsioTypeIdent:ident,
|
||||
$AsioType:ty,
|
||||
|
|
@ -581,9 +575,6 @@ impl EventLoop {
|
|||
};
|
||||
};
|
||||
|
||||
// Theres only a single callback because theres only one event loop
|
||||
match callbacks.as_mut() {
|
||||
Some(callback) => {
|
||||
macro_rules! try_callback {
|
||||
($SampleFormat:ident,
|
||||
$SampleType:ty,
|
||||
|
|
@ -609,11 +600,9 @@ impl EventLoop {
|
|||
StreamData::Output {
|
||||
buffer: UnknownTypeOutputBuffer::$SampleFormat(
|
||||
::OutputBuffer {
|
||||
target: Some(
|
||||
super::super::OutputBuffer::Asio(
|
||||
target: Some(super::super::OutputBuffer::Asio(
|
||||
buff,
|
||||
),
|
||||
),
|
||||
)),
|
||||
},
|
||||
),
|
||||
},
|
||||
|
|
@ -632,26 +621,22 @@ impl EventLoop {
|
|||
let silence = match index {
|
||||
0 => {
|
||||
if !sys::SILENCE_FIRST.load(Ordering::SeqCst) {
|
||||
sys::SILENCE_FIRST
|
||||
.store(true, Ordering::SeqCst);
|
||||
sys::SILENCE_SECOND
|
||||
.store(false, Ordering::SeqCst);
|
||||
sys::SILENCE_FIRST.store(true, Ordering::SeqCst);
|
||||
sys::SILENCE_SECOND.store(false, Ordering::SeqCst);
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
},
|
||||
}
|
||||
1 => {
|
||||
if !sys::SILENCE_SECOND.load(Ordering::SeqCst) {
|
||||
sys::SILENCE_SECOND
|
||||
.store(true, Ordering::SeqCst);
|
||||
sys::SILENCE_FIRST
|
||||
.store(false, Ordering::SeqCst);
|
||||
sys::SILENCE_SECOND.store(true, Ordering::SeqCst);
|
||||
sys::SILENCE_FIRST.store(false, Ordering::SeqCst);
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
},
|
||||
}
|
||||
_ => unreachable!(),
|
||||
};
|
||||
|
||||
|
|
@ -659,16 +644,13 @@ impl EventLoop {
|
|||
// the asio buffer
|
||||
for (i, channel) in my_buffers.channel.iter().enumerate() {
|
||||
let buff_ptr = asio_stream.buffer_infos[i].buffers
|
||||
[index as usize]
|
||||
as *mut $AsioType;
|
||||
[index as usize] as *mut $AsioType;
|
||||
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)
|
||||
{
|
||||
for (asio_s, cpal_s) in asio_buffer.iter_mut().zip(channel) {
|
||||
if silence {
|
||||
*asio_s = 0.0 as $AsioType;
|
||||
}
|
||||
|
|
@ -801,10 +783,6 @@ impl EventLoop {
|
|||
}
|
||||
_ => println!("unsupported format {:?}", stream_type),
|
||||
}
|
||||
}
|
||||
None => return (),
|
||||
}
|
||||
}
|
||||
});
|
||||
// Create the stream paused
|
||||
self.cpal_streams
|
||||
|
|
@ -846,19 +824,9 @@ impl EventLoop {
|
|||
}
|
||||
|
||||
/// Destroy the cpal stream based on the ID.
|
||||
/// If no cpal streams exist then destory the
|
||||
/// ASIO streams and clean up
|
||||
pub fn destroy_stream(&self, stream_id: StreamId) {
|
||||
let mut streams = self.cpal_streams.lock().unwrap();
|
||||
streams.get_mut(stream_id.0).take();
|
||||
let count = self.stream_count.fetch_sub(1, Ordering::SeqCst);
|
||||
if count == 1 {
|
||||
*self.asio_streams.lock().unwrap() = sys::AsioStreams {
|
||||
output: None,
|
||||
input: None,
|
||||
};
|
||||
sys::clean_up();
|
||||
}
|
||||
}
|
||||
|
||||
/// Run the cpal callbacks
|
||||
|
|
@ -868,9 +836,7 @@ impl EventLoop {
|
|||
{
|
||||
let callback: &mut (FnMut(StreamId, StreamData) + Send) = &mut callback;
|
||||
// Transmute needed to convince the compiler that the callback has a static lifetime
|
||||
*self.callbacks
|
||||
.lock()
|
||||
.unwrap() = Some(unsafe { mem::transmute(callback) });
|
||||
*self.callbacks.lock().unwrap() = Some(unsafe { mem::transmute(callback) });
|
||||
loop {
|
||||
// A sleep here to prevent the loop being
|
||||
// removed in --release
|
||||
|
|
@ -883,6 +849,10 @@ impl EventLoop {
|
|||
/// Currently event loop is never dropped.
|
||||
impl Drop for EventLoop {
|
||||
fn drop(&mut self) {
|
||||
*self.asio_streams.lock().unwrap() = sys::AsioStreams {
|
||||
output: None,
|
||||
input: None,
|
||||
};
|
||||
sys::clean_up();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue