1.1 --- a/src/audio/dummy/SDL_dummyaudio.c	Tue Oct 03 20:48:42 2006 +0000
     1.2 +++ b/src/audio/dummy/SDL_dummyaudio.c	Tue Oct 03 22:17:59 2006 +0000
     1.3 @@ -37,11 +37,11 @@
     1.4  #define DUMMYAUD_DRIVER_NAME         "dummy"
     1.5  
     1.6  /* Audio driver functions */
     1.7 -static int DUMMYAUD_OpenAudio(_THIS, const char *devname, int iscapture);
     1.8 -static void DUMMYAUD_WaitAudio(_THIS);
     1.9 -static void DUMMYAUD_PlayAudio(_THIS);
    1.10 -static Uint8 *DUMMYAUD_GetAudioBuf(_THIS);
    1.11 -static void DUMMYAUD_CloseAudio(_THIS);
    1.12 +static int DUMMYAUD_OpenDevice(_THIS, const char *devname, int iscapture);
    1.13 +static void DUMMYAUD_WaitDevice(_THIS);
    1.14 +static void DUMMYAUD_PlayDevice(_THIS);
    1.15 +static Uint8 *DUMMYAUD_GetDeviceBuf(_THIS);
    1.16 +static void DUMMYAUD_CloseDevice(_THIS);
    1.17  
    1.18  /* Audio driver bootstrap functions */
    1.19  static int
    1.20 @@ -60,11 +60,11 @@
    1.21  DUMMYAUD_Init(SDL_AudioDriverImpl *impl)
    1.22  {
    1.23      /* Set the function pointers */
    1.24 -    impl->OpenAudio = DUMMYAUD_OpenAudio;
    1.25 -    impl->WaitAudio = DUMMYAUD_WaitAudio;
    1.26 -    impl->PlayAudio = DUMMYAUD_PlayAudio;
    1.27 -    impl->GetAudioBuf = DUMMYAUD_GetAudioBuf;
    1.28 -    impl->CloseAudio = DUMMYAUD_CloseAudio;
    1.29 +    impl->OpenDevice = DUMMYAUD_OpenDevice;
    1.30 +    impl->WaitDevice = DUMMYAUD_WaitDevice;
    1.31 +    impl->PlayDevice = DUMMYAUD_PlayDevice;
    1.32 +    impl->GetDeviceBuf = DUMMYAUD_GetDeviceBuf;
    1.33 +    impl->CloseDevice = DUMMYAUD_CloseDevice;
    1.34  
    1.35      return 1;
    1.36  }
    1.37 @@ -76,7 +76,7 @@
    1.38  
    1.39  /* This function waits until it is possible to write a full sound buffer */
    1.40  static void
    1.41 -DUMMYAUD_WaitAudio(_THIS)
    1.42 +DUMMYAUD_WaitDevice(_THIS)
    1.43  {
    1.44      /* Don't block on first calls to simulate initial fragment filling. */
    1.45      if (this->hidden->initial_calls)
    1.46 @@ -86,19 +86,19 @@
    1.47  }
    1.48  
    1.49  static void
    1.50 -DUMMYAUD_PlayAudio(_THIS)
    1.51 +DUMMYAUD_PlayDevice(_THIS)
    1.52  {
    1.53      /* no-op...this is a null driver. */
    1.54  }
    1.55  
    1.56  static Uint8 *
    1.57 -DUMMYAUD_GetAudioBuf(_THIS)
    1.58 +DUMMYAUD_GetDeviceBuf(_THIS)
    1.59  {
    1.60      return (this->hidden->mixbuf);
    1.61  }
    1.62  
    1.63  static void
    1.64 -DUMMYAUD_CloseAudio(_THIS)
    1.65 +DUMMYAUD_CloseDevice(_THIS)
    1.66  {
    1.67      if (this->hidden->mixbuf != NULL) {
    1.68          SDL_FreeAudioMem(this->hidden->mixbuf);
    1.69 @@ -109,7 +109,7 @@
    1.70  }
    1.71  
    1.72  static int
    1.73 -DUMMYAUD_OpenAudio(_THIS, const char *devname, int iscapture)
    1.74 +DUMMYAUD_OpenDevice(_THIS, const char *devname, int iscapture)
    1.75  {
    1.76      float bytes_per_sec = 0.0f;
    1.77  
    1.78 @@ -126,7 +126,7 @@
    1.79      this->hidden->mixlen = this->spec.size;
    1.80      this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
    1.81      if (this->hidden->mixbuf == NULL) {
    1.82 -        DUMMYAUD_CloseAudio(this);
    1.83 +        DUMMYAUD_CloseDevice(this);
    1.84          return 0;
    1.85      }
    1.86      SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);