From 81ce8d659ede1ffcb8e713020d32e7cfb6244689 Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Fri, 3 Jan 2025 07:35:17 +1100 Subject: [PATCH] prepare_audioqueue: legacy OS compatibility fix (cherry picked from commit 6024c2731f2a911b9cd776d70066719d4183ff89) --- src/audio/coreaudio/SDL_coreaudio.m | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/audio/coreaudio/SDL_coreaudio.m b/src/audio/coreaudio/SDL_coreaudio.m index 6f751d310a..0cdc3ec2a6 100644 --- a/src/audio/coreaudio/SDL_coreaudio.m +++ b/src/audio/coreaudio/SDL_coreaudio.m @@ -880,14 +880,25 @@ static int prepare_audioqueue(_THIS) // L R C LFE Ls Rs layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_12; break; +#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000) || \ + (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101500) case 7: // L R C LFE Cs Ls Rs - layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_6_1; + if (@available(macOS 10.15, iOS 13, *)) { + layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_6_1; + } else { + return SDL_SetError("Unsupported audio channels"); + } break; case 8: // L R C LFE Rls Rrs Ls Rs - layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_7_1; + if (@available(macOS 10.15, iOS 13, *)) { + layout.mChannelLayoutTag = kAudioChannelLayoutTag_WAVE_7_1; + } else { + return SDL_SetError("Unsupported audio channels"); + } break; +#endif default: return SDL_SetError("Unsupported audio channels"); }