| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2016 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2016 The WebRTC Project Authors. All rights reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h" | 11 #import "WebRTC/RTCAudioSession.h" |
| 12 #import "WebRTC/RTCAudioSessionConfiguration.h" |
| 12 | 13 |
| 13 #import "WebRTC/RTCLogging.h" | 14 #import "WebRTC/RTCLogging.h" |
| 14 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession+Private.h" | 15 #import "RTCAudioSession+Private.h" |
| 15 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h" | 16 |
| 16 | 17 |
| 17 @implementation RTCAudioSession (Configuration) | 18 @implementation RTCAudioSession (Configuration) |
| 18 | 19 |
| 19 - (BOOL)setConfiguration:(RTCAudioSessionConfiguration *)configuration | 20 - (BOOL)setConfiguration:(RTCAudioSessionConfiguration *)configuration |
| 20 error:(NSError **)outError { | 21 error:(NSError **)outError { |
| 21 return [self setConfiguration:configuration | 22 return [self setConfiguration:configuration |
| 22 active:NO | 23 active:NO |
| 23 shouldSetActive:NO | 24 shouldSetActive:NO |
| 24 error:outError]; | 25 error:outError]; |
| 25 } | 26 } |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 } | 163 } |
| 163 | 164 |
| 164 if (outError) { | 165 if (outError) { |
| 165 *outError = error; | 166 *outError = error; |
| 166 } | 167 } |
| 167 | 168 |
| 168 return error == nil; | 169 return error == nil; |
| 169 } | 170 } |
| 170 | 171 |
| 171 @end | 172 @end |
| OLD | NEW |