audio: Changed OnlyHasDefaultInputDevice to OnlyHasDefaultCaptureDevice.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 05 Aug 2016 02:04:48 -0400
changeset 10240 0ba7106e9a6d
parent 10239 f17581d00c26
child 10241 457d9c7868ec
audio: Changed OnlyHasDefaultInputDevice to OnlyHasDefaultCaptureDevice.
src/audio/SDL_audio.c
src/audio/SDL_sysaudio.h
src/audio/android/SDL_androidaudio.c
src/audio/coreaudio/SDL_coreaudio.c
src/audio/dummy/SDL_dummyaudio.c
src/audio/psp/SDL_pspaudio.c
src/audio/qsa/SDL_qsa_audio.c
--- a/src/audio/SDL_audio.c	Fri Aug 05 01:59:06 2016 -0400
+++ b/src/audio/SDL_audio.c	Fri Aug 05 02:04:48 2016 -0400
@@ -165,7 +165,7 @@
 {
     /* you have to write your own implementation if these assertions fail. */
     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));
     if (current_audio.impl.HasCaptureSupport) {
@@ -1111,7 +1111,7 @@
      *  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)) {
             SDL_SetError("No such device");
             return 0;
--- a/src/audio/SDL_sysaudio.h	Fri Aug 05 01:59:06 2016 -0400
+++ b/src/audio/SDL_sysaudio.h	Fri Aug 05 02:04:48 2016 -0400
@@ -92,7 +92,7 @@
     int SkipMixerLock;  /* !!! FIXME: do we need this anymore? */
     int HasCaptureSupport;
     int OnlyHasDefaultOutputDevice;
-    int OnlyHasDefaultInputDevice;
+    int OnlyHasDefaultCaptureDevice;
     int AllowsArbitraryDeviceNames;
 } SDL_AudioDriverImpl;
 
--- a/src/audio/android/SDL_androidaudio.c	Fri Aug 05 01:59:06 2016 -0400
+++ b/src/audio/android/SDL_androidaudio.c	Fri Aug 05 02:04:48 2016 -0400
@@ -133,7 +133,7 @@
     /* and the capabilities */
     impl->HasCaptureSupport = 0; /* TODO */
     impl->OnlyHasDefaultOutputDevice = 1;
-    impl->OnlyHasDefaultInputDevice = 1;
+    impl->OnlyHasDefaultCaptureDevice = 1;
 
     return 1;   /* this audio target is available. */
 }
--- a/src/audio/coreaudio/SDL_coreaudio.c	Fri Aug 05 01:59:06 2016 -0400
+++ b/src/audio/coreaudio/SDL_coreaudio.c	Fri Aug 05 02:04:48 2016 -0400
@@ -766,7 +766,7 @@
     AudioObjectAddPropertyListener(kAudioObjectSystemObject, &devlist_address, device_list_changed, NULL);
 #else
     impl->OnlyHasDefaultOutputDevice = 1;
-    impl->OnlyHasDefaultInputDevice = 1;
+    impl->OnlyHasDefaultCaptureDevice = 1;
 
     /* 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
--- a/src/audio/dummy/SDL_dummyaudio.c	Fri Aug 05 01:59:06 2016 -0400
+++ b/src/audio/dummy/SDL_dummyaudio.c	Fri Aug 05 02:04:48 2016 -0400
@@ -52,7 +52,7 @@
     impl->CaptureFromDevice = DUMMYAUD_CaptureFromDevice;
 
     impl->OnlyHasDefaultOutputDevice = 1;
-    impl->OnlyHasDefaultInputDevice = 1;
+    impl->OnlyHasDefaultCaptureDevice = 1;
     impl->HasCaptureSupport = SDL_TRUE;
 
     return 1;   /* this audio target is available. */
--- a/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 01:59:06 2016 -0400
+++ b/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 02:04:48 2016 -0400
@@ -161,7 +161,7 @@
 /*
     impl->HasCaptureSupport = 1;
 
-    impl->OnlyHasDefaultInputDevice = 1;
+    impl->OnlyHasDefaultCaptureDevice = 1;
 */
     /*
     impl->DetectDevices = DSOUND_DetectDevices;
--- a/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 01:59:06 2016 -0400
+++ b/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 02:04:48 2016 -0400
@@ -769,7 +769,7 @@
     impl->SkipMixerLock = 0;
     impl->HasCaptureSupport = 1;
     impl->OnlyHasDefaultOutputDevice = 0;
-    impl->OnlyHasDefaultInputDevice = 0;
+    impl->OnlyHasDefaultCaptureDevice = 0;
 
     /* Check if io-audio manager is running or not */
     status = snd_cards();