Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-26 08:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where the audio device was accessed after it had been closed.

Browse source
This commit is contained in:
Leon Styhre 2022-01-05 00:08:50 +01:00
parent f8e201d347
commit c62a069448
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-app/src/main.cpp
View file

@ -529,10 +529,8 @@ int main(int argc, char* argv[])
} }
Window* window = Window::getInstance(); Window* window = Window::getInstance();
ViewController::getInstance(); ViewController::getInstance();
CollectionSystemsManager::getInstance(); CollectionSystemsManager::getInstance();
SystemScreensaver screensaver; SystemScreensaver screensaver;
MediaViewer mediaViewer; MediaViewer mediaViewer;
GuiLaunchScreen guiLaunchScreen; GuiLaunchScreen guiLaunchScreen;

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

@ -119,6 +119,8 @@ void AudioManager::deinit()
SDL_CloseAudio(); SDL_CloseAudio();
SDL_QuitSubSystem(SDL_INIT_AUDIO); SDL_QuitSubSystem(SDL_INIT_AUDIO);
sAudioDevice = 0;
} }
void AudioManager::mixAudio(void* /*unused*/, Uint8* stream, int len) void AudioManager::mixAudio(void* /*unused*/, Uint8* stream, int len)

1
es-core/src/components/VideoFFmpegComponent.cpp
View file

@ -1412,6 +1412,7 @@ void VideoFFmpegComponent::stopVideo()
std::queue<AudioFrame>().swap(mAudioFrameQueue); std::queue<AudioFrame>().swap(mAudioFrameQueue);
// Clear the audio buffer. // Clear the audio buffer.
if (AudioManager::sAudioDevice != 0)
AudioManager::getInstance().clearStream(); AudioManager::getInstance().clearStream();
if (mFormatContext) { if (mFormatContext) {