Chromium Code Reviews| Index: webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m |
| diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m b/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m |
| index ef555554c941282e62ca5e5ec97d3fa5b30585ee..6bd993f56f4bbb7884e954ee736bacf4be7402ac 100644 |
| --- a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m |
| +++ b/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m |
| @@ -119,6 +119,8 @@ static CGFloat const kCallControlMargin = 8; |
| UILabel *_callOptionsLabel; |
| UISwitch *_audioOnlySwitch; |
| UILabel *_audioOnlyLabel; |
| + UISwitch *_aecdumpSwitch; |
| + UILabel *_aecdumpLabel; |
| UISwitch *_loopbackSwitch; |
| UILabel *_loopbackLabel; |
| UISwitch *_useManualAudioSwitch; |
| @@ -174,6 +176,17 @@ static CGFloat const kCallControlMargin = 8; |
| [_loopbackLabel sizeToFit]; |
| [self addSubview:_loopbackLabel]; |
| + _aecdumpSwitch = [[UISwitch alloc] initWithFrame:CGRectZero]; |
| + [_aecdumpSwitch sizeToFit]; |
| + [self addSubview:_aecdumpSwitch]; |
| + |
| + _aecdumpLabel = [[UILabel alloc] initWithFrame:CGRectZero]; |
| + _aecdumpLabel.text = @"Create AecDump"; |
| + _aecdumpLabel.font = controlFont; |
| + _aecdumpLabel.textColor = controlFontColor; |
| + [_aecdumpLabel sizeToFit]; |
| + [self addSubview:_aecdumpLabel]; |
| + |
| _useManualAudioSwitch = [[UISwitch alloc] initWithFrame:CGRectZero]; |
| [_useManualAudioSwitch sizeToFit]; |
| _useManualAudioSwitch.on = YES; |
| @@ -274,8 +287,21 @@ static CGFloat const kCallControlMargin = 8; |
| _loopbackLabel.center = CGPointMake(loopbackModeLabelCenterX, |
| CGRectGetMidY(loopbackModeRect)); |
| - CGFloat useManualAudioTop = |
| + CGFloat aecdumpModeTop = |
| CGRectGetMaxY(_loopbackSwitch.frame) + kCallControlMargin; |
| + CGRect aecdumpModeRect = CGRectMake(kCallControlMargin * 3, |
| + aecdumpModeTop, |
|
tkchin_webrtc
2016/08/25 17:22:57
nit: align
peah-webrtc
2016/08/25 21:23:36
Done.
|
| + _aecdumpSwitch.frame.size.width, |
| + _aecdumpSwitch.frame.size.height); |
| + _aecdumpSwitch.frame = aecdumpModeRect; |
| + CGFloat aecdumpModeLabelCenterX = CGRectGetMaxX(aecdumpModeRect) + |
| + kCallControlMargin + _aecdumpLabel.frame.size.width / 2; |
| + _aecdumpLabel.center = CGPointMake(aecdumpModeLabelCenterX, |
| + CGRectGetMidY(aecdumpModeRect)); |
|
tkchin_webrtc
2016/08/25 17:22:57
nit: align
peah-webrtc
2016/08/25 21:23:36
Done.
|
| + |
| + |
| + CGFloat useManualAudioTop = |
| + CGRectGetMaxY(_aecdumpSwitch.frame) + kCallControlMargin; |
| CGRect useManualAudioRect = |
| CGRectMake(kCallControlMargin * 3, |
| useManualAudioTop, |
| @@ -332,9 +358,10 @@ static CGFloat const kCallControlMargin = 8; |
| room = [room stringByReplacingOccurrencesOfString:@"-" withString:@""]; |
| [_delegate mainView:self |
| didInputRoom:room |
| - isLoopback:_loopbackSwitch.isOn |
| - isAudioOnly:_audioOnlySwitch.isOn |
| - useManualAudio:_useManualAudioSwitch.isOn]; |
| + isLoopback:_loopbackSwitch.isOn |
|
tkchin_webrtc
2016/08/25 17:22:57
nit: align ":" like before
peah-webrtc
2016/08/25 21:23:36
Done.
|
| + isAudioOnly:_audioOnlySwitch.isOn |
| + shouldMakeAecDump:_aecdumpSwitch.isOn |
| + useManualAudio:_useManualAudioSwitch.isOn]; |
| } |
| @end |