witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Transfer: go directly to dialer if only 1 call

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2012-04-17 16:08:46 +02:00
parent 65b9ea5898
commit 30d52391c7
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Classes/IncallViewController.m
View file

@ -124,20 +124,19 @@ void addAnimationFadeTransition(UIView* view, float duration) {
-(void) orientationChanged: (NSNotification*) notif {
int oldLinphoneOrientation = linphone_core_get_device_rotation([LinphoneManager getLc]);
UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
int newRotation = 0;
switch (orientation) {
case UIInterfaceOrientationPortrait:
linphone_core_set_device_rotation([LinphoneManager getLc], 0);
break;
case UIInterfaceOrientationLandscapeRight:
linphone_core_set_device_rotation([LinphoneManager getLc], 270);
newRotation = 270;
break;
case UIInterfaceOrientationLandscapeLeft:
linphone_core_set_device_rotation([LinphoneManager getLc], 90);
newRotation = 90;
break;
default:
break;
newRotation = 0;
}
if (oldLinphoneOrientation != linphone_core_get_device_rotation([LinphoneManager getLc])) {
if (oldLinphoneOrientation != newRotation) {
linphone_core_set_device_rotation([LinphoneManager getLc], newRotation);
linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView);
LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
@ -561,11 +560,19 @@ void addAnimationFadeTransition(UIView* view, float duration) {
calls = calls->next;
}
visibleActionSheet.actionSheetStyle = UIActionSheetStyleDefault;
if ([LinphoneManager runningOnIpad])
[visibleActionSheet showFromRect:transfer.bounds inView:transfer animated:NO];
else
[visibleActionSheet showInView:self.view];
if (visibleActionSheet.numberOfButtons == ([LinphoneManager runningOnIpad] ? 1 : 2)) {
[visibleActionSheet release];
visibleActionSheet = nil;
[UICallButton enableTransforMode:YES];
[[LinphoneManager instance] displayDialer];
} else {
visibleActionSheet.actionSheetStyle = UIActionSheetStyleDefault;
if ([LinphoneManager runningOnIpad])
[visibleActionSheet showFromRect:transfer.bounds inView:transfer animated:NO];
else
[visibleActionSheet showInView:self.view];
}
}
-(void) addCallPressed {