mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-22 00:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for NDK issue 360. dlclose() skipped pre-API 28. This fixes weird crashes during uninit.

Browse Source
This commit is contained in:
znakeeye
2025-02-09 22:57:24 +01:00
committed by David Reid
parent afc7e17fe6
commit f970144a3d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+14 -5
View File
@@ -38467,6 +38467,18 @@ static ma_result ma_device_get_info__aaudio(ma_device* pDevice, ma_device_type t
return MA_SUCCESS; return MA_SUCCESS;
} }
static void ma_close_library__aaudio(ma_context* pContext)
{
MA_ASSERT(pContext != NULL);
/* Hack for Android bug (see https://github.com/android/ndk/issues/360). Calling dlclose() pre-API 28 may segfault. */
if (ma_android_sdk_version() >= 28) {
ma_dlclose(ma_context_get_log(pContext), pContext->aaudio.hAAudio);
}
pContext->aaudio.hAAudio = NULL;
}
static ma_result ma_context_uninit__aaudio(ma_context* pContext) static ma_result ma_context_uninit__aaudio(ma_context* pContext)
{ {
@@ -38474,9 +38486,7 @@ static ma_result ma_context_uninit__aaudio(ma_context* pContext)
MA_ASSERT(pContext->backend == ma_backend_aaudio); MA_ASSERT(pContext->backend == ma_backend_aaudio);
ma_device_job_thread_uninit(&pContext->aaudio.jobThread, &pContext->allocationCallbacks); ma_device_job_thread_uninit(&pContext->aaudio.jobThread, &pContext->allocationCallbacks);
ma_close_library__aaudio(pContext);
ma_dlclose(ma_context_get_log(pContext), pContext->aaudio.hAAudio);
pContext->aaudio.hAAudio = NULL;
return MA_SUCCESS; return MA_SUCCESS;
} }
@@ -38584,8 +38594,7 @@ static ma_result ma_context_init__aaudio(ma_context* pContext, const ma_context_
result = ma_device_job_thread_init(&jobThreadConfig, &pContext->allocationCallbacks, &pContext->aaudio.jobThread); result = ma_device_job_thread_init(&jobThreadConfig, &pContext->allocationCallbacks, &pContext->aaudio.jobThread);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
ma_dlclose(ma_context_get_log(pContext), pContext->aaudio.hAAudio); ma_close_library__aaudio(pContext);
pContext->aaudio.hAAudio = NULL;
return result; return result;
} }
} }