Skip to content

Commit 51b5b94

Browse files
committed
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. :)
1 parent 8aa5f0c commit 51b5b94

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

src/audio/android/SDL_androidaudio.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -126,28 +126,6 @@ static void ANDROIDAUDIO_CloseDevice(SDL_AudioDevice *device)
126126
}
127127
}
128128

129-
static SDL_bool ANDROIDAUDIO_Init(SDL_AudioDriverImpl *impl)
130-
{
131-
// !!! 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+.
132-
impl->ThreadInit = Android_AudioThreadInit;
133-
impl->DetectDevices = Android_StartAudioHotplug;
134-
impl->Deinitialize = Android_StopAudioHotplug;
135-
impl->OpenDevice = ANDROIDAUDIO_OpenDevice;
136-
impl->PlayDevice = ANDROIDAUDIO_PlayDevice;
137-
impl->GetDeviceBuf = ANDROIDAUDIO_GetDeviceBuf;
138-
impl->CloseDevice = ANDROIDAUDIO_CloseDevice;
139-
impl->CaptureFromDevice = ANDROIDAUDIO_CaptureFromDevice;
140-
impl->FlushCapture = ANDROIDAUDIO_FlushCapture;
141-
142-
impl->HasCaptureSupport = SDL_TRUE;
143-
144-
return SDL_TRUE;
145-
}
146-
147-
AudioBootStrap ANDROIDAUDIO_bootstrap = {
148-
"android", "SDL Android audio driver", ANDROIDAUDIO_Init, SDL_FALSE
149-
};
150-
151129
// Pause (block) all non already paused audio devices by taking their mixer lock
152130
void ANDROIDAUDIO_PauseDevices(void)
153131
{
@@ -188,4 +166,26 @@ void ANDROIDAUDIO_ResumeDevices(void)
188166
}
189167
}
190168

169+
static SDL_bool ANDROIDAUDIO_Init(SDL_AudioDriverImpl *impl)
170+
{
171+
// !!! 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+.
172+
impl->ThreadInit = Android_AudioThreadInit;
173+
impl->DetectDevices = Android_StartAudioHotplug;
174+
impl->Deinitialize = Android_StopAudioHotplug;
175+
impl->OpenDevice = ANDROIDAUDIO_OpenDevice;
176+
impl->PlayDevice = ANDROIDAUDIO_PlayDevice;
177+
impl->GetDeviceBuf = ANDROIDAUDIO_GetDeviceBuf;
178+
impl->CloseDevice = ANDROIDAUDIO_CloseDevice;
179+
impl->CaptureFromDevice = ANDROIDAUDIO_CaptureFromDevice;
180+
impl->FlushCapture = ANDROIDAUDIO_FlushCapture;
181+
182+
impl->HasCaptureSupport = SDL_TRUE;
183+
184+
return SDL_TRUE;
185+
}
186+
187+
AudioBootStrap ANDROIDAUDIO_bootstrap = {
188+
"android", "SDL Android audio driver", ANDROIDAUDIO_Init, SDL_FALSE
189+
};
190+
191191
#endif // SDL_AUDIO_DRIVER_ANDROID

0 commit comments

Comments
 (0)