audio: Renamed some internal driver symbols in various targets.
authorRyan C. Gordon <icculus@icculus.org>
Thu, 11 Aug 2016 22:22:09 -0400
changeset 102812a002e96888f
parent 10280 985f92b2f8e9
child 10282 8bd5eb9d96c7
audio: Renamed some internal driver symbols in various targets.
src/audio/SDL_audio.c
src/audio/android/SDL_androidaudio.c
src/audio/android/SDL_androidaudio.h
src/audio/disk/SDL_diskaudio.c
src/audio/dummy/SDL_dummyaudio.c
src/audio/emscripten/SDL_emscriptenaudio.c
src/audio/nacl/SDL_naclaudio.c
src/audio/psp/SDL_pspaudio.c
src/video/android/SDL_androidevents.c
     1.1 --- a/src/audio/SDL_audio.c	Thu Aug 11 22:04:49 2016 -0400
     1.2 +++ b/src/audio/SDL_audio.c	Thu Aug 11 22:22:09 2016 -0400
     1.3 @@ -46,7 +46,7 @@
     1.4  extern AudioBootStrap SUNAUDIO_bootstrap;
     1.5  extern AudioBootStrap ARTS_bootstrap;
     1.6  extern AudioBootStrap ESD_bootstrap;
     1.7 -extern AudioBootStrap NACLAUD_bootstrap;
     1.8 +extern AudioBootStrap NACLAUDIO_bootstrap;
     1.9  extern AudioBootStrap NAS_bootstrap;
    1.10  extern AudioBootStrap XAUDIO2_bootstrap;
    1.11  extern AudioBootStrap DSOUND_bootstrap;
    1.12 @@ -55,17 +55,16 @@
    1.13  extern AudioBootStrap HAIKUAUDIO_bootstrap;
    1.14  extern AudioBootStrap COREAUDIO_bootstrap;
    1.15  extern AudioBootStrap SNDMGR_bootstrap;
    1.16 -extern AudioBootStrap DISKAUD_bootstrap;
    1.17 -extern AudioBootStrap DUMMYAUD_bootstrap;
    1.18 -extern AudioBootStrap DCAUD_bootstrap;
    1.19 +extern AudioBootStrap DISKAUDIO_bootstrap;
    1.20 +extern AudioBootStrap DUMMYAUDIO_bootstrap;
    1.21 +extern AudioBootStrap DCAUDIO_bootstrap;
    1.22  extern AudioBootStrap DART_bootstrap;
    1.23 -extern AudioBootStrap NDSAUD_bootstrap;
    1.24 +extern AudioBootStrap NDSAUDIO_bootstrap;
    1.25  extern AudioBootStrap FUSIONSOUND_bootstrap;
    1.26 -extern AudioBootStrap ANDROIDAUD_bootstrap;
    1.27 -extern AudioBootStrap PSPAUD_bootstrap;
    1.28 +extern AudioBootStrap ANDROIDAUDIO_bootstrap;
    1.29 +extern AudioBootStrap PSPAUDIO_bootstrap;
    1.30  extern AudioBootStrap SNDIO_bootstrap;
    1.31 -extern AudioBootStrap EmscriptenAudio_bootstrap;
    1.32 -
    1.33 +extern AudioBootStrap EMSCRIPTENAUDIO_bootstrap;
    1.34  
    1.35  /* Available audio drivers */
    1.36  static const AudioBootStrap *const bootstrap[] = {
    1.37 @@ -97,7 +96,7 @@
    1.38      &ESD_bootstrap,
    1.39  #endif
    1.40  #if SDL_AUDIO_DRIVER_NACL
    1.41 -    &NACLAUD_bootstrap,
    1.42 +    &NACLAUDIO_bootstrap,
    1.43  #endif
    1.44  #if SDL_AUDIO_DRIVER_NAS
    1.45      &NAS_bootstrap,
    1.46 @@ -121,22 +120,22 @@
    1.47      &COREAUDIO_bootstrap,
    1.48  #endif
    1.49  #if SDL_AUDIO_DRIVER_DISK
    1.50 -    &DISKAUD_bootstrap,
    1.51 +    &DISKAUDIO_bootstrap,
    1.52  #endif
    1.53  #if SDL_AUDIO_DRIVER_DUMMY
    1.54 -    &DUMMYAUD_bootstrap,
    1.55 +    &DUMMYAUDIO_bootstrap,
    1.56  #endif
    1.57  #if SDL_AUDIO_DRIVER_FUSIONSOUND
    1.58      &FUSIONSOUND_bootstrap,
    1.59  #endif
    1.60  #if SDL_AUDIO_DRIVER_ANDROID
    1.61 -    &ANDROIDAUD_bootstrap,
    1.62 +    &ANDROIDAUDIO_bootstrap,
    1.63  #endif
    1.64  #if SDL_AUDIO_DRIVER_PSP
    1.65 -    &PSPAUD_bootstrap,
    1.66 +    &PSPAUDIO_bootstrap,
    1.67  #endif
    1.68  #if SDL_AUDIO_DRIVER_EMSCRIPTEN
    1.69 -    &EmscriptenAudio_bootstrap,
    1.70 +    &EMSCRIPTENAUDIO_bootstrap,
    1.71  #endif
    1.72      NULL
    1.73  };
     2.1 --- a/src/audio/android/SDL_androidaudio.c	Thu Aug 11 22:04:49 2016 -0400
     2.2 +++ b/src/audio/android/SDL_androidaudio.c	Thu Aug 11 22:22:09 2016 -0400
     2.3 @@ -37,7 +37,7 @@
     2.4  static SDL_AudioDevice* captureDevice = NULL;
     2.5  
     2.6  static int
     2.7 -AndroidAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
     2.8 +ANDROIDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
     2.9  {
    2.10      SDL_AudioFormat test_format;
    2.11  
    2.12 @@ -96,31 +96,31 @@
    2.13  }
    2.14  
    2.15  static void
    2.16 -AndroidAUD_PlayDevice(_THIS)
    2.17 +ANDROIDAUDIO_PlayDevice(_THIS)
    2.18  {
    2.19      Android_JNI_WriteAudioBuffer();
    2.20  }
    2.21  
    2.22  static Uint8 *
    2.23 -AndroidAUD_GetDeviceBuf(_THIS)
    2.24 +ANDROIDAUDIO_GetDeviceBuf(_THIS)
    2.25  {
    2.26      return Android_JNI_GetAudioBuffer();
    2.27  }
    2.28  
    2.29  static int
    2.30 -AndroidAUD_CaptureFromDevice(_THIS, void *buffer, int buflen)
    2.31 +ANDROIDAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
    2.32  {
    2.33      return Android_JNI_CaptureAudioBuffer(buffer, buflen);
    2.34  }
    2.35  
    2.36  static void
    2.37 -AndroidAUD_FlushCapture(_THIS)
    2.38 +ANDROIDAUDIO_FlushCapture(_THIS)
    2.39  {
    2.40      Android_JNI_FlushCapturedAudio();
    2.41  }
    2.42  
    2.43  static void
    2.44 -AndroidAUD_CloseDevice(_THIS)
    2.45 +ANDROIDAUDIO_CloseDevice(_THIS)
    2.46  {
    2.47      /* At this point SDL_CloseAudioDevice via close_audio_device took care of terminating the audio thread
    2.48         so it's safe to terminate the Java side buffer and AudioTrack
    2.49 @@ -137,15 +137,15 @@
    2.50  }
    2.51  
    2.52  static int
    2.53 -AndroidAUD_Init(SDL_AudioDriverImpl * impl)
    2.54 +ANDROIDAUDIO_Init(SDL_AudioDriverImpl * impl)
    2.55  {
    2.56      /* Set the function pointers */
    2.57 -    impl->OpenDevice = AndroidAUD_OpenDevice;
    2.58 -    impl->PlayDevice = AndroidAUD_PlayDevice;
    2.59 -    impl->GetDeviceBuf = AndroidAUD_GetDeviceBuf;
    2.60 -    impl->CloseDevice = AndroidAUD_CloseDevice;
    2.61 -    impl->CaptureFromDevice = AndroidAUD_CaptureFromDevice;
    2.62 -    impl->FlushCapture = AndroidAUD_FlushCapture;
    2.63 +    impl->OpenDevice = ANDROIDAUDIO_OpenDevice;
    2.64 +    impl->PlayDevice = ANDROIDAUDIO_PlayDevice;
    2.65 +    impl->GetDeviceBuf = ANDROIDAUDIO_GetDeviceBuf;
    2.66 +    impl->CloseDevice = ANDROIDAUDIO_CloseDevice;
    2.67 +    impl->CaptureFromDevice = ANDROIDAUDIO_CaptureFromDevice;
    2.68 +    impl->FlushCapture = ANDROIDAUDIO_FlushCapture;
    2.69  
    2.70      /* and the capabilities */
    2.71      impl->HasCaptureSupport = SDL_TRUE;
    2.72 @@ -155,12 +155,12 @@
    2.73      return 1;   /* this audio target is available. */
    2.74  }
    2.75  
    2.76 -AudioBootStrap ANDROIDAUD_bootstrap = {
    2.77 -    "android", "SDL Android audio driver", AndroidAUD_Init, 0
    2.78 +AudioBootStrap ANDROIDAUDIO_bootstrap = {
    2.79 +    "android", "SDL Android audio driver", ANDROIDAUDIO_Init, 0
    2.80  };
    2.81  
    2.82  /* Pause (block) all non already paused audio devices by taking their mixer lock */
    2.83 -void AndroidAUD_PauseDevices(void)
    2.84 +void ANDROIDAUDIO_PauseDevices(void)
    2.85  {
    2.86      /* TODO: Handle multiple devices? */
    2.87      struct SDL_PrivateAudioData *private;
    2.88 @@ -192,7 +192,7 @@
    2.89  }
    2.90  
    2.91  /* Resume (unblock) all non already paused audio devices by releasing their mixer lock */
    2.92 -void AndroidAUD_ResumeDevices(void)
    2.93 +void ANDROIDAUDIO_ResumeDevices(void)
    2.94  {
    2.95      /* TODO: Handle multiple devices? */
    2.96      struct SDL_PrivateAudioData *private;
     3.1 --- a/src/audio/android/SDL_androidaudio.h	Thu Aug 11 22:04:49 2016 -0400
     3.2 +++ b/src/audio/android/SDL_androidaudio.h	Thu Aug 11 22:22:09 2016 -0400
     3.3 @@ -34,8 +34,6 @@
     3.4      int resume;
     3.5  };
     3.6  
     3.7 -static void AndroidAUD_CloseDevice(_THIS);
     3.8 -
     3.9  #endif /* _SDL_androidaudio_h */
    3.10  
    3.11  /* vi: set ts=4 sw=4 expandtab: */
     4.1 --- a/src/audio/disk/SDL_diskaudio.c	Thu Aug 11 22:04:49 2016 -0400
     4.2 +++ b/src/audio/disk/SDL_diskaudio.c	Thu Aug 11 22:22:09 2016 -0400
     4.3 @@ -44,13 +44,13 @@
     4.4  
     4.5  /* This function waits until it is possible to write a full sound buffer */
     4.6  static void
     4.7 -DISKAUD_WaitDevice(_THIS)
     4.8 +DISKAUDIO_WaitDevice(_THIS)
     4.9  {
    4.10      SDL_Delay(this->hidden->io_delay);
    4.11  }
    4.12  
    4.13  static void
    4.14 -DISKAUD_PlayDevice(_THIS)
    4.15 +DISKAUDIO_PlayDevice(_THIS)
    4.16  {
    4.17      const size_t written = SDL_RWwrite(this->hidden->io,
    4.18                                         this->hidden->mixbuf,
    4.19 @@ -66,13 +66,13 @@
    4.20  }
    4.21  
    4.22  static Uint8 *
    4.23 -DISKAUD_GetDeviceBuf(_THIS)
    4.24 +DISKAUDIO_GetDeviceBuf(_THIS)
    4.25  {
    4.26      return (this->hidden->mixbuf);
    4.27  }
    4.28  
    4.29  static int
    4.30 -DISKAUD_CaptureFromDevice(_THIS, void *buffer, int buflen)
    4.31 +DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
    4.32  {
    4.33      struct SDL_PrivateAudioData *h = this->hidden;
    4.34      const int origbuflen = buflen;
    4.35 @@ -96,14 +96,14 @@
    4.36  }
    4.37  
    4.38  static void
    4.39 -DISKAUD_FlushCapture(_THIS)
    4.40 +DISKAUDIO_FlushCapture(_THIS)
    4.41  {
    4.42      /* no op...we don't advance the file pointer or anything. */
    4.43  }
    4.44  
    4.45  
    4.46  static void
    4.47 -DISKAUD_CloseDevice(_THIS)
    4.48 +DISKAUDIO_CloseDevice(_THIS)
    4.49  {
    4.50      if (this->hidden->io != NULL) {
    4.51          SDL_RWclose(this->hidden->io);
    4.52 @@ -126,7 +126,7 @@
    4.53  }
    4.54  
    4.55  static int
    4.56 -DISKAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
    4.57 +DISKAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
    4.58  {
    4.59      /* handle != NULL means "user specified the placeholder name on the fake detected device list" */
    4.60      const char *fname = get_filename(iscapture, handle ? NULL : devname);
    4.61 @@ -172,25 +172,25 @@
    4.62  }
    4.63  
    4.64  static void
    4.65 -DISKAUD_DetectDevices(void)
    4.66 +DISKAUDIO_DetectDevices(void)
    4.67  {
    4.68      SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, (void *) 0x1);
    4.69      SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, (void *) 0x2);
    4.70  }
    4.71  
    4.72  static int
    4.73 -DISKAUD_Init(SDL_AudioDriverImpl * impl)
    4.74 +DISKAUDIO_Init(SDL_AudioDriverImpl * impl)
    4.75  {
    4.76      /* Set the function pointers */
    4.77 -    impl->OpenDevice = DISKAUD_OpenDevice;
    4.78 -    impl->WaitDevice = DISKAUD_WaitDevice;
    4.79 -    impl->PlayDevice = DISKAUD_PlayDevice;
    4.80 -    impl->GetDeviceBuf = DISKAUD_GetDeviceBuf;
    4.81 -    impl->CaptureFromDevice = DISKAUD_CaptureFromDevice;
    4.82 -    impl->FlushCapture = DISKAUD_FlushCapture;
    4.83 +    impl->OpenDevice = DISKAUDIO_OpenDevice;
    4.84 +    impl->WaitDevice = DISKAUDIO_WaitDevice;
    4.85 +    impl->PlayDevice = DISKAUDIO_PlayDevice;
    4.86 +    impl->GetDeviceBuf = DISKAUDIO_GetDeviceBuf;
    4.87 +    impl->CaptureFromDevice = DISKAUDIO_CaptureFromDevice;
    4.88 +    impl->FlushCapture = DISKAUDIO_FlushCapture;
    4.89  
    4.90 -    impl->CloseDevice = DISKAUD_CloseDevice;
    4.91 -    impl->DetectDevices = DISKAUD_DetectDevices;
    4.92 +    impl->CloseDevice = DISKAUDIO_CloseDevice;
    4.93 +    impl->DetectDevices = DISKAUDIO_DetectDevices;
    4.94  
    4.95      impl->AllowsArbitraryDeviceNames = 1;
    4.96      impl->HasCaptureSupport = SDL_TRUE;
    4.97 @@ -198,8 +198,8 @@
    4.98      return 1;   /* this audio target is available. */
    4.99  }
   4.100  
   4.101 -AudioBootStrap DISKAUD_bootstrap = {
   4.102 -    "disk", "direct-to-disk audio", DISKAUD_Init, 1
   4.103 +AudioBootStrap DISKAUDIO_bootstrap = {
   4.104 +    "disk", "direct-to-disk audio", DISKAUDIO_Init, 1
   4.105  };
   4.106  
   4.107  #endif /* SDL_AUDIO_DRIVER_DISK */
     5.1 --- a/src/audio/dummy/SDL_dummyaudio.c	Thu Aug 11 22:04:49 2016 -0400
     5.2 +++ b/src/audio/dummy/SDL_dummyaudio.c	Thu Aug 11 22:22:09 2016 -0400
     5.3 @@ -28,13 +28,13 @@
     5.4  #include "SDL_dummyaudio.h"
     5.5  
     5.6  static int
     5.7 -DUMMYAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
     5.8 +DUMMYAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
     5.9  {
    5.10      return 0;                   /* always succeeds. */
    5.11  }
    5.12  
    5.13  static int
    5.14 -DUMMYAUD_CaptureFromDevice(_THIS, void *buffer, int buflen)
    5.15 +DUMMYAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
    5.16  {
    5.17      /* Delay to make this sort of simulate real audio input. */
    5.18      SDL_Delay((this->spec.samples * 1000) / this->spec.freq);
    5.19 @@ -45,11 +45,11 @@
    5.20  }
    5.21  
    5.22  static int
    5.23 -DUMMYAUD_Init(SDL_AudioDriverImpl * impl)
    5.24 +DUMMYAUDIO_Init(SDL_AudioDriverImpl * impl)
    5.25  {
    5.26      /* Set the function pointers */
    5.27 -    impl->OpenDevice = DUMMYAUD_OpenDevice;
    5.28 -    impl->CaptureFromDevice = DUMMYAUD_CaptureFromDevice;
    5.29 +    impl->OpenDevice = DUMMYAUDIO_OpenDevice;
    5.30 +    impl->CaptureFromDevice = DUMMYAUDIO_CaptureFromDevice;
    5.31  
    5.32      impl->OnlyHasDefaultOutputDevice = 1;
    5.33      impl->OnlyHasDefaultCaptureDevice = 1;
    5.34 @@ -58,8 +58,8 @@
    5.35      return 1;   /* this audio target is available. */
    5.36  }
    5.37  
    5.38 -AudioBootStrap DUMMYAUD_bootstrap = {
    5.39 -    "dummy", "SDL dummy audio driver", DUMMYAUD_Init, 1
    5.40 +AudioBootStrap DUMMYAUDIO_bootstrap = {
    5.41 +    "dummy", "SDL dummy audio driver", DUMMYAUDIO_Init, 1
    5.42  };
    5.43  
    5.44  /* vi: set ts=4 sw=4 expandtab: */
     6.1 --- a/src/audio/emscripten/SDL_emscriptenaudio.c	Thu Aug 11 22:04:49 2016 -0400
     6.2 +++ b/src/audio/emscripten/SDL_emscriptenaudio.c	Thu Aug 11 22:22:09 2016 -0400
     6.3 @@ -196,7 +196,7 @@
     6.4  
     6.5  
     6.6  static void
     6.7 -Emscripten_CloseDevice(_THIS)
     6.8 +EMSCRIPTENAUDIO_CloseDevice(_THIS)
     6.9  {
    6.10      EM_ASM_({
    6.11          if ($0) {
    6.12 @@ -233,7 +233,7 @@
    6.13  }
    6.14  
    6.15  static int
    6.16 -Emscripten_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
    6.17 +EMSCRIPTENAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
    6.18  {
    6.19      SDL_bool valid_format = SDL_FALSE;
    6.20      SDL_AudioFormat test_format;
    6.21 @@ -380,11 +380,11 @@
    6.22  }
    6.23  
    6.24  static int
    6.25 -Emscripten_Init(SDL_AudioDriverImpl * impl)
    6.26 +EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl * impl)
    6.27  {
    6.28      /* Set the function pointers */
    6.29 -    impl->OpenDevice = Emscripten_OpenDevice;
    6.30 -    impl->CloseDevice = Emscripten_CloseDevice;
    6.31 +    impl->OpenDevice = EMSCRIPTENAUDIO_OpenDevice;
    6.32 +    impl->CloseDevice = EMSCRIPTENAUDIO_CloseDevice;
    6.33  
    6.34      impl->OnlyHasDefaultOutputDevice = 1;
    6.35  
    6.36 @@ -421,8 +421,8 @@
    6.37      return available;
    6.38  }
    6.39  
    6.40 -AudioBootStrap EmscriptenAudio_bootstrap = {
    6.41 -    "emscripten", "SDL emscripten audio driver", Emscripten_Init, 0
    6.42 +AudioBootStrap EMSCRIPTENAUDIO_bootstrap = {
    6.43 +    "emscripten", "SDL emscripten audio driver", EMSCRIPTENAUDIO_Init, 0
    6.44  };
    6.45  
    6.46  #endif /* SDL_AUDIO_DRIVER_EMSCRIPTEN */
     7.1 --- a/src/audio/nacl/SDL_naclaudio.c	Thu Aug 11 22:04:49 2016 -0400
     7.2 +++ b/src/audio/nacl/SDL_naclaudio.c	Thu Aug 11 22:22:09 2016 -0400
     7.3 @@ -37,7 +37,7 @@
     7.4  #include "ppapi_simple/ps_event.h"
     7.5  
     7.6  /* The tag name used by NACL audio */
     7.7 -#define NACLAUD_DRIVER_NAME         "nacl"
     7.8 +#define NACLAUDIO_DRIVER_NAME         "nacl"
     7.9  
    7.10  #define SAMPLE_FRAME_COUNT 4096
    7.11  
    7.12 @@ -71,7 +71,7 @@
    7.13      SDL_UnlockMutex(private->mutex);
    7.14  }
    7.15  
    7.16 -static void NACLAUD_CloseDevice(SDL_AudioDevice *device) {
    7.17 +static void NACLAUDIO_CloseDevice(SDL_AudioDevice *device) {
    7.18      const PPB_Core *core = PSInterfaceCore();
    7.19      const PPB_Audio *ppb_audio = PSInterfaceAudio();
    7.20      SDL_PrivateAudioData *hidden = (SDL_PrivateAudioData *) device->hidden;
    7.21 @@ -82,7 +82,7 @@
    7.22  }
    7.23  
    7.24  static int
    7.25 -NACLAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) {
    7.26 +NACLAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) {
    7.27      PP_Instance instance = PSGetInstanceId();
    7.28      const PPB_Audio *ppb_audio = PSInterfaceAudio();
    7.29      const PPB_AudioConfig *ppb_audiocfg = PSInterfaceAudioConfig();
    7.30 @@ -118,30 +118,30 @@
    7.31  }
    7.32  
    7.33  static int
    7.34 -NACLAUD_Init(SDL_AudioDriverImpl * impl)
    7.35 +NACLAUDIO_Init(SDL_AudioDriverImpl * impl)
    7.36  {
    7.37      if (PSGetInstanceId() == 0) {
    7.38          return 0;
    7.39      }
    7.40      
    7.41      /* Set the function pointers */
    7.42 -    impl->OpenDevice = NACLAUD_OpenDevice;
    7.43 -    impl->CloseDevice = NACLAUD_CloseDevice;
    7.44 +    impl->OpenDevice = NACLAUDIO_OpenDevice;
    7.45 +    impl->CloseDevice = NACLAUDIO_CloseDevice;
    7.46      impl->OnlyHasDefaultOutputDevice = 1;
    7.47      impl->ProvidesOwnCallbackThread = 1;
    7.48      /*
    7.49 -     *    impl->WaitDevice = NACLAUD_WaitDevice;
    7.50 -     *    impl->GetDeviceBuf = NACLAUD_GetDeviceBuf;
    7.51 -     *    impl->PlayDevice = NACLAUD_PlayDevice;
    7.52 -     *    impl->Deinitialize = NACLAUD_Deinitialize;
    7.53 +     *    impl->WaitDevice = NACLAUDIO_WaitDevice;
    7.54 +     *    impl->GetDeviceBuf = NACLAUDIO_GetDeviceBuf;
    7.55 +     *    impl->PlayDevice = NACLAUDIO_PlayDevice;
    7.56 +     *    impl->Deinitialize = NACLAUDIO_Deinitialize;
    7.57       */
    7.58      
    7.59      return 1;
    7.60  }
    7.61  
    7.62 -AudioBootStrap NACLAUD_bootstrap = {
    7.63 -    NACLAUD_DRIVER_NAME, "SDL NaCl Audio Driver",
    7.64 -    NACLAUD_Init, 0
    7.65 +AudioBootStrap NACLAUDIO_bootstrap = {
    7.66 +    NACLAUDIO_DRIVER_NAME, "SDL NaCl Audio Driver",
    7.67 +    NACLAUDIO_Init, 0
    7.68  };
    7.69  
    7.70  #endif /* SDL_AUDIO_DRIVER_NACL */
     8.1 --- a/src/audio/psp/SDL_pspaudio.c	Thu Aug 11 22:04:49 2016 -0400
     8.2 +++ b/src/audio/psp/SDL_pspaudio.c	Thu Aug 11 22:22:09 2016 -0400
     8.3 @@ -39,10 +39,10 @@
     8.4  #include <pspthreadman.h>
     8.5  
     8.6  /* The tag name used by PSP audio */
     8.7 -#define PSPAUD_DRIVER_NAME         "psp"
     8.8 +#define PSPAUDIO_DRIVER_NAME         "psp"
     8.9  
    8.10  static int
    8.11 -PSPAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
    8.12 +PSPAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
    8.13  {
    8.14      int format, mixlen, i;
    8.15      this->hidden = (struct SDL_PrivateAudioData *)
    8.16 @@ -98,7 +98,7 @@
    8.17      return 0;
    8.18  }
    8.19  
    8.20 -static void PSPAUD_PlayDevice(_THIS)
    8.21 +static void PSPAUDIO_PlayDevice(_THIS)
    8.22  {
    8.23      Uint8 *mixbuf = this->hidden->mixbufs[this->hidden->next_buffer];
    8.24  
    8.25 @@ -112,16 +112,16 @@
    8.26  }
    8.27  
    8.28  /* This function waits until it is possible to write a full sound buffer */
    8.29 -static void PSPAUD_WaitDevice(_THIS)
    8.30 +static void PSPAUDIO_WaitDevice(_THIS)
    8.31  {
    8.32      /* Because we block when sending audio, there's no need for this function to do anything. */
    8.33  }
    8.34 -static Uint8 *PSPAUD_GetDeviceBuf(_THIS)
    8.35 +static Uint8 *PSPAUDIO_GetDeviceBuf(_THIS)
    8.36  {
    8.37      return this->hidden->mixbufs[this->hidden->next_buffer];
    8.38  }
    8.39  
    8.40 -static void PSPAUD_CloseDevice(_THIS)
    8.41 +static void PSPAUDIO_CloseDevice(_THIS)
    8.42  {
    8.43      if (this->hidden->channel >= 0) {
    8.44          sceAudioChRelease(this->hidden->channel);
    8.45 @@ -130,7 +130,7 @@
    8.46      SDL_free(this->hidden);
    8.47  }
    8.48  
    8.49 -static void PSPAUD_ThreadInit(_THIS)
    8.50 +static void PSPAUDIO_ThreadInit(_THIS)
    8.51  {
    8.52      /* Increase the priority of this audio thread by 1 to put it
    8.53         ahead of other SDL threads. */
    8.54 @@ -145,16 +145,16 @@
    8.55  
    8.56  
    8.57  static int
    8.58 -PSPAUD_Init(SDL_AudioDriverImpl * impl)
    8.59 +PSPAUDIO_Init(SDL_AudioDriverImpl * impl)
    8.60  {
    8.61      /* Set the function pointers */
    8.62 -    impl->OpenDevice = PSPAUD_OpenDevice;
    8.63 -    impl->PlayDevice = PSPAUD_PlayDevice;
    8.64 -    impl->WaitDevice = PSPAUD_WaitDevice;
    8.65 -    impl->GetDeviceBuf = PSPAUD_GetDeviceBuf;
    8.66 -    impl->WaitDone = PSPAUD_WaitDevice;
    8.67 -    impl->CloseDevice = PSPAUD_CloseDevice;
    8.68 -    impl->ThreadInit = PSPAUD_ThreadInit;
    8.69 +    impl->OpenDevice = PSPAUDIO_OpenDevice;
    8.70 +    impl->PlayDevice = PSPAUDIO_PlayDevice;
    8.71 +    impl->WaitDevice = PSPAUDIO_WaitDevice;
    8.72 +    impl->GetDeviceBuf = PSPAUDIO_GetDeviceBuf;
    8.73 +    impl->WaitDone = PSPAUDIO_WaitDevice;
    8.74 +    impl->CloseDevice = PSPAUDIO_CloseDevice;
    8.75 +    impl->ThreadInit = PSPAUDIO_ThreadInit;
    8.76  
    8.77      /* PSP audio device */
    8.78      impl->OnlyHasDefaultOutputDevice = 1;
    8.79 @@ -170,8 +170,8 @@
    8.80      return 1;   /* this audio target is available. */
    8.81  }
    8.82  
    8.83 -AudioBootStrap PSPAUD_bootstrap = {
    8.84 -    "psp", "PSP audio driver", PSPAUD_Init, 0
    8.85 +AudioBootStrap PSPAUDIO_bootstrap = {
    8.86 +    "psp", "PSP audio driver", PSPAUDIO_Init, 0
    8.87  };
    8.88  
    8.89   /* SDL_AUDI */
     9.1 --- a/src/video/android/SDL_androidevents.c	Thu Aug 11 22:04:49 2016 -0400
     9.2 +++ b/src/video/android/SDL_androidevents.c	Thu Aug 11 22:22:09 2016 -0400
     9.3 @@ -34,11 +34,11 @@
     9.4  void android_egl_context_restore();
     9.5  
     9.6  #if SDL_AUDIO_DRIVER_ANDROID
     9.7 -void AndroidAUD_ResumeDevices(void);
     9.8 -void AndroidAUD_PauseDevices(void);
     9.9 +void ANDROIDAUDIO_ResumeDevices(void);
    9.10 +void ANDROIDAUDIO_PauseDevices(void);
    9.11  #else
    9.12 -static void AndroidAUD_ResumeDevices(void) {}
    9.13 -static void AndroidAUD_PauseDevices(void) {}
    9.14 +static void ANDROIDAUDIO_ResumeDevices(void) {}
    9.15 +static void ANDROIDAUDIO_PauseDevices(void) {}
    9.16  #endif
    9.17  
    9.18  void 
    9.19 @@ -83,14 +83,14 @@
    9.20      if (isPaused && !isPausing) {
    9.21          /* Make sure this is the last thing we do before pausing */
    9.22          android_egl_context_backup();
    9.23 -        AndroidAUD_PauseDevices();
    9.24 +        ANDROIDAUDIO_PauseDevices();
    9.25          if(SDL_SemWait(Android_ResumeSem) == 0) {
    9.26  #else
    9.27      if (isPaused) {
    9.28          if(SDL_SemTryWait(Android_ResumeSem) == 0) {
    9.29  #endif
    9.30              isPaused = 0;
    9.31 -            AndroidAUD_ResumeDevices();
    9.32 +            ANDROIDAUDIO_ResumeDevices();
    9.33              /* Restore the GL Context from here, as this operation is thread dependent */
    9.34              if (!SDL_HasEvent(SDL_QUIT)) {
    9.35                  android_egl_context_restore();
    9.36 @@ -113,7 +113,7 @@
    9.37  #else
    9.38          if(SDL_SemTryWait(Android_PauseSem) == 0) {
    9.39              android_egl_context_backup();
    9.40 -            AndroidAUD_PauseDevices();
    9.41 +            ANDROIDAUDIO_PauseDevices();
    9.42              isPaused = 1;
    9.43          }
    9.44  #endif