audio: Changed OnlyHasDefaultInputDevice to OnlyHasDefaultCaptureDevice.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 05 Aug 2016 02:04:48 -0400
changeset 102580ba7106e9a6d
parent 10257 f17581d00c26
child 10259 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
     1.1 --- a/src/audio/SDL_audio.c	Fri Aug 05 01:59:06 2016 -0400
     1.2 +++ b/src/audio/SDL_audio.c	Fri Aug 05 02:04:48 2016 -0400
     1.3 @@ -165,7 +165,7 @@
     1.4  {
     1.5      /* you have to write your own implementation if these assertions fail. */
     1.6      SDL_assert(current_audio.impl.OnlyHasDefaultOutputDevice);
     1.7 -    SDL_assert(current_audio.impl.OnlyHasDefaultInputDevice || !current_audio.impl.HasCaptureSupport);
     1.8 +    SDL_assert(current_audio.impl.OnlyHasDefaultCaptureDevice || !current_audio.impl.HasCaptureSupport);
     1.9  
    1.10      SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, (void *) ((size_t) 0x1));
    1.11      if (current_audio.impl.HasCaptureSupport) {
    1.12 @@ -1111,7 +1111,7 @@
    1.13       *  opens of the default system device.
    1.14       */
    1.15  
    1.16 -    if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
    1.17 +    if ((iscapture) && (current_audio.impl.OnlyHasDefaultCaptureDevice)) {
    1.18          if ((devname) && (SDL_strcmp(devname, DEFAULT_INPUT_DEVNAME) != 0)) {
    1.19              SDL_SetError("No such device");
    1.20              return 0;
     2.1 --- a/src/audio/SDL_sysaudio.h	Fri Aug 05 01:59:06 2016 -0400
     2.2 +++ b/src/audio/SDL_sysaudio.h	Fri Aug 05 02:04:48 2016 -0400
     2.3 @@ -92,7 +92,7 @@
     2.4      int SkipMixerLock;  /* !!! FIXME: do we need this anymore? */
     2.5      int HasCaptureSupport;
     2.6      int OnlyHasDefaultOutputDevice;
     2.7 -    int OnlyHasDefaultInputDevice;
     2.8 +    int OnlyHasDefaultCaptureDevice;
     2.9      int AllowsArbitraryDeviceNames;
    2.10  } SDL_AudioDriverImpl;
    2.11  
     3.1 --- a/src/audio/android/SDL_androidaudio.c	Fri Aug 05 01:59:06 2016 -0400
     3.2 +++ b/src/audio/android/SDL_androidaudio.c	Fri Aug 05 02:04:48 2016 -0400
     3.3 @@ -133,7 +133,7 @@
     3.4      /* and the capabilities */
     3.5      impl->HasCaptureSupport = 0; /* TODO */
     3.6      impl->OnlyHasDefaultOutputDevice = 1;
     3.7 -    impl->OnlyHasDefaultInputDevice = 1;
     3.8 +    impl->OnlyHasDefaultCaptureDevice = 1;
     3.9  
    3.10      return 1;   /* this audio target is available. */
    3.11  }
     4.1 --- a/src/audio/coreaudio/SDL_coreaudio.c	Fri Aug 05 01:59:06 2016 -0400
     4.2 +++ b/src/audio/coreaudio/SDL_coreaudio.c	Fri Aug 05 02:04:48 2016 -0400
     4.3 @@ -766,7 +766,7 @@
     4.4      AudioObjectAddPropertyListener(kAudioObjectSystemObject, &devlist_address, device_list_changed, NULL);
     4.5  #else
     4.6      impl->OnlyHasDefaultOutputDevice = 1;
     4.7 -    impl->OnlyHasDefaultInputDevice = 1;
     4.8 +    impl->OnlyHasDefaultCaptureDevice = 1;
     4.9  
    4.10      /* Set category to ambient sound so that other music continues playing.
    4.11         You can change this at runtime in your own code if you need different
     5.1 --- a/src/audio/dummy/SDL_dummyaudio.c	Fri Aug 05 01:59:06 2016 -0400
     5.2 +++ b/src/audio/dummy/SDL_dummyaudio.c	Fri Aug 05 02:04:48 2016 -0400
     5.3 @@ -52,7 +52,7 @@
     5.4      impl->CaptureFromDevice = DUMMYAUD_CaptureFromDevice;
     5.5  
     5.6      impl->OnlyHasDefaultOutputDevice = 1;
     5.7 -    impl->OnlyHasDefaultInputDevice = 1;
     5.8 +    impl->OnlyHasDefaultCaptureDevice = 1;
     5.9      impl->HasCaptureSupport = SDL_TRUE;
    5.10  
    5.11      return 1;   /* this audio target is available. */
     6.1 --- a/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 01:59:06 2016 -0400
     6.2 +++ b/src/audio/psp/SDL_pspaudio.c	Fri Aug 05 02:04:48 2016 -0400
     6.3 @@ -161,7 +161,7 @@
     6.4  /*
     6.5      impl->HasCaptureSupport = 1;
     6.6  
     6.7 -    impl->OnlyHasDefaultInputDevice = 1;
     6.8 +    impl->OnlyHasDefaultCaptureDevice = 1;
     6.9  */
    6.10      /*
    6.11      impl->DetectDevices = DSOUND_DetectDevices;
     7.1 --- a/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 01:59:06 2016 -0400
     7.2 +++ b/src/audio/qsa/SDL_qsa_audio.c	Fri Aug 05 02:04:48 2016 -0400
     7.3 @@ -769,7 +769,7 @@
     7.4      impl->SkipMixerLock = 0;
     7.5      impl->HasCaptureSupport = 1;
     7.6      impl->OnlyHasDefaultOutputDevice = 0;
     7.7 -    impl->OnlyHasDefaultInputDevice = 0;
     7.8 +    impl->OnlyHasDefaultCaptureDevice = 0;
     7.9  
    7.10      /* Check if io-audio manager is running or not */
    7.11      status = snd_cards();