Refactor disconnection to trigger error_callback.
This commit is contained in:
parent
baa697c7fc
commit
0af6a1c466
3 changed files with 73 additions and 52 deletions
|
|
@ -42,6 +42,7 @@ jack = { version = "0.9", optional = true }
|
||||||
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
|
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
|
||||||
core-foundation-sys = "0.8.2" # For linking to CoreFoundation.framework and handling device name `CFString`s.
|
core-foundation-sys = "0.8.2" # For linking to CoreFoundation.framework and handling device name `CFString`s.
|
||||||
mach = "0.3" # For access to mach_timebase type.
|
mach = "0.3" # For access to mach_timebase type.
|
||||||
|
parking_lot = "0.12"
|
||||||
|
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
coreaudio-rs = { version = "0.10", default-features = false, features = ["audio_unit", "core_audio"] }
|
coreaudio-rs = { version = "0.10", default-features = false, features = ["audio_unit", "core_audio"] }
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ use crate::{
|
||||||
SupportedBufferSize, SupportedStreamConfig, SupportedStreamConfigRange,
|
SupportedBufferSize, SupportedStreamConfig, SupportedStreamConfigRange,
|
||||||
SupportedStreamConfigsError,
|
SupportedStreamConfigsError,
|
||||||
};
|
};
|
||||||
use std::cell::RefCell;
|
use parking_lot::Mutex;
|
||||||
use std::ffi::CStr;
|
use std::ffi::CStr;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::mem;
|
use std::mem;
|
||||||
|
|
@ -36,6 +36,7 @@ use std::os::raw::c_char;
|
||||||
use std::ptr::null;
|
use std::ptr::null;
|
||||||
use std::slice;
|
use std::slice;
|
||||||
use std::sync::mpsc::{channel, RecvTimeoutError};
|
use std::sync::mpsc::{channel, RecvTimeoutError};
|
||||||
|
use std::sync::Arc;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
pub use self::enumerate::{
|
pub use self::enumerate::{
|
||||||
|
|
@ -416,8 +417,8 @@ impl fmt::Debug for Device {
|
||||||
struct StreamInner {
|
struct StreamInner {
|
||||||
playing: bool,
|
playing: bool,
|
||||||
audio_unit: AudioUnit,
|
audio_unit: AudioUnit,
|
||||||
/// Track whether the device has been disconnected.
|
/// Manage the lifetime of the closure that handles device diconnection.
|
||||||
disconnect_listener: Option<AudioObjectPropertyListener>,
|
_disconnect_listener: Option<AudioObjectPropertyListener>,
|
||||||
// Track the device with which the audio unit was spawned.
|
// Track the device with which the audio unit was spawned.
|
||||||
//
|
//
|
||||||
// We must do this so that we can avoid changing the device sample rate if there is already
|
// We must do this so that we can avoid changing the device sample rate if there is already
|
||||||
|
|
@ -426,28 +427,32 @@ struct StreamInner {
|
||||||
device_id: AudioDeviceID,
|
device_id: AudioDeviceID,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl StreamInner {
|
/// Register the on-disconnect callback.
|
||||||
/// Add or replace an existing callback that will be called if the device is disconnected.
|
/// This will both stop the stream and call the error callback DeviceNotAvailable.
|
||||||
fn set_on_disconnect<F: FnMut() -> () + 'static>(
|
/// This function should only be called once per stream.
|
||||||
&mut self,
|
fn add_disconnect_listener<E>(
|
||||||
callback: F,
|
stream: &Stream,
|
||||||
) -> Result<(), BuildStreamError> {
|
error_callback: Arc<Mutex<E>>,
|
||||||
// Drop any existing callback first to ensure deregistration happens before
|
) -> Result<(), BuildStreamError>
|
||||||
// we register the new callback.
|
where
|
||||||
{
|
E: FnMut(StreamError) + Send + 'static,
|
||||||
self.disconnect_listener = None;
|
{
|
||||||
}
|
let stream_copy = stream.clone();
|
||||||
self.disconnect_listener = Some(AudioObjectPropertyListener::new(
|
let mut stream_inner = stream.inner.lock();
|
||||||
self.device_id,
|
stream_inner._disconnect_listener = Some(AudioObjectPropertyListener::new(
|
||||||
AudioObjectPropertyAddress {
|
stream_inner.device_id,
|
||||||
mSelector: kAudioDevicePropertyDeviceIsAlive,
|
AudioObjectPropertyAddress {
|
||||||
mScope: kAudioObjectPropertyScopeGlobal,
|
mSelector: kAudioDevicePropertyDeviceIsAlive,
|
||||||
mElement: kAudioObjectPropertyElementMaster,
|
mScope: kAudioObjectPropertyScopeGlobal,
|
||||||
},
|
mElement: kAudioObjectPropertyElementMaster,
|
||||||
callback,
|
},
|
||||||
)?);
|
move || {
|
||||||
Ok(())
|
println!("Disconnecting.");
|
||||||
}
|
let _ = stream_copy.pause();
|
||||||
|
(error_callback.lock())(StreamError::DeviceNotAvailable);
|
||||||
|
},
|
||||||
|
)?);
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn audio_unit_from_device(device: &Device, input: bool) -> Result<AudioUnit, coreaudio::Error> {
|
fn audio_unit_from_device(device: &Device, input: bool) -> Result<AudioUnit, coreaudio::Error> {
|
||||||
|
|
@ -497,7 +502,7 @@ impl Device {
|
||||||
config: &StreamConfig,
|
config: &StreamConfig,
|
||||||
sample_format: SampleFormat,
|
sample_format: SampleFormat,
|
||||||
mut data_callback: D,
|
mut data_callback: D,
|
||||||
mut error_callback: E,
|
error_callback: E,
|
||||||
) -> Result<Stream, BuildStreamError>
|
) -> Result<Stream, BuildStreamError>
|
||||||
where
|
where
|
||||||
D: FnMut(&Data, &InputCallbackInfo) + Send + 'static,
|
D: FnMut(&Data, &InputCallbackInfo) + Send + 'static,
|
||||||
|
|
@ -539,6 +544,9 @@ impl Device {
|
||||||
BufferSize::Default => (),
|
BufferSize::Default => (),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let error_callback = Arc::new(Mutex::new(error_callback));
|
||||||
|
let error_callback_disconnect = error_callback.clone();
|
||||||
|
|
||||||
// Register the callback that is being called by coreaudio whenever it needs data to be
|
// Register the callback that is being called by coreaudio whenever it needs data to be
|
||||||
// fed to the audio buffer.
|
// fed to the audio buffer.
|
||||||
let bytes_per_channel = sample_format.sample_size();
|
let bytes_per_channel = sample_format.sample_size();
|
||||||
|
|
@ -563,7 +571,7 @@ impl Device {
|
||||||
// TODO: Need a better way to get delay, for now we assume a double-buffer offset.
|
// TODO: Need a better way to get delay, for now we assume a double-buffer offset.
|
||||||
let callback = match host_time_to_stream_instant(args.time_stamp.mHostTime) {
|
let callback = match host_time_to_stream_instant(args.time_stamp.mHostTime) {
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error_callback(err.into());
|
(error_callback.lock())(err.into());
|
||||||
return Err(());
|
return Err(());
|
||||||
}
|
}
|
||||||
Ok(cb) => cb,
|
Ok(cb) => cb,
|
||||||
|
|
@ -580,14 +588,22 @@ impl Device {
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
audio_unit.start()?;
|
let stream = Stream::new(StreamInner {
|
||||||
|
|
||||||
Ok(Stream::new(StreamInner {
|
|
||||||
playing: true,
|
playing: true,
|
||||||
disconnect_listener: None,
|
_disconnect_listener: None,
|
||||||
audio_unit,
|
audio_unit,
|
||||||
device_id: self.audio_device_id,
|
device_id: self.audio_device_id,
|
||||||
}))
|
});
|
||||||
|
|
||||||
|
// If we didn't request the default device, stop the stream if the
|
||||||
|
// device disconnects.
|
||||||
|
if !self.is_default {
|
||||||
|
add_disconnect_listener(&stream, error_callback_disconnect)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
stream.inner.lock().audio_unit.start()?;
|
||||||
|
|
||||||
|
Ok(stream)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_output_stream_raw<D, E>(
|
fn build_output_stream_raw<D, E>(
|
||||||
|
|
@ -595,7 +611,7 @@ impl Device {
|
||||||
config: &StreamConfig,
|
config: &StreamConfig,
|
||||||
sample_format: SampleFormat,
|
sample_format: SampleFormat,
|
||||||
mut data_callback: D,
|
mut data_callback: D,
|
||||||
mut error_callback: E,
|
error_callback: E,
|
||||||
) -> Result<Stream, BuildStreamError>
|
) -> Result<Stream, BuildStreamError>
|
||||||
where
|
where
|
||||||
D: FnMut(&mut Data, &OutputCallbackInfo) + Send + 'static,
|
D: FnMut(&mut Data, &OutputCallbackInfo) + Send + 'static,
|
||||||
|
|
@ -634,6 +650,9 @@ impl Device {
|
||||||
BufferSize::Default => (),
|
BufferSize::Default => (),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let error_callback = Arc::new(Mutex::new(error_callback));
|
||||||
|
let error_callback_disconnect = error_callback.clone();
|
||||||
|
|
||||||
// Register the callback that is being called by coreaudio whenever it needs data to be
|
// Register the callback that is being called by coreaudio whenever it needs data to be
|
||||||
// fed to the audio buffer.
|
// fed to the audio buffer.
|
||||||
let bytes_per_channel = sample_format.sample_size();
|
let bytes_per_channel = sample_format.sample_size();
|
||||||
|
|
@ -655,7 +674,7 @@ impl Device {
|
||||||
|
|
||||||
let callback = match host_time_to_stream_instant(args.time_stamp.mHostTime) {
|
let callback = match host_time_to_stream_instant(args.time_stamp.mHostTime) {
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error_callback(err.into());
|
(error_callback.lock())(err.into());
|
||||||
return Err(());
|
return Err(());
|
||||||
}
|
}
|
||||||
Ok(cb) => cb,
|
Ok(cb) => cb,
|
||||||
|
|
@ -673,14 +692,22 @@ impl Device {
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
audio_unit.start()?;
|
let stream = Stream::new(StreamInner {
|
||||||
|
|
||||||
Ok(Stream::new(StreamInner {
|
|
||||||
playing: true,
|
playing: true,
|
||||||
disconnect_listener: None,
|
_disconnect_listener: None,
|
||||||
audio_unit,
|
audio_unit,
|
||||||
device_id: self.audio_device_id,
|
device_id: self.audio_device_id,
|
||||||
}))
|
});
|
||||||
|
|
||||||
|
// If we didn't request the default device, stop the stream if the
|
||||||
|
// device disconnects.
|
||||||
|
if !self.is_default {
|
||||||
|
add_disconnect_listener(&stream, error_callback_disconnect)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
stream.inner.lock().audio_unit.start()?;
|
||||||
|
|
||||||
|
Ok(stream)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -837,30 +864,22 @@ fn set_sample_rate(
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
pub struct Stream {
|
pub struct Stream {
|
||||||
inner: RefCell<StreamInner>,
|
inner: Arc<Mutex<StreamInner>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Stream {
|
impl Stream {
|
||||||
fn new(inner: StreamInner) -> Self {
|
fn new(inner: StreamInner) -> Self {
|
||||||
Self {
|
Self {
|
||||||
inner: RefCell::new(inner),
|
inner: Arc::new(Mutex::new(inner)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add or replace an existing callback that will be called if the device is disconnected.
|
|
||||||
pub fn set_on_disconnect<F: FnMut() -> () + 'static>(
|
|
||||||
&self,
|
|
||||||
f: F,
|
|
||||||
) -> Result<(), BuildStreamError> {
|
|
||||||
let mut stream = self.inner.borrow_mut();
|
|
||||||
stream.set_on_disconnect(f)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl StreamTrait for Stream {
|
impl StreamTrait for Stream {
|
||||||
fn play(&self) -> Result<(), PlayStreamError> {
|
fn play(&self) -> Result<(), PlayStreamError> {
|
||||||
let mut stream = self.inner.borrow_mut();
|
let mut stream = self.inner.lock();
|
||||||
|
|
||||||
if !stream.playing {
|
if !stream.playing {
|
||||||
if let Err(e) = stream.audio_unit.start() {
|
if let Err(e) = stream.audio_unit.start() {
|
||||||
|
|
@ -874,7 +893,7 @@ impl StreamTrait for Stream {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn pause(&self) -> Result<(), PauseStreamError> {
|
fn pause(&self) -> Result<(), PauseStreamError> {
|
||||||
let mut stream = self.inner.borrow_mut();
|
let mut stream = self.inner.lock();
|
||||||
|
|
||||||
if stream.playing {
|
if stream.playing {
|
||||||
if let Err(e) = stream.audio_unit.stop() {
|
if let Err(e) = stream.audio_unit.stop() {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
extern crate coreaudio;
|
extern crate coreaudio;
|
||||||
|
extern crate parking_lot;
|
||||||
|
|
||||||
use self::coreaudio::sys::{
|
use self::coreaudio::sys::{
|
||||||
kAudioFormatFlagIsFloat, kAudioFormatFlagIsPacked, kAudioFormatLinearPCM,
|
kAudioFormatFlagIsFloat, kAudioFormatFlagIsPacked, kAudioFormatLinearPCM,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue