Fix callback being called after dropping the stream (#869)

* Fix callback being called after dropping the stream

* Use weak reference to stream in disconnect listener
This commit is contained in:
Nico Franke 2024-10-11 10:39:35 +02:00 • committed by GitHub
parent d7dee9af10
commit 02b454c02c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -442,6 +442,32 @@ struct StreamInner {
device_id: AudioDeviceID, device_id: AudioDeviceID,
} }
impl StreamInner {
fn play(&mut self) -> Result<(), PlayStreamError> {
if !self.playing {
if let Err(e) = self.audio_unit.start() {
let description = format!("{}", e);
let err = BackendSpecificError { description };
return Err(err.into());
}
self.playing = true;
}
Ok(())
}
fn pause(&mut self) -> Result<(), PauseStreamError> {
if self.playing {
if let Err(e) = self.audio_unit.stop() {
let description = format!("{}", e);
let err = BackendSpecificError { description };
return Err(err.into());
}
self.playing = false;
}
Ok(())
}
}
/// Register the on-disconnect callback. /// Register the on-disconnect callback.
/// This will both stop the stream and call the error callback with DeviceNotAvailable. /// This will both stop the stream and call the error callback with DeviceNotAvailable.
/// This function should only be called once per stream. /// This function should only be called once per stream.
@ -452,7 +478,7 @@ fn add_disconnect_listener<E>(
where where
E: FnMut(StreamError) + Send + 'static, E: FnMut(StreamError) + Send + 'static,
{ {
let stream_copy = stream.clone(); let stream_inner_weak = Arc::downgrade(&stream.inner);
let mut stream_inner = stream.inner.lock().unwrap(); let mut stream_inner = stream.inner.lock().unwrap();
stream_inner._disconnect_listener = Some(AudioObjectPropertyListener::new( stream_inner._disconnect_listener = Some(AudioObjectPropertyListener::new(
stream_inner.device_id, stream_inner.device_id,
@ -462,8 +488,11 @@ where
mElement: kAudioObjectPropertyElementMaster, mElement: kAudioObjectPropertyElementMaster,
}, },
move || { move || {
let _ = stream_copy.pause(); if let Some(stream_inner_strong) = stream_inner_weak.upgrade() {
(error_callback.lock().unwrap())(StreamError::DeviceNotAvailable); let mut stream_inner = stream_inner_strong.lock().unwrap();
let _ = stream_inner.pause();
(error_callback.lock().unwrap())(StreamError::DeviceNotAvailable);
}
}, },
)?); )?);
Ok(()) Ok(())
@ -897,30 +926,13 @@ impl StreamTrait for Stream {
fn play(&self) -> Result<(), PlayStreamError> { fn play(&self) -> Result<(), PlayStreamError> {
let mut stream = self.inner.lock().unwrap(); let mut stream = self.inner.lock().unwrap();
if !stream.playing { stream.play()
if let Err(e) = stream.audio_unit.start() {
let description = format!("{}", e);
let err = BackendSpecificError { description };
return Err(err.into());
}
stream.playing = true;
}
Ok(())
} }
fn pause(&self) -> Result<(), PauseStreamError> { fn pause(&self) -> Result<(), PauseStreamError> {
let mut stream = self.inner.lock().unwrap(); let mut stream = self.inner.lock().unwrap();
if stream.playing { stream.pause()
if let Err(e) = stream.audio_unit.stop() {
let description = format!("{}", e);
let err = BackendSpecificError { description };
return Err(err.into());
}
stream.playing = false;
}
Ok(())
} }
} }