mirror of
https://github.com/mkxp-z/mkxp-z.git
synced 2025-08-24 07:43:44 +02:00
Merge branch 'misc-fixes' into libretro
This commit is contained in:
commit
5f06028aa8
1 changed files with 12 additions and 7 deletions
|
@ -535,6 +535,18 @@ struct Movie
|
|||
if (letterboxSprite) delete letterboxSprite;
|
||||
if (movieSprite) delete movieSprite;
|
||||
if (hasAudio) {
|
||||
audioThreadTermReq.set();
|
||||
#ifdef MKXPZ_RETRO
|
||||
{
|
||||
AudioMutexGuard guard(audioMutex);
|
||||
}
|
||||
#else
|
||||
if(audioThread) {
|
||||
SDL_WaitThread(audioThread, 0);
|
||||
audioThread = 0;
|
||||
}
|
||||
#endif // MKXPZ_RETRO
|
||||
|
||||
if (audioQueueTail) {
|
||||
THEORAPLAY_freeAudio(audioQueueTail->audio);
|
||||
}
|
||||
|
@ -544,13 +556,6 @@ struct Movie
|
|||
THEORAPLAY_freeAudio(audioQueueHead->audio);
|
||||
}
|
||||
audioQueueHead = NULL;
|
||||
audioThreadTermReq.set();
|
||||
#ifndef MKXPZ_RETRO
|
||||
if(audioThread) {
|
||||
SDL_WaitThread(audioThread, 0);
|
||||
audioThread = 0;
|
||||
}
|
||||
#endif // MKXPZ_RETRO
|
||||
alSourceStop(audioSource);
|
||||
alDeleteSources(1, &audioSource);
|
||||
alDeleteBuffers(STREAM_BUFS, alBuffers);
|
||||
|
|
Loading…
Add table
Reference in a new issue