Skip to content
Permalink
Browse files

audio: changed some internal ints to be SDL_bools.

  • Loading branch information
icculus committed Aug 1, 2016
1 parent a94376c commit 67f2538c41664f66f06d42df8e875e99883ea962
Showing with 15 additions and 15 deletions.
  1. +9 −8 src/audio/SDL_audio.c
  2. +4 −5 src/audio/SDL_sysaudio.h
  3. +1 −1 src/audio/qsa/SDL_qsa_audio.c
  4. +1 −1 src/audio/qsa/SDL_qsa_audio.h
@@ -373,7 +373,7 @@ void SDL_OpenedAudioDeviceDisconnected(SDL_AudioDevice *device)
/* Ends the audio callback and mark the device as STOPPED, but the
app still needs to close the device to free resources. */
current_audio.impl.LockDevice(device);
device->enabled = 0;
device->enabled = SDL_FALSE;
current_audio.impl.UnlockDevice(device);

/* Post the event, if desired */
@@ -873,7 +873,7 @@ SDL_GetAudioDeviceName(int index, int iscapture)
static void
close_audio_device(SDL_AudioDevice * device)
{
device->enabled = 0;
device->enabled = SDL_FALSE;
SDL_AtomicSet(&device->shutdown, 1);
if (device->thread != NULL) {
SDL_WaitThread(device->thread, NULL);
@@ -887,7 +887,7 @@ close_audio_device(SDL_AudioDevice * device)
}
if (device->opened) {
current_audio.impl.CloseDevice(device);
device->opened = 0;
device->opened = SDL_FALSE;
}

free_audio_queue(device->buffer_queue_head);
@@ -1074,11 +1074,12 @@ open_audio_device(const char *devname, int iscapture,
return 0;
}
SDL_zerop(device);
SDL_AtomicSet(&device->shutdown, 0); /* just in case. */
device->id = id + 1;
device->spec = *obtained;
device->enabled = 1;
device->paused = 1;
device->iscapture = iscapture;
device->enabled = SDL_TRUE;
device->paused = SDL_TRUE;
device->iscapture = iscapture ? SDL_TRUE : SDL_FALSE;

/* Create a mutex for locking the sound buffers */
if (!current_audio.impl.SkipMixerLock) {
@@ -1094,7 +1095,7 @@ open_audio_device(const char *devname, int iscapture,
close_audio_device(device);
return 0;
}
device->opened = 1;
device->opened = SDL_TRUE;

/* See if we need to do any conversion */
build_cvt = SDL_FALSE;
@@ -1278,7 +1279,7 @@ SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on)
SDL_AudioDevice *device = get_audio_device(devid);
if (device) {
current_audio.impl.LockDevice(device);
device->paused = pause_on;
device->paused = pause_on ? SDL_TRUE : SDL_FALSE;
current_audio.impl.UnlockDevice(device);
}
}
@@ -158,11 +158,10 @@ struct SDL_AudioDevice

/* Current state flags */
SDL_atomic_t shutdown; /* true if we are signaling the play thread to end. */
/* !!! FIXME: these should be SDL_bool */
int iscapture;
int enabled; /* true if device is functioning and connected. */
int paused;
int opened;
SDL_bool iscapture;
SDL_bool enabled; /* true if device is functioning and connected. */
SDL_bool paused;
SDL_bool opened;

/* Fake audio buffer for when the audio hardware is busy */
Uint8 *fake_stream;
@@ -371,7 +371,7 @@ QSA_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
QSA_InitAudioParams(&cparams);

/* Initialize channel direction: capture or playback */
this->hidden->iscapture = iscapture;
this->hidden->iscapture = iscapture ? SDL_TRUE : SDL_FALSE;

if (device != NULL) {
/* Open requested audio device */
@@ -34,7 +34,7 @@
struct SDL_PrivateAudioData
{
/* SDL capture state */
int iscapture;
SDL_bool iscapture;

/* The audio device handle */
int cardno;

0 comments on commit 67f2538

Please sign in to comment.