mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 05:38:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix wrong remote view orientation after call closed in landscape mode

Browse source
This commit is contained in:
Jehan Monnier 2011-11-02 08:41:46 +01:00
parent eecb65d1d4
commit e187357992
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Classes/VideoViewController.m
View file

@ -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];

4
linphone.xcodeproj/project.pbxproj
View file

@ -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,

2
submodules/build/builder-iphone-os.mk
View file

@ -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