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

audio: Changed OnlyHasDefaultInputDevice to OnlyHasDefaultCaptureDevice.

This commit is contained in:
Ryan C. Gordon 2016-08-05 02:04:48 -04:00
parent 761a79788c
commit 9b2a59ef05
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/SDL_audio.c
View File

@ -165,7 +165,7 @@ SDL_AudioDetectDevices_Default(void)
{ {
/* you have to write your own implementation if these assertions fail. */ /* you have to write your own implementation if these assertions fail. */
SDL_assert(current_audio.impl.OnlyHasDefaultOutputDevice); SDL_assert(current_audio.impl.OnlyHasDefaultOutputDevice);
SDL_assert(current_audio.impl.OnlyHasDefaultInputDevice || !current_audio.impl.HasCaptureSupport); SDL_assert(current_audio.impl.OnlyHasDefaultCaptureDevice || !current_audio.impl.HasCaptureSupport);
SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, (void *) ((size_t) 0x1)); SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, (void *) ((size_t) 0x1));
if (current_audio.impl.HasCaptureSupport) { if (current_audio.impl.HasCaptureSupport) {
@ -1111,7 +1111,7 @@ open_audio_device(const char *devname, int iscapture,
* opens of the default system device. * opens of the default system device.
*/ */
if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) { if ((iscapture) && (current_audio.impl.OnlyHasDefaultCaptureDevice)) {
if ((devname) && (SDL_strcmp(devname, DEFAULT_INPUT_DEVNAME) != 0)) { if ((devname) && (SDL_strcmp(devname, DEFAULT_INPUT_DEVNAME) != 0)) {
SDL_SetError("No such device"); SDL_SetError("No such device");
return 0; return 0;

2
src/audio/SDL_sysaudio.h
View File

@ -92,7 +92,7 @@ typedef struct SDL_AudioDriverImpl
int SkipMixerLock; /* !!! FIXME: do we need this anymore? */ int SkipMixerLock; /* !!! FIXME: do we need this anymore? */
int HasCaptureSupport; int HasCaptureSupport;
int OnlyHasDefaultOutputDevice; int OnlyHasDefaultOutputDevice;
int OnlyHasDefaultInputDevice; int OnlyHasDefaultCaptureDevice;
int AllowsArbitraryDeviceNames; int AllowsArbitraryDeviceNames;
} SDL_AudioDriverImpl; } SDL_AudioDriverImpl;

2
src/audio/android/SDL_androidaudio.c
View File

@ -133,7 +133,7 @@ AndroidAUD_Init(SDL_AudioDriverImpl * impl)
/* and the capabilities */ /* and the capabilities */
impl->HasCaptureSupport = 0; /* TODO */ impl->HasCaptureSupport = 0; /* TODO */
impl->OnlyHasDefaultOutputDevice = 1; impl->OnlyHasDefaultOutputDevice = 1;
impl->OnlyHasDefaultInputDevice = 1; impl->OnlyHasDefaultCaptureDevice = 1;
return 1; /* this audio target is available. */ return 1; /* this audio target is available. */
} }

2
src/audio/coreaudio/SDL_coreaudio.c
View File

@ -766,7 +766,7 @@ COREAUDIO_Init(SDL_AudioDriverImpl * impl)
AudioObjectAddPropertyListener(kAudioObjectSystemObject, &devlist_address, device_list_changed, NULL); AudioObjectAddPropertyListener(kAudioObjectSystemObject, &devlist_address, device_list_changed, NULL);
#else #else
impl->OnlyHasDefaultOutputDevice = 1; impl->OnlyHasDefaultOutputDevice = 1;
impl->OnlyHasDefaultInputDevice = 1; impl->OnlyHasDefaultCaptureDevice = 1;
/* Set category to ambient sound so that other music continues playing. /* Set category to ambient sound so that other music continues playing.
You can change this at runtime in your own code if you need different You can change this at runtime in your own code if you need different

2
src/audio/dummy/SDL_dummyaudio.c
View File

@ -52,7 +52,7 @@ DUMMYAUD_Init(SDL_AudioDriverImpl * impl)
impl->CaptureFromDevice = DUMMYAUD_CaptureFromDevice; impl->CaptureFromDevice = DUMMYAUD_CaptureFromDevice;
impl->OnlyHasDefaultOutputDevice = 1; impl->OnlyHasDefaultOutputDevice = 1;
impl->OnlyHasDefaultInputDevice = 1; impl->OnlyHasDefaultCaptureDevice = 1;
impl->HasCaptureSupport = SDL_TRUE; impl->HasCaptureSupport = SDL_TRUE;
return 1; /* this audio target is available. */ return 1; /* this audio target is available. */

2
src/audio/psp/SDL_pspaudio.c
View File

@ -161,7 +161,7 @@ PSPAUD_Init(SDL_AudioDriverImpl * impl)
/* /*
impl->HasCaptureSupport = 1; impl->HasCaptureSupport = 1;
impl->OnlyHasDefaultInputDevice = 1; impl->OnlyHasDefaultCaptureDevice = 1;
*/ */
/* /*
impl->DetectDevices = DSOUND_DetectDevices; impl->DetectDevices = DSOUND_DetectDevices;

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

@ -769,7 +769,7 @@ QSA_Init(SDL_AudioDriverImpl * impl)
impl->SkipMixerLock = 0; impl->SkipMixerLock = 0;
impl->HasCaptureSupport = 1; impl->HasCaptureSupport = 1;
impl->OnlyHasDefaultOutputDevice = 0; impl->OnlyHasDefaultOutputDevice = 0;
impl->OnlyHasDefaultInputDevice = 0; impl->OnlyHasDefaultCaptureDevice = 0;
/* Check if io-audio manager is running or not */ /* Check if io-audio manager is running or not */
status = snd_cards(); status = snd_cards();