ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-24 12:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio: changed some internal ints to be SDL_bools.

Browse source
This commit is contained in:
Ryan C. Gordon 2016-08-01 13:32:27 -04:00
parent a94376c72d
commit 67f2538c41
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/audio/SDL_audio.c
View file

@ -373,7 +373,7 @@ void SDL_OpenedAudioDeviceDisconnected(SDL_AudioDevice *device)
/* Ends the audio callback and mark the device as STOPPED, but the /* Ends the audio callback and mark the device as STOPPED, but the
app still needs to close the device to free resources. */ app still needs to close the device to free resources. */
current_audio.impl.LockDevice(device); current_audio.impl.LockDevice(device);
device->enabled = 0; device->enabled = SDL_FALSE;
current_audio.impl.UnlockDevice(device); current_audio.impl.UnlockDevice(device);
/* Post the event, if desired */ /* Post the event, if desired */
@ -873,7 +873,7 @@ SDL_GetAudioDeviceName(int index, int iscapture)
static void static void
close_audio_device(SDL_AudioDevice * device) close_audio_device(SDL_AudioDevice * device)
{ {
device->enabled = 0; device->enabled = SDL_FALSE;
SDL_AtomicSet(&device->shutdown, 1); SDL_AtomicSet(&device->shutdown, 1);
if (device->thread != NULL) { if (device->thread != NULL) {
SDL_WaitThread(device->thread, NULL); SDL_WaitThread(device->thread, NULL);
@ -887,7 +887,7 @@ close_audio_device(SDL_AudioDevice * device)
} }
if (device->opened) { if (device->opened) {
current_audio.impl.CloseDevice(device); current_audio.impl.CloseDevice(device);
device->opened = 0; device->opened = SDL_FALSE;
} }
free_audio_queue(device->buffer_queue_head); free_audio_queue(device->buffer_queue_head);
@ -1074,11 +1074,12 @@ open_audio_device(const char *devname, int iscapture,
return 0; return 0;
} }
SDL_zerop(device); SDL_zerop(device);
SDL_AtomicSet(&device->shutdown, 0); /* just in case. */
device->id = id + 1; device->id = id + 1;
device->spec = *obtained; device->spec = *obtained;
device->enabled = 1; device->enabled = SDL_TRUE;
device->paused = 1; device->paused = SDL_TRUE;
device->iscapture = iscapture; device->iscapture = iscapture ? SDL_TRUE : SDL_FALSE;
/* Create a mutex for locking the sound buffers */ /* Create a mutex for locking the sound buffers */
if (!current_audio.impl.SkipMixerLock) { if (!current_audio.impl.SkipMixerLock) {
@ -1094,7 +1095,7 @@ open_audio_device(const char *devname, int iscapture,
close_audio_device(device); close_audio_device(device);
return 0; return 0;
} }
device->opened = 1; device->opened = SDL_TRUE;
/* See if we need to do any conversion */ /* See if we need to do any conversion */
build_cvt = SDL_FALSE; build_cvt = SDL_FALSE;
@ -1278,7 +1279,7 @@ SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on)
SDL_AudioDevice *device = get_audio_device(devid); SDL_AudioDevice *device = get_audio_device(devid);
if (device) { if (device) {
current_audio.impl.LockDevice(device); current_audio.impl.LockDevice(device);
device->paused = pause_on; device->paused = pause_on ? SDL_TRUE : SDL_FALSE;
current_audio.impl.UnlockDevice(device); current_audio.impl.UnlockDevice(device);
} }
} }

9
src/audio/SDL_sysaudio.h
View file

@ -158,11 +158,10 @@ struct SDL_AudioDevice
/* Current state flags */ /* Current state flags */
SDL_atomic_t shutdown; /* true if we are signaling the play thread to end. */ SDL_atomic_t shutdown; /* true if we are signaling the play thread to end. */
/* !!! FIXME: these should be SDL_bool */ SDL_bool iscapture;
int iscapture; SDL_bool enabled; /* true if device is functioning and connected. */
int enabled; /* true if device is functioning and connected. */ SDL_bool paused;
int paused; SDL_bool opened;
int opened;
/* 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;

2
src/audio/qsa/SDL_qsa_audio.c
View file

@ -371,7 +371,7 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
QSA_InitAudioParams(&cparams); QSA_InitAudioParams(&cparams);
/* Initialize channel direction: capture or playback */ /* Initialize channel direction: capture or playback */
this->hidden->iscapture = iscapture; this->hidden->iscapture = iscapture ? SDL_TRUE : SDL_FALSE;
if (device != NULL) { if (device != NULL) {
/* Open requested audio device */ /* Open requested audio device */

2
src/audio/qsa/SDL_qsa_audio.h
View file

@ -34,7 +34,7 @@
struct SDL_PrivateAudioData struct SDL_PrivateAudioData
{ {
/* SDL capture state */ /* SDL capture state */
int iscapture; SDL_bool iscapture;
/* The audio device handle */ /* The audio device handle */
int cardno; int cardno;