Move setting switches in AppRTCMobile to Settings screen

All setting switches except "Loopback mode" is now in the Settings
screen instead of the main screen. They are also persisted across app
launches.

Bug: webrtc:7748
Change-Id: Iafd84e5e39639770118e2503148d1bf7fb9c3d8d
Reviewed-on: https://chromium-review.googlesource.com/527034
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18626}
This commit is contained in:
Anders Carlsson
2017-06-15 16:05:13 +02:00
committed by Commit Bot
parent 7c303907a4
commit e150058236
16 changed files with 350 additions and 246 deletions

View File

@ -44,13 +44,7 @@ static NSString *const loopbackLaunchProcessArgument = @"loopback";
- (void)viewDidLoad {
[super viewDidLoad];
if ([[[NSProcessInfo processInfo] arguments] containsObject:loopbackLaunchProcessArgument]) {
[self mainView:nil
didInputRoom:@""
isLoopback:YES
isAudioOnly:NO
shouldMakeAecDump:NO
shouldUseLevelControl:NO
useManualAudio:NO];
[self mainView:nil didInputRoom:@"" isLoopback:YES];
}
}
@ -91,13 +85,7 @@ static NSString *const loopbackLaunchProcessArgument = @"loopback";
#pragma mark - ARDMainViewDelegate
- (void)mainView:(ARDMainView *)mainView
didInputRoom:(NSString *)room
isLoopback:(BOOL)isLoopback
isAudioOnly:(BOOL)isAudioOnly
shouldMakeAecDump:(BOOL)shouldMakeAecDump
shouldUseLevelControl:(BOOL)shouldUseLevelControl
useManualAudio:(BOOL)useManualAudio {
- (void)mainView:(ARDMainView *)mainView didInputRoom:(NSString *)room isLoopback:(BOOL)isLoopback {
if (!room.length) {
if (isLoopback) {
// If this is a loopback call, allow a generated room name.
@ -132,17 +120,16 @@ static NSString *const loopbackLaunchProcessArgument = @"loopback";
return;
}
ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init];
RTCAudioSession *session = [RTCAudioSession sharedInstance];
session.useManualAudio = useManualAudio;
session.useManualAudio = [settingsModel currentUseManualAudioConfigSettingFromStore];
session.isAudioEnabled = NO;
// Kick off the video call.
ARDVideoCallViewController *videoCallViewController =
[[ARDVideoCallViewController alloc] initForRoom:trimmedRoom
isLoopback:isLoopback
isAudioOnly:isAudioOnly
shouldMakeAecDump:shouldMakeAecDump
shouldUseLevelControl:shouldUseLevelControl
delegate:self];
videoCallViewController.modalTransitionStyle =
UIModalTransitionStyleCrossDissolve;