Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
f970144a
Commit
f970144a
authored
Feb 09, 2025
by
znakeeye
Committed by
David Reid
Feb 13, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for NDK issue 360. dlclose() skipped pre-API 28. This fixes weird crashes during uninit.
parent
afc7e17f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
miniaudio.h
miniaudio.h
+14
-5
No files found.
miniaudio.h
View file @
f970144a
...
...
@@ -38467,6 +38467,18 @@ static ma_result ma_device_get_info__aaudio(ma_device* pDevice, ma_device_type t
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)
{
...
...
@@ -38474,9 +38486,7 @@ static ma_result ma_context_uninit__aaudio(ma_context* pContext)
MA_ASSERT(pContext->backend == ma_backend_aaudio);
ma_device_job_thread_uninit(&pContext->aaudio.jobThread, &pContext->allocationCallbacks);
ma_dlclose(ma_context_get_log(pContext), pContext->aaudio.hAAudio);
pContext->aaudio.hAAudio = NULL;
ma_close_library__aaudio(pContext);
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);
if (result != MA_SUCCESS) {
ma_dlclose(ma_context_get_log(pContext), pContext->aaudio.hAAudio);
pContext->aaudio.hAAudio = NULL;
ma_close_library__aaudio(pContext);
return result;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment