OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2015 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 |
(...skipping 17 matching lines...) Expand all Loading... |
28 @end | 28 @end |
29 | 29 |
30 @implementation ARDVideoCallViewController { | 30 @implementation ARDVideoCallViewController { |
31 ARDAppClient *_client; | 31 ARDAppClient *_client; |
32 RTCVideoTrack *_remoteVideoTrack; | 32 RTCVideoTrack *_remoteVideoTrack; |
33 RTCVideoTrack *_localVideoTrack; | 33 RTCVideoTrack *_localVideoTrack; |
34 AVAudioSessionPortOverride _portOverride; | 34 AVAudioSessionPortOverride _portOverride; |
35 } | 35 } |
36 | 36 |
37 @synthesize videoCallView = _videoCallView; | 37 @synthesize videoCallView = _videoCallView; |
| 38 @synthesize localVideoTrack = _localVideoTrack; |
| 39 @synthesize remoteVideoTrack = _remoteVideoTrack; |
38 @synthesize delegate = _delegate; | 40 @synthesize delegate = _delegate; |
39 | 41 |
40 - (instancetype)initForRoom:(NSString *)room | 42 - (instancetype)initForRoom:(NSString *)room |
41 isLoopback:(BOOL)isLoopback | 43 isLoopback:(BOOL)isLoopback |
42 isAudioOnly:(BOOL)isAudioOnly | 44 isAudioOnly:(BOOL)isAudioOnly |
43 shouldMakeAecDump:(BOOL)shouldMakeAecDump | 45 shouldMakeAecDump:(BOOL)shouldMakeAecDump |
44 shouldUseLevelControl:(BOOL)shouldUseLevelControl | 46 shouldUseLevelControl:(BOOL)shouldUseLevelControl |
45 delegate:(id<ARDVideoCallViewControllerDelegate>)delegate { | 47 delegate:(id<ARDVideoCallViewControllerDelegate>)delegate { |
46 if (self = [super init]) { | 48 if (self = [super init]) { |
47 ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init]; | 49 ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init]; |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 case RTCIceConnectionStateCompleted: | 209 case RTCIceConnectionStateCompleted: |
208 case RTCIceConnectionStateFailed: | 210 case RTCIceConnectionStateFailed: |
209 case RTCIceConnectionStateDisconnected: | 211 case RTCIceConnectionStateDisconnected: |
210 case RTCIceConnectionStateClosed: | 212 case RTCIceConnectionStateClosed: |
211 case RTCIceConnectionStateCount: | 213 case RTCIceConnectionStateCount: |
212 return nil; | 214 return nil; |
213 } | 215 } |
214 } | 216 } |
215 | 217 |
216 - (void)showAlertWithMessage:(NSString*)message { | 218 - (void)showAlertWithMessage:(NSString*)message { |
217 UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:nil | 219 UIAlertController *alert = |
218 message:message | 220 [UIAlertController alertControllerWithTitle:nil |
219 delegate:nil | 221 message:message |
220 cancelButtonTitle:@"OK" | 222 preferredStyle:UIAlertControllerStyleAlert]; |
221 otherButtonTitles:nil]; | 223 |
222 [alertView show]; | 224 UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:@"OK" |
| 225 style:UIAlertActionSty
leDefault |
| 226 handler:^(UIAlertAction
*action){ |
| 227 }]; |
| 228 |
| 229 [alert addAction:defaultAction]; |
| 230 [self presentViewController:alert animated:YES completion:nil]; |
223 } | 231 } |
224 | 232 |
225 @end | 233 @end |
OLD | NEW |