diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index 55d7eebda..888cbd83d 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -72,7 +72,7 @@ -(void) configureOrientation:(UIInterfaceOrientation) oritentation { - + int oldLinphoneOrientation = linphone_core_get_device_rotation([LinphoneManager getLc]); if (oritentation == UIInterfaceOrientationPortrait ) { [self.view addSubview:mPortrait]; linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplay); @@ -86,6 +86,11 @@ linphone_core_set_device_rotation([LinphoneManager getLc], 270); } + if ((oldLinphoneOrientation != linphone_core_get_device_rotation([LinphoneManager getLc])) + && linphone_core_get_current_call([LinphoneManager getLc])) { + //Orientation has change, must call update call + linphone_core_update_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), NULL); + } } -(void) configureOrientation { @@ -100,11 +105,10 @@ // e.g. self.myOutlet = nil; } --(void) viewWillDisappear:(BOOL)animated { -} -(void) viewDidDisappear:(BOOL)animated{ - [[UIApplication sharedApplication] setIdleTimerDisabled:NO]; + [super viewDidDisappear:animated]; + [[UIApplication sharedApplication] setIdleTimerDisabled:NO]; } -(void) viewWillAppear:(BOOL)animated { @@ -125,7 +129,8 @@ } - (void) viewDidAppear:(BOOL)animated{ - [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; + [super viewDidAppear:animated]; + [[UIApplication sharedApplication] setIdleTimerDisabled:YES]; } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { @@ -135,9 +140,6 @@ - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { [self configureOrientation:self.interfaceOrientation]; - if (fromInterfaceOrientation !=self.interfaceOrientation) { - linphone_core_update_call([LinphoneManager getLc], linphone_core_get_current_call([LinphoneManager getLc]), NULL); - } } - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [mLandscape removeFromSuperview]; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 2812e7c9f..f87b5f715 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1137,6 +1137,7 @@ VIDEO_ENABLED, HAVE_X264, ); + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, @@ -1199,6 +1200,7 @@ VIDEO_ENABLED, HAVE_X264, ); + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, @@ -1259,6 +1261,7 @@ VIDEO_ENABLED, HAVE_X264, ); + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, @@ -1319,6 +1322,7 @@ VIDEO_ENABLED, HAVE_X264, ); + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 816809d7f..c70b077ad 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -98,7 +98,7 @@ veryclean: veryclean-linphone rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm buils-silk build-ffmpeg build-libvpx $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-silk build-ffmpeg build-libvpx $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-silk clean-ffmpeg clean-libvpx clean-msx264