lifning/ferretro
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix SDL2 audio thread hanging on close

Browse source
This commit is contained in:
lifning 2021-08-17 16:50:26 -07:00
parent 12b879ac9f
commit d156c04a04
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/sdl2_emulator.rs
View file

@ -392,7 +392,7 @@ impl AudioCallback for MySdlAudio {
fn callback(&mut self, out: &mut [Self::Channel]) { fn callback(&mut self, out: &mut [Self::Channel]) {
if self.audio_spec.format == AudioFormat::S16LSB { if self.audio_spec.format == AudioFormat::S16LSB {
if let Ok(samples) = self.audio_receiver.recv() { if let Ok(samples) = self.audio_receiver.recv_timeout(Duration::from_millis(500)) {
out.copy_from_slice(&samples[..out.len()]); out.copy_from_slice(&samples[..out.len()]);
} }
} }

4
src/components/mod.rs
View file

@ -10,9 +10,7 @@ use std::io::Read;
pub struct RetroComponentBase { pub struct RetroComponentBase {
retro: LibretroWrapper, retro: LibretroWrapper,
libretro_path: PathBuf, libretro_path: PathBuf,
// TODO: control when things get added to this. // TODO: control when things get added to this with lifetime constraints defined by implementers
// probably shouldn't be after load_game?
// unless we invent a way to play back the latest set_pixel_format etc. metadata required.
components: Vec<Box<dyn RetroComponent>>, components: Vec<Box<dyn RetroComponent>>,
// replaying env calls for late-added components // replaying env calls for late-added components

2
src/components/provided/sdl2.rs
View file

@ -284,7 +284,7 @@ impl AudioCallback for MySdlAudio {
fn callback(&mut self, out: &mut [Self::Channel]) { fn callback(&mut self, out: &mut [Self::Channel]) {
if self.audio_spec.format == AudioFormat::S16LSB { if self.audio_spec.format == AudioFormat::S16LSB {
if let Ok(samples) = self.audio_receiver.recv() { if let Ok(samples) = self.audio_receiver.recv_timeout(Duration::from_millis(500)) {
out.copy_from_slice(&samples[..out.len()]); out.copy_from_slice(&samples[..out.len()]);
} }
} }