diff options
author | Hailey <me@haileyok.com> | 2024-08-09 14:35:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-09 14:35:26 -0700 |
commit | 5bfe5aa503d73e687ccc048efc5138edea97bea3 (patch) | |
tree | 2777c1371e9c7a1f7d4e31e50b1bd0137ec82e67 /modules | |
parent | dd0d50a6f0f69d8b58f7dd26303b6b89528d2d04 (diff) | |
download | voidsky-5bfe5aa503d73e687ccc048efc5138edea97bea3.tar.zst |
[Video] More tweaks to `AVAudioSession` options (#4910)
Diffstat (limited to 'modules')
6 files changed, 57 insertions, 3 deletions
diff --git a/modules/expo-bluesky-swiss-army/index.ts b/modules/expo-bluesky-swiss-army/index.ts index ebd67913e..2cf4f36c5 100644 --- a/modules/expo-bluesky-swiss-army/index.ts +++ b/modules/expo-bluesky-swiss-army/index.ts @@ -1,6 +1,7 @@ import * as PlatformInfo from './src/PlatformInfo' +import {AudioCategory} from './src/PlatformInfo/types' import * as Referrer from './src/Referrer' import * as SharedPrefs from './src/SharedPrefs' import VisibilityView from './src/VisibilityView' -export {PlatformInfo, Referrer, SharedPrefs, VisibilityView} +export {AudioCategory, PlatformInfo, Referrer, SharedPrefs, VisibilityView} diff --git a/modules/expo-bluesky-swiss-army/ios/PlatformInfo/ExpoPlatformInfoModule.swift b/modules/expo-bluesky-swiss-army/ios/PlatformInfo/ExpoPlatformInfoModule.swift index ff1148a0b..471f1438b 100644 --- a/modules/expo-bluesky-swiss-army/ios/PlatformInfo/ExpoPlatformInfoModule.swift +++ b/modules/expo-bluesky-swiss-army/ios/PlatformInfo/ExpoPlatformInfoModule.swift @@ -8,14 +8,26 @@ public class ExpoPlatformInfoModule: Module { return UIAccessibility.isReduceMotionEnabled } + Function("setAudioCategory") { (audioCategoryString: String) in + let audioCategory = AVAudioSession.Category(rawValue: audioCategoryString) + try? AVAudioSession.sharedInstance().setCategory(audioCategory) + } + Function("setAudioMixWithOthers") { (mixWithOthers: Bool) in var options: AVAudioSession.CategoryOptions + let currentCategory = AVAudioSession.sharedInstance().category if mixWithOthers { options = [.mixWithOthers] } else { - options = [] + options = [.duckOthers] } - try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, mode: .default, options: options) + try? AVAudioSession + .sharedInstance() + .setCategory( + currentCategory, + mode: .default, + options: options + ) } } } diff --git a/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.native.ts b/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.native.ts index 949bd78a2..ba9dddf82 100644 --- a/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.native.ts +++ b/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.native.ts @@ -1,6 +1,8 @@ import {Platform} from 'react-native' import {requireNativeModule} from 'expo-modules-core' +import {AudioCategory} from './types' + const NativeModule = requireNativeModule('ExpoPlatformInfo') export function getIsReducedMotionEnabled(): boolean { @@ -11,3 +13,8 @@ export function setAudioMixWithOthers(mixWithOthers: boolean): void { if (Platform.OS !== 'ios') return NativeModule.setAudioMixWithOthers(mixWithOthers) } + +export function setAudioCategory(audioCategory: AudioCategory): void { + if (Platform.OS !== 'ios') return + NativeModule.setAudioCategory(audioCategory) +} diff --git a/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.ts b/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.ts index 2665748b0..5659339fb 100644 --- a/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.ts +++ b/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.ts @@ -1,9 +1,23 @@ import {NotImplementedError} from '../NotImplemented' +import {AudioCategory} from './types' export function getIsReducedMotionEnabled(): boolean { throw new NotImplementedError() } +/** + * Set whether the app's audio should mix with other apps' audio. + * @param mixWithOthers + */ export function setAudioMixWithOthers(mixWithOthers: boolean): void { throw new NotImplementedError({mixWithOthers}) } + +/** + * Set the audio category for the app. + * @param audioCategory + * @platform ios + */ +export function setAudioCategory(audioCategory: AudioCategory): void { + throw new NotImplementedError({audioCategory}) +} diff --git a/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.web.ts b/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.web.ts index 917c97396..cb64d00ce 100644 --- a/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.web.ts +++ b/modules/expo-bluesky-swiss-army/src/PlatformInfo/index.web.ts @@ -1,4 +1,5 @@ import {NotImplementedError} from '../NotImplemented' +import {AudioCategory} from './types' export function getIsReducedMotionEnabled(): boolean { if (typeof window === 'undefined') { @@ -10,3 +11,7 @@ export function getIsReducedMotionEnabled(): boolean { export function setAudioMixWithOthers(mixWithOthers: boolean): void { throw new NotImplementedError({mixWithOthers}) } + +export function setAudioCategory(audioCategory: AudioCategory): void { + throw new NotImplementedError({audioCategory}) +} diff --git a/modules/expo-bluesky-swiss-army/src/PlatformInfo/types.ts b/modules/expo-bluesky-swiss-army/src/PlatformInfo/types.ts new file mode 100644 index 000000000..374f34318 --- /dev/null +++ b/modules/expo-bluesky-swiss-army/src/PlatformInfo/types.ts @@ -0,0 +1,15 @@ +/** + * Sets the audio session category on iOS. In general, we should only need to use this for the `playback` and `ambient` + * categories. This enum however includes other categories that are available in the native API for clarity and + * potential future use. + * @see https://developer.apple.com/documentation/avfoundation/avaudiosession/category + * @platform ios + */ +export enum AudioCategory { + Ambient = 'AVAudioSessionCategoryAmbient', + Playback = 'AVAudioSessionCategoryPlayback', + _SoloAmbient = 'AVAudioSessionCategorySoloAmbient', + _Record = 'AVAudioSessionCategoryRecord', + _PlayAndRecord = 'AVAudioSessionCategoryPlayAndRecord', + _MultiRoute = 'AVAudioSessionCategoryMultiRoute', +} |