encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaked a couple comments, added some FIXMEs.

This commit is contained in:
Ryan C. Gordon 2015-03-18 10:09:23 -04:00
parent 1110f53610
commit 97ff10c63c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/SDL_audio.c
View File

@ -616,6 +616,7 @@ SDL_RunAudio(void *devicep)
} }
/* Read from the callback into the _input_ stream */ /* Read from the callback into the _input_ stream */
// !!! FIXME: this should be LockDevice.
SDL_LockMutex(device->mixer_lock); SDL_LockMutex(device->mixer_lock);
(*fill) (udata, istream, istream_len); (*fill) (udata, istream, istream_len);
SDL_UnlockMutex(device->mixer_lock); SDL_UnlockMutex(device->mixer_lock);
@ -687,6 +688,7 @@ SDL_RunAudio(void *devicep)
} }
} }
/* !!! FIXME: this should be LockDevice. */
SDL_LockMutex(device->mixer_lock); SDL_LockMutex(device->mixer_lock);
if (device->paused) { if (device->paused) {
SDL_memset(stream, silence, stream_len); SDL_memset(stream, silence, stream_len);
@ -1138,7 +1140,7 @@ open_audio_device(const char *devname, int iscapture,
device->paused = 1; device->paused = 1;
device->iscapture = iscapture; device->iscapture = iscapture;
/* Create a semaphore for locking the sound buffers */ /* Create a mutex for locking the sound buffers */
if (!current_audio.impl.SkipMixerLock) { if (!current_audio.impl.SkipMixerLock) {
device->mixer_lock = SDL_CreateMutex(); device->mixer_lock = SDL_CreateMutex();
if (device->mixer_lock == NULL) { if (device->mixer_lock == NULL) {

4
src/audio/SDL_sysaudio.h
View File

@ -71,6 +71,7 @@ typedef struct SDL_AudioDriverImpl
/* !!! FIXME: add pause(), so we can optimize instead of mixing silence. */ /* !!! FIXME: add pause(), so we can optimize instead of mixing silence. */
/* Some flags to push duplicate code into the core and reduce #ifdefs. */ /* Some flags to push duplicate code into the core and reduce #ifdefs. */
/* !!! FIXME: these should be SDL_bool */
int ProvidesOwnCallbackThread; int ProvidesOwnCallbackThread;
int SkipMixerLock; /* !!! FIXME: do we need this anymore? */ int SkipMixerLock; /* !!! FIXME: do we need this anymore? */
int HasCaptureSupport; int HasCaptureSupport;
@ -125,6 +126,7 @@ struct SDL_AudioDevice
SDL_AudioStreamer streamer; SDL_AudioStreamer streamer;
/* Current state flags */ /* Current state flags */
/* !!! FIXME: should be SDL_bool */
int iscapture; int iscapture;
int enabled; int enabled;
int paused; int paused;
@ -133,7 +135,7 @@ struct SDL_AudioDevice
/* Fake audio buffer for when the audio hardware is busy */ /* Fake audio buffer for when the audio hardware is busy */
Uint8 *fake_stream; Uint8 *fake_stream;
/* A semaphore for locking the mixing buffers */ /* A mutex for locking the mixing buffers */
SDL_mutex *mixer_lock; SDL_mutex *mixer_lock;
/* A thread to feed the audio device */ /* A thread to feed the audio device */