https://github.com/libsdl-org/SDL/commit/ae3090c387f6b56e44a334aa7c593bedbefdb194
From ae3090c387f6b56e44a334aa7c593bedbefdb194 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Sat, 29 Jul 2023 21:17:05 -0400
Subject: [PATCH] androidaudio: Move Init/bootstrap code to bottom of source
code.
I can't ever find this when it's in the middle! It's a "me" problem. :)
---
src/audio/android/SDL_androidaudio.c | 44 ++++++++++++++--------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/audio/android/SDL_androidaudio.c b/src/audio/android/SDL_androidaudio.c
index c87f2b3f3252..761ec5be3765 100644
--- a/src/audio/android/SDL_androidaudio.c
+++ b/src/audio/android/SDL_androidaudio.c
@@ -126,28 +126,6 @@ static void ANDROIDAUDIO_CloseDevice(SDL_AudioDevice *device)
}
}
-static SDL_bool ANDROIDAUDIO_Init(SDL_AudioDriverImpl *impl)
-{
- // !!! FIXME: if on Android API < 24, DetectDevices and Deinitialize should be NULL and OnlyHasDefaultOutputDevice and OnlyHasDefaultCaptureDevice should be SDL_TRUE, since audio device enum and hotplug appears to require Android 7.0+.
- impl->ThreadInit = Android_AudioThreadInit;
- impl->DetectDevices = Android_StartAudioHotplug;
- impl->Deinitialize = Android_StopAudioHotplug;
- impl->OpenDevice = ANDROIDAUDIO_OpenDevice;
- impl->PlayDevice = ANDROIDAUDIO_PlayDevice;
- impl->GetDeviceBuf = ANDROIDAUDIO_GetDeviceBuf;
- impl->CloseDevice = ANDROIDAUDIO_CloseDevice;
- impl->CaptureFromDevice = ANDROIDAUDIO_CaptureFromDevice;
- impl->FlushCapture = ANDROIDAUDIO_FlushCapture;
-
- impl->HasCaptureSupport = SDL_TRUE;
-
- return SDL_TRUE;
-}
-
-AudioBootStrap ANDROIDAUDIO_bootstrap = {
- "android", "SDL Android audio driver", ANDROIDAUDIO_Init, SDL_FALSE
-};
-
// Pause (block) all non already paused audio devices by taking their mixer lock
void ANDROIDAUDIO_PauseDevices(void)
{
@@ -188,4 +166,26 @@ void ANDROIDAUDIO_ResumeDevices(void)
}
}
+static SDL_bool ANDROIDAUDIO_Init(SDL_AudioDriverImpl *impl)
+{
+ // !!! FIXME: if on Android API < 24, DetectDevices and Deinitialize should be NULL and OnlyHasDefaultOutputDevice and OnlyHasDefaultCaptureDevice should be SDL_TRUE, since audio device enum and hotplug appears to require Android 7.0+.
+ impl->ThreadInit = Android_AudioThreadInit;
+ impl->DetectDevices = Android_StartAudioHotplug;
+ impl->Deinitialize = Android_StopAudioHotplug;
+ impl->OpenDevice = ANDROIDAUDIO_OpenDevice;
+ impl->PlayDevice = ANDROIDAUDIO_PlayDevice;
+ impl->GetDeviceBuf = ANDROIDAUDIO_GetDeviceBuf;
+ impl->CloseDevice = ANDROIDAUDIO_CloseDevice;
+ impl->CaptureFromDevice = ANDROIDAUDIO_CaptureFromDevice;
+ impl->FlushCapture = ANDROIDAUDIO_FlushCapture;
+
+ impl->HasCaptureSupport = SDL_TRUE;
+
+ return SDL_TRUE;
+}
+
+AudioBootStrap ANDROIDAUDIO_bootstrap = {
+ "android", "SDL Android audio driver", ANDROIDAUDIO_Init, SDL_FALSE
+};
+
#endif // SDL_AUDIO_DRIVER_ANDROID