diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m index cb589b6fb..d3d922613 100644 --- a/Classes/IncallViewController.m +++ b/Classes/IncallViewController.m @@ -163,7 +163,8 @@ int callCount(LinphoneCore* lc) { } -(void)viewDidAppear:(BOOL)animated { - if (dismissed) { + [super viewDidAppear:animated]; + if (dismissed) { [self dismissModalViewControllerAnimated:true]; } else { [self updateCallsDurations]; @@ -215,6 +216,7 @@ int callCount(LinphoneCore* lc) { glowingTimer = nil; } if (!mVideoShown) [[UIApplication sharedApplication] setIdleTimerDisabled:false]; + mIncallViewIsReady=FALSE; } - (void)viewDidUnload { diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib index e6af95120..f79a64430 100644 --- a/Classes/VideoViewController.xib +++ b/Classes/VideoViewController.xib @@ -1,14 +1,14 @@ - 1056 - 10K549 - 1305 - 1038.36 - 461.00 + 1280 + 11C74 + 1938 + 1138.23 + 567.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 300 + 933 YES @@ -22,11 +22,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin - YES - - YES - - + PluginDependencyRecalculationVersion + YES @@ -43,6 +40,8 @@ 292 {320, 460} + + 1 MCAwIDAAA @@ -59,6 +58,7 @@ 274 {320, 420} + 1 NO @@ -69,16 +69,12 @@ 292 {{1, 418}, {108, 62}} + NO IBCocoaTouchFramework 0 0 - - Helvetica-Bold - 15 - 16 - 3 MQA @@ -95,18 +91,29 @@ NSImage clavier-01-108px.png + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 + 292 {{106, 418}, {106, 63}} + NO IBCocoaTouchFramework 0 0 - 1 @@ -118,17 +125,20 @@ stopcall-red.png + + 292 {{211, 418}, {108, 62}} + + NO IBCocoaTouchFramework 0 0 - 1 switch @@ -138,12 +148,15 @@ + + 292 - {{216, 263}, {96, 128}} + {{233, 309}, {80, 106}} + 3 @@ -157,6 +170,7 @@ {320, 480} + 3 @@ -172,9 +186,27 @@ 274 + + YES + + + 274 + {{308, 235}, {106, 80}} + + + + + 3 + MQA + + + IBCocoaTouchFramework + + {420, 320} - + + 3 MQA @@ -187,12 +219,12 @@ 292 {{420, 0}, {60, 108}} - + + NO IBCocoaTouchFramework 0 0 - 1 @@ -207,18 +239,20 @@ NSImage clavier-01-106px.png + + 292 {{420, 107}, {60, 106}} + NO IBCocoaTouchFramework 0 0 - 1 @@ -227,17 +261,20 @@ + + 292 {{420, 212}, {60, 108}} + + NO IBCocoaTouchFramework 0 0 - Switch @@ -246,23 +283,13 @@ - - - - 274 - {{264, 210}, {142, 96}} - - - - 3 - MQA - - - IBCocoaTouchFramework + + {480, 320} + 3 @@ -335,14 +362,6 @@ 23 - - - mPreviewLand - - - - 24 - mHangUp @@ -383,13 +402,23 @@ 32 + + + mPreviewLand + + + + 24 + YES 0 - + + YES + @@ -419,10 +448,10 @@ YES - + portrait @@ -464,7 +493,6 @@ - landscape @@ -487,21 +515,22 @@ Mute - - 16 - - - YES - - - preview - 15 + + YES + + display + + 16 + + + preview + @@ -509,8 +538,9 @@ YES -1.CustomClassName + -1.IBPluginDependency -2.CustomClassName - 1.IBEditorWindowLastContentRect + -2.IBPluginDependency 1.IBPluginDependency 14.IBPluginDependency 15.IBPluginDependency @@ -534,8 +564,9 @@ YES VideoViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder - {{556, 412}, {320, 480}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -571,7 +602,164 @@ 33 - + + + YES + + UICamSwitch + UIButton + + preview + UIView + + + preview + + preview + UIView + + + + IBProjectSource + ./Classes/UICamSwitch.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UIMuteButton + UIToggleButton + + IBProjectSource + ./Classes/UIMuteButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + VideoViewController + UIViewController + + YES + + YES + mCamSwitch + mCamSwitchLand + mDisplay + mDisplayLand + mHangUp + mHangUpLand + mLandscape + mMute + mMuteLand + mPortrait + mPreview + mPreviewLand + + + YES + UICamSwitch + UICamSwitch + UIView + UIView + UIHangUpButton + UIHangUpButton + UIView + UIMuteButton + UIMuteButton + UIView + UIView + UIView + + + + YES + + YES + mCamSwitch + mCamSwitchLand + mDisplay + mDisplayLand + mHangUp + mHangUpLand + mLandscape + mMute + mMuteLand + mPortrait + mPreview + mPreviewLand + + + YES + + mCamSwitch + UICamSwitch + + + mCamSwitchLand + UICamSwitch + + + mDisplay + UIView + + + mDisplayLand + UIView + + + mHangUp + UIHangUpButton + + + mHangUpLand + UIHangUpButton + + + mLandscape + UIView + + + mMute + UIMuteButton + + + mMuteLand + UIMuteButton + + + mPortrait + UIView + + + mPreview + UIView + + + mPreviewLand + UIView + + + + + IBProjectSource + ./Classes/VideoViewController.h + + + + 0 IBCocoaTouchFramework @@ -593,10 +781,10 @@ YES {106, 60} {108, 60} - {32, 32} + {20, 20} {62, 54} - 300 + 933