mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-24 15:53:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'misc-fixes' into libretro

Browse source
This commit is contained in:
刘皓 2025-05-19 15:18:30 -04:00
commit 5f06028aa8
No known key found for this signature in database
GPG key ID: 7901753DB465B711
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/display/graphics.cpp
View file

@ -535,6 +535,18 @@ struct Movie
if (letterboxSprite) delete letterboxSprite; if (letterboxSprite) delete letterboxSprite;
if (movieSprite) delete movieSprite; if (movieSprite) delete movieSprite;
if (hasAudio) { if (hasAudio) {
audioThreadTermReq.set();
#ifdef MKXPZ_RETRO
{
AudioMutexGuard guard(audioMutex);
}
#else
if(audioThread) {
SDL_WaitThread(audioThread, 0);
audioThread = 0;
}
#endif // MKXPZ_RETRO
if (audioQueueTail) { if (audioQueueTail) {
THEORAPLAY_freeAudio(audioQueueTail->audio); THEORAPLAY_freeAudio(audioQueueTail->audio);
} }
@ -544,13 +556,6 @@ struct Movie
THEORAPLAY_freeAudio(audioQueueHead->audio); THEORAPLAY_freeAudio(audioQueueHead->audio);
} }
audioQueueHead = NULL; audioQueueHead = NULL;
audioThreadTermReq.set();
#ifndef MKXPZ_RETRO
if(audioThread) {
SDL_WaitThread(audioThread, 0);
audioThread = 0;
}
#endif // MKXPZ_RETRO
alSourceStop(audioSource); alSourceStop(audioSource);
alDeleteSources(1, &audioSource); alDeleteSources(1, &audioSource);
alDeleteBuffers(STREAM_BUFS, alBuffers); alDeleteBuffers(STREAM_BUFS, alBuffers);