From 6f4bcd2498275dd46a384133cf8bd9845b64b8c2 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 11 Aug 2016 22:22:09 -0400 Subject: [PATCH] audio: Renamed some internal driver symbols in various targets. --- src/audio/SDL_audio.c | 29 ++++++++--------- src/audio/android/SDL_androidaudio.c | 34 +++++++++---------- src/audio/android/SDL_androidaudio.h | 2 -- src/audio/disk/SDL_diskaudio.c | 38 +++++++++++----------- src/audio/dummy/SDL_dummyaudio.c | 14 ++++---- src/audio/emscripten/SDL_emscriptenaudio.c | 14 ++++---- src/audio/nacl/SDL_naclaudio.c | 26 +++++++-------- src/audio/psp/SDL_pspaudio.c | 34 +++++++++---------- src/video/android/SDL_androidevents.c | 14 ++++---- 9 files changed, 101 insertions(+), 104 deletions(-) diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index 1d6374548a374..7c5be8bc35735 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -46,7 +46,7 @@ extern AudioBootStrap QSAAUDIO_bootstrap; extern AudioBootStrap SUNAUDIO_bootstrap; extern AudioBootStrap ARTS_bootstrap; extern AudioBootStrap ESD_bootstrap; -extern AudioBootStrap NACLAUD_bootstrap; +extern AudioBootStrap NACLAUDIO_bootstrap; extern AudioBootStrap NAS_bootstrap; extern AudioBootStrap XAUDIO2_bootstrap; extern AudioBootStrap DSOUND_bootstrap; @@ -55,17 +55,16 @@ extern AudioBootStrap PAUDIO_bootstrap; extern AudioBootStrap HAIKUAUDIO_bootstrap; extern AudioBootStrap COREAUDIO_bootstrap; extern AudioBootStrap SNDMGR_bootstrap; -extern AudioBootStrap DISKAUD_bootstrap; -extern AudioBootStrap DUMMYAUD_bootstrap; -extern AudioBootStrap DCAUD_bootstrap; +extern AudioBootStrap DISKAUDIO_bootstrap; +extern AudioBootStrap DUMMYAUDIO_bootstrap; +extern AudioBootStrap DCAUDIO_bootstrap; extern AudioBootStrap DART_bootstrap; -extern AudioBootStrap NDSAUD_bootstrap; +extern AudioBootStrap NDSAUDIO_bootstrap; extern AudioBootStrap FUSIONSOUND_bootstrap; -extern AudioBootStrap ANDROIDAUD_bootstrap; -extern AudioBootStrap PSPAUD_bootstrap; +extern AudioBootStrap ANDROIDAUDIO_bootstrap; +extern AudioBootStrap PSPAUDIO_bootstrap; extern AudioBootStrap SNDIO_bootstrap; -extern AudioBootStrap EmscriptenAudio_bootstrap; - +extern AudioBootStrap EMSCRIPTENAUDIO_bootstrap; /* Available audio drivers */ static const AudioBootStrap *const bootstrap[] = { @@ -97,7 +96,7 @@ static const AudioBootStrap *const bootstrap[] = { &ESD_bootstrap, #endif #if SDL_AUDIO_DRIVER_NACL - &NACLAUD_bootstrap, + &NACLAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_NAS &NAS_bootstrap, @@ -121,22 +120,22 @@ static const AudioBootStrap *const bootstrap[] = { &COREAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_DISK - &DISKAUD_bootstrap, + &DISKAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_DUMMY - &DUMMYAUD_bootstrap, + &DUMMYAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_FUSIONSOUND &FUSIONSOUND_bootstrap, #endif #if SDL_AUDIO_DRIVER_ANDROID - &ANDROIDAUD_bootstrap, + &ANDROIDAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_PSP - &PSPAUD_bootstrap, + &PSPAUDIO_bootstrap, #endif #if SDL_AUDIO_DRIVER_EMSCRIPTEN - &EmscriptenAudio_bootstrap, + &EMSCRIPTENAUDIO_bootstrap, #endif NULL }; diff --git a/src/audio/android/SDL_androidaudio.c b/src/audio/android/SDL_androidaudio.c index 7d5530d4b0599..96f6d631ad6db 100644 --- a/src/audio/android/SDL_androidaudio.c +++ b/src/audio/android/SDL_androidaudio.c @@ -37,7 +37,7 @@ static SDL_AudioDevice* audioDevice = NULL; static SDL_AudioDevice* captureDevice = NULL; static int -AndroidAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +ANDROIDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { SDL_AudioFormat test_format; @@ -96,31 +96,31 @@ AndroidAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } static void -AndroidAUD_PlayDevice(_THIS) +ANDROIDAUDIO_PlayDevice(_THIS) { Android_JNI_WriteAudioBuffer(); } static Uint8 * -AndroidAUD_GetDeviceBuf(_THIS) +ANDROIDAUDIO_GetDeviceBuf(_THIS) { return Android_JNI_GetAudioBuffer(); } static int -AndroidAUD_CaptureFromDevice(_THIS, void *buffer, int buflen) +ANDROIDAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen) { return Android_JNI_CaptureAudioBuffer(buffer, buflen); } static void -AndroidAUD_FlushCapture(_THIS) +ANDROIDAUDIO_FlushCapture(_THIS) { Android_JNI_FlushCapturedAudio(); } static void -AndroidAUD_CloseDevice(_THIS) +ANDROIDAUDIO_CloseDevice(_THIS) { /* At this point SDL_CloseAudioDevice via close_audio_device took care of terminating the audio thread so it's safe to terminate the Java side buffer and AudioTrack @@ -137,15 +137,15 @@ AndroidAUD_CloseDevice(_THIS) } static int -AndroidAUD_Init(SDL_AudioDriverImpl * impl) +ANDROIDAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = AndroidAUD_OpenDevice; - impl->PlayDevice = AndroidAUD_PlayDevice; - impl->GetDeviceBuf = AndroidAUD_GetDeviceBuf; - impl->CloseDevice = AndroidAUD_CloseDevice; - impl->CaptureFromDevice = AndroidAUD_CaptureFromDevice; - impl->FlushCapture = AndroidAUD_FlushCapture; + impl->OpenDevice = ANDROIDAUDIO_OpenDevice; + impl->PlayDevice = ANDROIDAUDIO_PlayDevice; + impl->GetDeviceBuf = ANDROIDAUDIO_GetDeviceBuf; + impl->CloseDevice = ANDROIDAUDIO_CloseDevice; + impl->CaptureFromDevice = ANDROIDAUDIO_CaptureFromDevice; + impl->FlushCapture = ANDROIDAUDIO_FlushCapture; /* and the capabilities */ impl->HasCaptureSupport = SDL_TRUE; @@ -155,12 +155,12 @@ AndroidAUD_Init(SDL_AudioDriverImpl * impl) return 1; /* this audio target is available. */ } -AudioBootStrap ANDROIDAUD_bootstrap = { - "android", "SDL Android audio driver", AndroidAUD_Init, 0 +AudioBootStrap ANDROIDAUDIO_bootstrap = { + "android", "SDL Android audio driver", ANDROIDAUDIO_Init, 0 }; /* Pause (block) all non already paused audio devices by taking their mixer lock */ -void AndroidAUD_PauseDevices(void) +void ANDROIDAUDIO_PauseDevices(void) { /* TODO: Handle multiple devices? */ struct SDL_PrivateAudioData *private; @@ -192,7 +192,7 @@ void AndroidAUD_PauseDevices(void) } /* Resume (unblock) all non already paused audio devices by releasing their mixer lock */ -void AndroidAUD_ResumeDevices(void) +void ANDROIDAUDIO_ResumeDevices(void) { /* TODO: Handle multiple devices? */ struct SDL_PrivateAudioData *private; diff --git a/src/audio/android/SDL_androidaudio.h b/src/audio/android/SDL_androidaudio.h index 639be9c087cf5..1336153020bd1 100644 --- a/src/audio/android/SDL_androidaudio.h +++ b/src/audio/android/SDL_androidaudio.h @@ -34,8 +34,6 @@ struct SDL_PrivateAudioData int resume; }; -static void AndroidAUD_CloseDevice(_THIS); - #endif /* _SDL_androidaudio_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c index a2dd4829522ca..ee5368844e7a2 100644 --- a/src/audio/disk/SDL_diskaudio.c +++ b/src/audio/disk/SDL_diskaudio.c @@ -44,13 +44,13 @@ /* This function waits until it is possible to write a full sound buffer */ static void -DISKAUD_WaitDevice(_THIS) +DISKAUDIO_WaitDevice(_THIS) { SDL_Delay(this->hidden->io_delay); } static void -DISKAUD_PlayDevice(_THIS) +DISKAUDIO_PlayDevice(_THIS) { const size_t written = SDL_RWwrite(this->hidden->io, this->hidden->mixbuf, @@ -66,13 +66,13 @@ DISKAUD_PlayDevice(_THIS) } static Uint8 * -DISKAUD_GetDeviceBuf(_THIS) +DISKAUDIO_GetDeviceBuf(_THIS) { return (this->hidden->mixbuf); } static int -DISKAUD_CaptureFromDevice(_THIS, void *buffer, int buflen) +DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen) { struct SDL_PrivateAudioData *h = this->hidden; const int origbuflen = buflen; @@ -96,14 +96,14 @@ DISKAUD_CaptureFromDevice(_THIS, void *buffer, int buflen) } static void -DISKAUD_FlushCapture(_THIS) +DISKAUDIO_FlushCapture(_THIS) { /* no op...we don't advance the file pointer or anything. */ } static void -DISKAUD_CloseDevice(_THIS) +DISKAUDIO_CloseDevice(_THIS) { if (this->hidden->io != NULL) { SDL_RWclose(this->hidden->io); @@ -126,7 +126,7 @@ get_filename(const int iscapture, const char *devname) } static int -DISKAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +DISKAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { /* handle != NULL means "user specified the placeholder name on the fake detected device list" */ const char *fname = get_filename(iscapture, handle ? NULL : devname); @@ -172,25 +172,25 @@ DISKAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } static void -DISKAUD_DetectDevices(void) +DISKAUDIO_DetectDevices(void) { SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, (void *) 0x1); SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, (void *) 0x2); } static int -DISKAUD_Init(SDL_AudioDriverImpl * impl) +DISKAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = DISKAUD_OpenDevice; - impl->WaitDevice = DISKAUD_WaitDevice; - impl->PlayDevice = DISKAUD_PlayDevice; - impl->GetDeviceBuf = DISKAUD_GetDeviceBuf; - impl->CaptureFromDevice = DISKAUD_CaptureFromDevice; - impl->FlushCapture = DISKAUD_FlushCapture; + impl->OpenDevice = DISKAUDIO_OpenDevice; + impl->WaitDevice = DISKAUDIO_WaitDevice; + impl->PlayDevice = DISKAUDIO_PlayDevice; + impl->GetDeviceBuf = DISKAUDIO_GetDeviceBuf; + impl->CaptureFromDevice = DISKAUDIO_CaptureFromDevice; + impl->FlushCapture = DISKAUDIO_FlushCapture; - impl->CloseDevice = DISKAUD_CloseDevice; - impl->DetectDevices = DISKAUD_DetectDevices; + impl->CloseDevice = DISKAUDIO_CloseDevice; + impl->DetectDevices = DISKAUDIO_DetectDevices; impl->AllowsArbitraryDeviceNames = 1; impl->HasCaptureSupport = SDL_TRUE; @@ -198,8 +198,8 @@ DISKAUD_Init(SDL_AudioDriverImpl * impl) return 1; /* this audio target is available. */ } -AudioBootStrap DISKAUD_bootstrap = { - "disk", "direct-to-disk audio", DISKAUD_Init, 1 +AudioBootStrap DISKAUDIO_bootstrap = { + "disk", "direct-to-disk audio", DISKAUDIO_Init, 1 }; #endif /* SDL_AUDIO_DRIVER_DISK */ diff --git a/src/audio/dummy/SDL_dummyaudio.c b/src/audio/dummy/SDL_dummyaudio.c index 0f5e42c9589c3..b39f8e3270460 100644 --- a/src/audio/dummy/SDL_dummyaudio.c +++ b/src/audio/dummy/SDL_dummyaudio.c @@ -28,13 +28,13 @@ #include "SDL_dummyaudio.h" static int -DUMMYAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +DUMMYAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { return 0; /* always succeeds. */ } static int -DUMMYAUD_CaptureFromDevice(_THIS, void *buffer, int buflen) +DUMMYAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen) { /* Delay to make this sort of simulate real audio input. */ SDL_Delay((this->spec.samples * 1000) / this->spec.freq); @@ -45,11 +45,11 @@ DUMMYAUD_CaptureFromDevice(_THIS, void *buffer, int buflen) } static int -DUMMYAUD_Init(SDL_AudioDriverImpl * impl) +DUMMYAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = DUMMYAUD_OpenDevice; - impl->CaptureFromDevice = DUMMYAUD_CaptureFromDevice; + impl->OpenDevice = DUMMYAUDIO_OpenDevice; + impl->CaptureFromDevice = DUMMYAUDIO_CaptureFromDevice; impl->OnlyHasDefaultOutputDevice = 1; impl->OnlyHasDefaultCaptureDevice = 1; @@ -58,8 +58,8 @@ DUMMYAUD_Init(SDL_AudioDriverImpl * impl) return 1; /* this audio target is available. */ } -AudioBootStrap DUMMYAUD_bootstrap = { - "dummy", "SDL dummy audio driver", DUMMYAUD_Init, 1 +AudioBootStrap DUMMYAUDIO_bootstrap = { + "dummy", "SDL dummy audio driver", DUMMYAUDIO_Init, 1 }; /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/audio/emscripten/SDL_emscriptenaudio.c b/src/audio/emscripten/SDL_emscriptenaudio.c index 2800a3bba2ed2..7cee748e7d007 100644 --- a/src/audio/emscripten/SDL_emscriptenaudio.c +++ b/src/audio/emscripten/SDL_emscriptenaudio.c @@ -196,7 +196,7 @@ HandleCaptureProcess(_THIS) static void -Emscripten_CloseDevice(_THIS) +EMSCRIPTENAUDIO_CloseDevice(_THIS) { EM_ASM_({ if ($0) { @@ -233,7 +233,7 @@ Emscripten_CloseDevice(_THIS) } static int -Emscripten_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +EMSCRIPTENAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { SDL_bool valid_format = SDL_FALSE; SDL_AudioFormat test_format; @@ -380,11 +380,11 @@ Emscripten_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) } static int -Emscripten_Init(SDL_AudioDriverImpl * impl) +EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = Emscripten_OpenDevice; - impl->CloseDevice = Emscripten_CloseDevice; + impl->OpenDevice = EMSCRIPTENAUDIO_OpenDevice; + impl->CloseDevice = EMSCRIPTENAUDIO_CloseDevice; impl->OnlyHasDefaultOutputDevice = 1; @@ -421,8 +421,8 @@ Emscripten_Init(SDL_AudioDriverImpl * impl) return available; } -AudioBootStrap EmscriptenAudio_bootstrap = { - "emscripten", "SDL emscripten audio driver", Emscripten_Init, 0 +AudioBootStrap EMSCRIPTENAUDIO_bootstrap = { + "emscripten", "SDL emscripten audio driver", EMSCRIPTENAUDIO_Init, 0 }; #endif /* SDL_AUDIO_DRIVER_EMSCRIPTEN */ diff --git a/src/audio/nacl/SDL_naclaudio.c b/src/audio/nacl/SDL_naclaudio.c index b85eab2fea33b..40cbf99cea708 100644 --- a/src/audio/nacl/SDL_naclaudio.c +++ b/src/audio/nacl/SDL_naclaudio.c @@ -37,7 +37,7 @@ #include "ppapi_simple/ps_event.h" /* The tag name used by NACL audio */ -#define NACLAUD_DRIVER_NAME "nacl" +#define NACLAUDIO_DRIVER_NAME "nacl" #define SAMPLE_FRAME_COUNT 4096 @@ -71,7 +71,7 @@ static void nacl_audio_callback(void* samples, uint32_t buffer_size, PP_TimeDelt SDL_UnlockMutex(private->mutex); } -static void NACLAUD_CloseDevice(SDL_AudioDevice *device) { +static void NACLAUDIO_CloseDevice(SDL_AudioDevice *device) { const PPB_Core *core = PSInterfaceCore(); const PPB_Audio *ppb_audio = PSInterfaceAudio(); SDL_PrivateAudioData *hidden = (SDL_PrivateAudioData *) device->hidden; @@ -82,7 +82,7 @@ static void NACLAUD_CloseDevice(SDL_AudioDevice *device) { } static int -NACLAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { +NACLAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { PP_Instance instance = PSGetInstanceId(); const PPB_Audio *ppb_audio = PSInterfaceAudio(); const PPB_AudioConfig *ppb_audiocfg = PSInterfaceAudioConfig(); @@ -118,30 +118,30 @@ NACLAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { } static int -NACLAUD_Init(SDL_AudioDriverImpl * impl) +NACLAUDIO_Init(SDL_AudioDriverImpl * impl) { if (PSGetInstanceId() == 0) { return 0; } /* Set the function pointers */ - impl->OpenDevice = NACLAUD_OpenDevice; - impl->CloseDevice = NACLAUD_CloseDevice; + impl->OpenDevice = NACLAUDIO_OpenDevice; + impl->CloseDevice = NACLAUDIO_CloseDevice; impl->OnlyHasDefaultOutputDevice = 1; impl->ProvidesOwnCallbackThread = 1; /* - * impl->WaitDevice = NACLAUD_WaitDevice; - * impl->GetDeviceBuf = NACLAUD_GetDeviceBuf; - * impl->PlayDevice = NACLAUD_PlayDevice; - * impl->Deinitialize = NACLAUD_Deinitialize; + * impl->WaitDevice = NACLAUDIO_WaitDevice; + * impl->GetDeviceBuf = NACLAUDIO_GetDeviceBuf; + * impl->PlayDevice = NACLAUDIO_PlayDevice; + * impl->Deinitialize = NACLAUDIO_Deinitialize; */ return 1; } -AudioBootStrap NACLAUD_bootstrap = { - NACLAUD_DRIVER_NAME, "SDL NaCl Audio Driver", - NACLAUD_Init, 0 +AudioBootStrap NACLAUDIO_bootstrap = { + NACLAUDIO_DRIVER_NAME, "SDL NaCl Audio Driver", + NACLAUDIO_Init, 0 }; #endif /* SDL_AUDIO_DRIVER_NACL */ diff --git a/src/audio/psp/SDL_pspaudio.c b/src/audio/psp/SDL_pspaudio.c index fec5dfa35b35e..d36190edcfdd0 100644 --- a/src/audio/psp/SDL_pspaudio.c +++ b/src/audio/psp/SDL_pspaudio.c @@ -39,10 +39,10 @@ #include /* The tag name used by PSP audio */ -#define PSPAUD_DRIVER_NAME "psp" +#define PSPAUDIO_DRIVER_NAME "psp" static int -PSPAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) +PSPAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) { int format, mixlen, i; this->hidden = (struct SDL_PrivateAudioData *) @@ -98,7 +98,7 @@ PSPAUD_OpenDevice(_THIS, void *handle, const char *devname, int iscapture) return 0; } -static void PSPAUD_PlayDevice(_THIS) +static void PSPAUDIO_PlayDevice(_THIS) { Uint8 *mixbuf = this->hidden->mixbufs[this->hidden->next_buffer]; @@ -112,16 +112,16 @@ static void PSPAUD_PlayDevice(_THIS) } /* This function waits until it is possible to write a full sound buffer */ -static void PSPAUD_WaitDevice(_THIS) +static void PSPAUDIO_WaitDevice(_THIS) { /* Because we block when sending audio, there's no need for this function to do anything. */ } -static Uint8 *PSPAUD_GetDeviceBuf(_THIS) +static Uint8 *PSPAUDIO_GetDeviceBuf(_THIS) { return this->hidden->mixbufs[this->hidden->next_buffer]; } -static void PSPAUD_CloseDevice(_THIS) +static void PSPAUDIO_CloseDevice(_THIS) { if (this->hidden->channel >= 0) { sceAudioChRelease(this->hidden->channel); @@ -130,7 +130,7 @@ static void PSPAUD_CloseDevice(_THIS) SDL_free(this->hidden); } -static void PSPAUD_ThreadInit(_THIS) +static void PSPAUDIO_ThreadInit(_THIS) { /* Increase the priority of this audio thread by 1 to put it ahead of other SDL threads. */ @@ -145,16 +145,16 @@ static void PSPAUD_ThreadInit(_THIS) static int -PSPAUD_Init(SDL_AudioDriverImpl * impl) +PSPAUDIO_Init(SDL_AudioDriverImpl * impl) { /* Set the function pointers */ - impl->OpenDevice = PSPAUD_OpenDevice; - impl->PlayDevice = PSPAUD_PlayDevice; - impl->WaitDevice = PSPAUD_WaitDevice; - impl->GetDeviceBuf = PSPAUD_GetDeviceBuf; - impl->WaitDone = PSPAUD_WaitDevice; - impl->CloseDevice = PSPAUD_CloseDevice; - impl->ThreadInit = PSPAUD_ThreadInit; + impl->OpenDevice = PSPAUDIO_OpenDevice; + impl->PlayDevice = PSPAUDIO_PlayDevice; + impl->WaitDevice = PSPAUDIO_WaitDevice; + impl->GetDeviceBuf = PSPAUDIO_GetDeviceBuf; + impl->WaitDone = PSPAUDIO_WaitDevice; + impl->CloseDevice = PSPAUDIO_CloseDevice; + impl->ThreadInit = PSPAUDIO_ThreadInit; /* PSP audio device */ impl->OnlyHasDefaultOutputDevice = 1; @@ -170,8 +170,8 @@ PSPAUD_Init(SDL_AudioDriverImpl * impl) return 1; /* this audio target is available. */ } -AudioBootStrap PSPAUD_bootstrap = { - "psp", "PSP audio driver", PSPAUD_Init, 0 +AudioBootStrap PSPAUDIO_bootstrap = { + "psp", "PSP audio driver", PSPAUDIO_Init, 0 }; /* SDL_AUDI */ diff --git a/src/video/android/SDL_androidevents.c b/src/video/android/SDL_androidevents.c index 326361af07208..c3cd4cc1b5b54 100644 --- a/src/video/android/SDL_androidevents.c +++ b/src/video/android/SDL_androidevents.c @@ -34,11 +34,11 @@ void android_egl_context_backup(); void android_egl_context_restore(); #if SDL_AUDIO_DRIVER_ANDROID -void AndroidAUD_ResumeDevices(void); -void AndroidAUD_PauseDevices(void); +void ANDROIDAUDIO_ResumeDevices(void); +void ANDROIDAUDIO_PauseDevices(void); #else -static void AndroidAUD_ResumeDevices(void) {} -static void AndroidAUD_PauseDevices(void) {} +static void ANDROIDAUDIO_ResumeDevices(void) {} +static void ANDROIDAUDIO_PauseDevices(void) {} #endif void @@ -83,14 +83,14 @@ Android_PumpEvents(_THIS) if (isPaused && !isPausing) { /* Make sure this is the last thing we do before pausing */ android_egl_context_backup(); - AndroidAUD_PauseDevices(); + ANDROIDAUDIO_PauseDevices(); if(SDL_SemWait(Android_ResumeSem) == 0) { #else if (isPaused) { if(SDL_SemTryWait(Android_ResumeSem) == 0) { #endif isPaused = 0; - AndroidAUD_ResumeDevices(); + ANDROIDAUDIO_ResumeDevices(); /* Restore the GL Context from here, as this operation is thread dependent */ if (!SDL_HasEvent(SDL_QUIT)) { android_egl_context_restore(); @@ -113,7 +113,7 @@ Android_PumpEvents(_THIS) #else if(SDL_SemTryWait(Android_PauseSem) == 0) { android_egl_context_backup(); - AndroidAUD_PauseDevices(); + ANDROIDAUDIO_PauseDevices(); isPaused = 1; } #endif