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
526fa796
Commit
526fa796
authored
Jun 28, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Core Audio: Fix a bug with device tracking for auto stream routing.
parent
3ca94aeb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
miniaudio.h
miniaudio.h
+14
-14
No files found.
miniaudio.h
View file @
526fa796
...
@@ -24314,15 +24314,8 @@ static ma_result ma_context__uninit_device_tracking__coreaudio(ma_context* pCont
...
@@ -24314,15 +24314,8 @@ static ma_result ma_context__uninit_device_tracking__coreaudio(ma_context* pCont
static ma_result ma_device__track__coreaudio(ma_device* pDevice)
static ma_result ma_device__track__coreaudio(ma_device* pDevice)
{
{
ma_result result;
MA_ASSERT(pDevice != NULL);
MA_ASSERT(pDevice != NULL);
result = ma_context__init_device_tracking__coreaudio(pDevice->pContext);
if (result != MA_SUCCESS) {
return result;
}
ma_mutex_lock(&g_DeviceTrackingMutex_CoreAudio);
ma_mutex_lock(&g_DeviceTrackingMutex_CoreAudio);
{
{
/* Allocate memory if required. */
/* Allocate memory if required. */
...
@@ -24357,8 +24350,6 @@ static ma_result ma_device__track__coreaudio(ma_device* pDevice)
...
@@ -24357,8 +24350,6 @@ static ma_result ma_device__track__coreaudio(ma_device* pDevice)
static ma_result ma_device__untrack__coreaudio(ma_device* pDevice)
static ma_result ma_device__untrack__coreaudio(ma_device* pDevice)
{
{
ma_result result;
MA_ASSERT(pDevice != NULL);
MA_ASSERT(pDevice != NULL);
ma_mutex_lock(&g_DeviceTrackingMutex_CoreAudio);
ma_mutex_lock(&g_DeviceTrackingMutex_CoreAudio);
...
@@ -24387,11 +24378,6 @@ static ma_result ma_device__untrack__coreaudio(ma_device* pDevice)
...
@@ -24387,11 +24378,6 @@ static ma_result ma_device__untrack__coreaudio(ma_device* pDevice)
}
}
ma_mutex_unlock(&g_DeviceTrackingMutex_CoreAudio);
ma_mutex_unlock(&g_DeviceTrackingMutex_CoreAudio);
result = ma_context__uninit_device_tracking__coreaudio(pDevice->pContext);
if (result != MA_SUCCESS) {
return result;
}
return MA_SUCCESS;
return MA_SUCCESS;
}
}
#endif
#endif
...
@@ -25234,6 +25220,8 @@ static ma_result ma_context_uninit__coreaudio(ma_context* pContext)
...
@@ -25234,6 +25220,8 @@ static ma_result ma_context_uninit__coreaudio(ma_context* pContext)
ma_dlclose(pContext, pContext->coreaudio.hCoreFoundation);
ma_dlclose(pContext, pContext->coreaudio.hCoreFoundation);
#endif
#endif
ma_context__init_device_tracking__coreaudio(pContext);
(void)pContext;
(void)pContext;
return MA_SUCCESS;
return MA_SUCCESS;
}
}
...
@@ -25261,6 +25249,8 @@ static AVAudioSessionCategory ma_to_AVAudioSessionCategory(ma_ios_session_catego
...
@@ -25261,6 +25249,8 @@ static AVAudioSessionCategory ma_to_AVAudioSessionCategory(ma_ios_session_catego
static ma_result ma_context_init__coreaudio(const ma_context_config* pConfig, ma_context* pContext)
static ma_result ma_context_init__coreaudio(const ma_context_config* pConfig, ma_context* pContext)
{
{
ma_result result;
MA_ASSERT(pConfig != NULL);
MA_ASSERT(pConfig != NULL);
MA_ASSERT(pContext != NULL);
MA_ASSERT(pContext != NULL);
...
@@ -25415,6 +25405,16 @@ static ma_result ma_context_init__coreaudio(const ma_context_config* pConfig, ma
...
@@ -25415,6 +25405,16 @@ static ma_result ma_context_init__coreaudio(const ma_context_config* pConfig, ma
return MA_FAILED_TO_INIT_BACKEND;
return MA_FAILED_TO_INIT_BACKEND;
}
}
}
}
result = ma_context__init_device_tracking__coreaudio(pContext);
if (result != MA_SUCCESS) {
#if !defined(MA_NO_RUNTIME_LINKING) && !defined(MA_APPLE_MOBILE)
ma_dlclose(pContext, pContext->coreaudio.hAudioUnit);
ma_dlclose(pContext, pContext->coreaudio.hCoreAudio);
ma_dlclose(pContext, pContext->coreaudio.hCoreFoundation);
#endif
return result;
}
return MA_SUCCESS;
return MA_SUCCESS;
}
}
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