Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-18 04:45:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed a heisenbug in AudioManager that led to random crashes.

Browse source
This commit is contained in:
Leon Styhre 2021-05-16 20:17:11 +02:00
parent 4fd0423b07
commit 2ea9d1b1c0
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
es-core/src/AudioManager.cpp
View file

@ -242,6 +242,11 @@ void AudioManager::stop()
void AudioManager::setupAudioStream(int sampleRate) void AudioManager::setupAudioStream(int sampleRate)
{ {
SDL_AudioStatus audioStatus = SDL_GetAudioDeviceStatus(sAudioDevice);
// It's very important to pause the audio device before setting up the stream,
// or we may get random crashes if attempting to play samples at the same time.
SDL_PauseAudioDevice(sAudioDevice, 1);
SDL_FreeAudioStream(sConversionStream); SDL_FreeAudioStream(sConversionStream);
// Used for streaming audio from videos. // Used for streaming audio from videos.
@ -251,6 +256,10 @@ void AudioManager::setupAudioStream(int sampleRate)
LOG(LogError) << "Failed to create audio conversion stream:"; LOG(LogError) << "Failed to create audio conversion stream:";
LOG(LogError) << SDL_GetError(); LOG(LogError) << SDL_GetError();
} }
// If the device was previously in a playing state, then restore it.
if (audioStatus == SDL_AUDIO_PLAYING)
SDL_PauseAudioDevice(sAudioDevice, 0);
} }
void AudioManager::processStream(const void* samples, unsigned count) void AudioManager::processStream(const void* samples, unsigned count)