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

iOS: Try to improve the default session category.

Browse Source
This commit is contained in:
David Reid
2022-08-20 09:33:42 +10:00
parent 334ed4fee6
commit 3d4ab9d9f0
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+28 -3
View File
@@ -6460,7 +6460,7 @@ typedef enum
/* iOS/tvOS/watchOS session categories. */ /* iOS/tvOS/watchOS session categories. */
typedef enum typedef enum
{ {
ma_ios_session_category_default = 0, /* AVAudioSessionCategoryPlayAndRecord with AVAudioSessionCategoryOptionDefaultToSpeaker. */ ma_ios_session_category_default = 0, /* AVAudioSessionCategoryPlayAndRecord. */
ma_ios_session_category_none, /* Leave the session category unchanged. */ ma_ios_session_category_none, /* Leave the session category unchanged. */
ma_ios_session_category_ambient, /* AVAudioSessionCategoryAmbient */ ma_ios_session_category_ambient, /* AVAudioSessionCategoryAmbient */
ma_ios_session_category_solo_ambient, /* AVAudioSessionCategorySoloAmbient */ ma_ios_session_category_solo_ambient, /* AVAudioSessionCategorySoloAmbient */
@@ -33506,10 +33506,8 @@ static ma_result ma_context_init__coreaudio(ma_context* pContext, const ma_conte
I'm going to use trial and error to determine our default session category. First we'll try PlayAndRecord. If that fails I'm going to use trial and error to determine our default session category. First we'll try PlayAndRecord. If that fails
we'll try Playback and if that fails we'll try record. If all of these fail we'll just not set the category. we'll try Playback and if that fails we'll try record. If all of these fail we'll just not set the category.
*/ */
#if 0
#if !defined(MA_APPLE_TV) && !defined(MA_APPLE_WATCH) #if !defined(MA_APPLE_TV) && !defined(MA_APPLE_WATCH)
options |= AVAudioSessionCategoryOptionDefaultToSpeaker; options |= AVAudioSessionCategoryOptionDefaultToSpeaker;
#endif
#endif #endif
if ([pAudioSession setCategory: AVAudioSessionCategoryPlayAndRecord withOptions:options error:nil]) { if ([pAudioSession setCategory: AVAudioSessionCategoryPlayAndRecord withOptions:options error:nil]) {
@@ -40412,6 +40410,33 @@ MA_API ma_result ma_device_init_ex(const ma_backend backends[], ma_uint32 backen
result = MA_NO_BACKEND; result = MA_NO_BACKEND;
for (iBackend = 0; iBackend < backendsToIterateCount; ++iBackend) { for (iBackend = 0; iBackend < backendsToIterateCount; ++iBackend) {
/*
This is a hack for iOS. If the context config is null, there's a good chance the
`ma_device_init(NULL, &deviceConfig, pDevice);` pattern is being used. In this
case, set the session category based on the device type.
*/
#if defined(MA_APPLE_MOBILE)
ma_context_config contextConfig;
if (pContextConfig == NULL) {
contextConfig = ma_context_config_init();
switch (pConfig->deviceType) {
case ma_device_type_duplex: {
contextConfig.coreaudio.sessionCategory = ma_ios_session_category_play_and_record;
} break;
case ma_device_type_capture: {
contextConfig.coreaudio.sessionCategory = ma_ios_session_category_record;
} break;
case ma_device_type_playback:
default: {
contextConfig.coreaudio.sessionCategory = ma_ios_session_category_playback;
} break;
}
pContextConfig = &contextConfig;
}
#endif
result = ma_context_init(&pBackendsToIterate[iBackend], 1, pContextConfig, pContext); result = ma_context_init(&pBackendsToIterate[iBackend], 1, pContextConfig, pContext);
if (result == MA_SUCCESS) { if (result == MA_SUCCESS) {
result = ma_device_init(pContext, pConfig, pDevice); result = ma_device_init(pContext, pConfig, pDevice);