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

Merge branch 'dev' of https://github.com/dr-soft/miniaudio into dev

Browse Source
This commit is contained in:
David Reid
2020-06-28 10:26:53 +10:00
parent dd6a81b01d 526fa796d6
commit 8d19c235bf
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+14 -14
View File
@@ -24133,15 +24133,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. */
@@ -24176,8 +24169,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);
@@ -24206,11 +24197,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
@@ -25053,6 +25039,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;
} }
@@ -25080,6 +25068,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);
@@ -25235,6 +25225,16 @@ static ma_result ma_context_init__coreaudio(const ma_context_config* pConfig, ma
} }
} }
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;
} }
#endif /* Core Audio */ #endif /* Core Audio */