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 |
11 #import "ARDMainViewController.h" | 11 #import "ARDMainViewController.h" |
12 | 12 |
13 #import <AVFoundation/AVFoundation.h> | 13 #import <AVFoundation/AVFoundation.h> |
14 | 14 |
15 #import "WebRTC/RTCDispatcher.h" | 15 #import "WebRTC/RTCDispatcher.h" |
16 #import "WebRTC/RTCLogging.h" | 16 #import "WebRTC/RTCLogging.h" |
17 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h" | 17 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h" |
18 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h" | 18 #import "webrtc/modules/audio_device/ios/objc/RTCAudioSessionConfiguration.h" |
19 | 19 |
20 #import "ARDAppClient.h" | 20 #import "ARDAppClient.h" |
21 #import "ARDMainView.h" | 21 #import "ARDMainView.h" |
22 #import "ARDMediaConstraintsModel.h" | 22 #import "ARDSettingsModel.h" |
23 #import "ARDSettingsViewController.h" | 23 #import "ARDSettingsViewController.h" |
24 #import "ARDVideoCallViewController.h" | 24 #import "ARDVideoCallViewController.h" |
25 | 25 |
26 static NSString *const barButtonImageString = @"ic_settings_black_24dp.png"; | 26 static NSString *const barButtonImageString = @"ic_settings_black_24dp.png"; |
27 | 27 |
28 @interface ARDMainViewController () < | 28 @interface ARDMainViewController () < |
29 ARDMainViewDelegate, | 29 ARDMainViewDelegate, |
30 ARDVideoCallViewControllerDelegate, | 30 ARDVideoCallViewControllerDelegate, |
31 RTCAudioSessionDelegate> | 31 RTCAudioSessionDelegate> |
32 @end | 32 @end |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 block:^{ | 166 block:^{ |
167 RTCLog(@"audioSessionDidStopPlayOrRecord"); | 167 RTCLog(@"audioSessionDidStopPlayOrRecord"); |
168 [self restartAudioPlayerIfNeeded]; | 168 [self restartAudioPlayerIfNeeded]; |
169 }]; | 169 }]; |
170 } | 170 } |
171 | 171 |
172 #pragma mark - Private | 172 #pragma mark - Private |
173 - (void)showSettings:(id)sender { | 173 - (void)showSettings:(id)sender { |
174 ARDSettingsViewController *settingsController = | 174 ARDSettingsViewController *settingsController = |
175 [[ARDSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped | 175 [[ARDSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped |
176 mediaConstraintsModel:[[ARDMediaConstraintsMode
l alloc] init]]; | 176 settingsModel:[[ARDSettingsModel alloc]
init]]; |
| 177 |
177 UINavigationController *navigationController = | 178 UINavigationController *navigationController = |
178 [[UINavigationController alloc] initWithRootViewController:settingsControl
ler]; | 179 [[UINavigationController alloc] initWithRootViewController:settingsControl
ler]; |
179 [self presentViewControllerAsModal:navigationController]; | 180 [self presentViewControllerAsModal:navigationController]; |
180 } | 181 } |
181 | 182 |
182 - (void)presentViewControllerAsModal:(UIViewController *)viewController { | 183 - (void)presentViewControllerAsModal:(UIViewController *)viewController { |
183 [self presentViewController:viewController animated:YES completion:nil]; | 184 [self presentViewController:viewController animated:YES completion:nil]; |
184 } | 185 } |
185 | 186 |
186 - (void)configureAudioSession { | 187 - (void)configureAudioSession { |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 - (void)showAlertWithMessage:(NSString*)message { | 230 - (void)showAlertWithMessage:(NSString*)message { |
230 UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:nil | 231 UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:nil |
231 message:message | 232 message:message |
232 delegate:nil | 233 delegate:nil |
233 cancelButtonTitle:@"OK" | 234 cancelButtonTitle:@"OK" |
234 otherButtonTitles:nil]; | 235 otherButtonTitles:nil]; |
235 [alertView show]; | 236 [alertView show]; |
236 } | 237 } |
237 | 238 |
238 @end | 239 @end |
OLD | NEW |