Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

audio: a little more robustness in the capture device's thread.

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-08-02 15:04:33 -04:00
parent d662bc04a5
commit 6bd1ec6bb0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/audio/SDL_audio.c
View File

@ -729,7 +729,6 @@ SDL_CaptureAudio(void *devicep)
while (still_need > 0) { while (still_need > 0) {
const int rc = current_audio.impl.CaptureFromDevice(device, ptr, still_need); const int rc = current_audio.impl.CaptureFromDevice(device, ptr, still_need);
SDL_assert(rc != 0); /* device should have blocked, failed, or returned data. */
SDL_assert(rc <= still_need); /* device should not overflow buffer. :) */ SDL_assert(rc <= still_need); /* device should not overflow buffer. :) */
if (rc > 0) { if (rc > 0) {
still_need -= rc; still_need -= rc;
@ -751,7 +750,9 @@ SDL_CaptureAudio(void *devicep)
/* !!! FIXME: this should be LockDevice. */ /* !!! FIXME: this should be LockDevice. */
SDL_LockMutex(device->mixer_lock); SDL_LockMutex(device->mixer_lock);
if (!SDL_AtomicGet(&device->paused)) { if (SDL_AtomicGet(&device->paused)) {
current_audio.impl.FlushCapture(device); /* one snuck in! */
} else {
(*callback)(udata, stream, stream_len); (*callback)(udata, stream, stream_len);
} }
SDL_UnlockMutex(device->mixer_lock); SDL_UnlockMutex(device->mixer_lock);