From de923386a0327e702d3854bd2be2fe9c0b2ccd22 Mon Sep 17 00:00:00 2001 From: Abby Yeh Date: Mon, 12 Jun 2023 13:05:29 +0200 Subject: [PATCH] Update parameters' type from NSString to AVAudioSession*. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:15233 Change-Id: I110a3fb1e992ff07aebe21881ee31d55d39db60b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/308520 Commit-Queue: Mirko Bonadei Reviewed-by: Kári Helgason Cr-Commit-Position: refs/heads/main@{#40258} --- sdk/objc/components/audio/RTCAudioSession.h | 8 ++++---- sdk/objc/components/audio/RTCAudioSession.mm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/objc/components/audio/RTCAudioSession.h b/sdk/objc/components/audio/RTCAudioSession.h index 729b5a2126..2730664858 100644 --- a/sdk/objc/components/audio/RTCAudioSession.h +++ b/sdk/objc/components/audio/RTCAudioSession.h @@ -225,14 +225,14 @@ RTC_OBJC_EXPORT // AVAudioSession. `lockForConfiguration` must be called before using them // otherwise they will fail with kRTCAudioSessionErrorLockRequired. -- (BOOL)setCategory:(NSString *)category - mode:(NSString *)mode +- (BOOL)setCategory:(AVAudioSessionCategory)category + mode:(AVAudioSessionMode)mode options:(AVAudioSessionCategoryOptions)options error:(NSError **)outError; -- (BOOL)setCategory:(NSString *)category +- (BOOL)setCategory:(AVAudioSessionCategory)category withOptions:(AVAudioSessionCategoryOptions)options error:(NSError **)outError; -- (BOOL)setMode:(NSString *)mode error:(NSError **)outError; +- (BOOL)setMode:(AVAudioSessionMode)mode error:(NSError **)outError; - (BOOL)setInputGain:(float)gain error:(NSError **)outError; - (BOOL)setPreferredSampleRate:(double)sampleRate error:(NSError **)outError; - (BOOL)setPreferredIOBufferDuration:(NSTimeInterval)duration error:(NSError **)outError; diff --git a/sdk/objc/components/audio/RTCAudioSession.mm b/sdk/objc/components/audio/RTCAudioSession.mm index 2a6a2022ea..f6b91d5409 100644 --- a/sdk/objc/components/audio/RTCAudioSession.mm +++ b/sdk/objc/components/audio/RTCAudioSession.mm @@ -407,8 +407,8 @@ ABSL_CONST_INIT thread_local bool mutex_locked = false; return success; } -- (BOOL)setCategory:(NSString *)category - mode:(NSString *)mode +- (BOOL)setCategory:(AVAudioSessionCategory)category + mode:(AVAudioSessionMode)mode options:(AVAudioSessionCategoryOptions)options error:(NSError **)outError { if (![self checkLock:outError]) { @@ -417,7 +417,7 @@ ABSL_CONST_INIT thread_local bool mutex_locked = false; return [self.session setCategory:category mode:mode options:options error:outError]; } -- (BOOL)setCategory:(NSString *)category +- (BOOL)setCategory:(AVAudioSessionCategory)category withOptions:(AVAudioSessionCategoryOptions)options error:(NSError **)outError { if (![self checkLock:outError]) { @@ -426,7 +426,7 @@ ABSL_CONST_INIT thread_local bool mutex_locked = false; return [self.session setCategory:category withOptions:options error:outError]; } -- (BOOL)setMode:(NSString *)mode error:(NSError **)outError { +- (BOOL)setMode:(AVAudioSessionMode)mode error:(NSError **)outError { if (![self checkLock:outError]) { return NO; }