geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarifying hard-to-understand piece of code.

main
Ryan C. Gordon 2014-07-22 23:12:21 -04:00
parent 75dacdb99b
commit 987c335551
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/audio/SDL_audio.c
View File

@ -205,22 +205,34 @@ SDL_AudioOpenDevice_Default(_THIS, const char *devname, int iscapture)
return -1; return -1;
} }
static SDL_INLINE SDL_bool
is_in_audio_device_thread(SDL_AudioDevice * device)
{
/* The device thread locks the same mutex, but not through the public API.
This check is in case the application, in the audio callback,
tries to lock the thread that we've already locked from the
device thread...just in case we only have non-recursive mutexes. */
if (device->thread && (SDL_ThreadID() == device->threadid)) {
return SDL_TRUE;
}
return SDL_FALSE;
}
static void static void
SDL_AudioLockDevice_Default(SDL_AudioDevice * device) SDL_AudioLockDevice_Default(SDL_AudioDevice * device)
{ {
if (device->thread && (SDL_ThreadID() == device->threadid)) { if (!is_in_audio_device_thread(device)) {
return; SDL_LockMutex(device->mixer_lock);
} }
SDL_LockMutex(device->mixer_lock);
} }
static void static void
SDL_AudioUnlockDevice_Default(SDL_AudioDevice * device) SDL_AudioUnlockDevice_Default(SDL_AudioDevice * device)
{ {
if (device->thread && (SDL_ThreadID() == device->threadid)) { if (!is_in_audio_device_thread(device)) {
return; SDL_UnlockMutex(device->mixer_lock);
} }
SDL_UnlockMutex(device->mixer_lock);
} }