diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 9bef7968a..65ec30936 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -829,14 +829,6 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach /*IOS specific*/ linphone_core_start_dtmf_stream(theLinphoneCore); - LCSipTransports transportValue; - if (linphone_core_get_sip_transports(theLinphoneCore, &transportValue)) { - ms_error("cannot get current transport"); - } - if (transportValue.udp_port != 0) { - //enable sip keepalive - linphone_core_enable_keep_alive(theLinphoneCore, true); - } } -(void) registerLogView:(id) view { mLogView = view; diff --git a/Classes/VideoViewController.h b/Classes/VideoViewController.h index ea65a8f10..48a728d42 100644 --- a/Classes/VideoViewController.h +++ b/Classes/VideoViewController.h @@ -27,12 +27,19 @@ UIHangUpButton* mHangUp; UICamSwitch* mCamSwitch; - UIView* mLandscape; - UIView* mDisplayLand; - UIView* mPreviewLand; - UIMuteButton* mMuteLand; - UIHangUpButton* mHangUpLand; - UICamSwitch* mCamSwitchLand; + UIView* mLandscapeRight; + UIView* mDisplayLandRight; + UIView* mPreviewLandRight; + UIMuteButton* mMuteLandRight; + UIHangUpButton* mHangUpLandRight; + UICamSwitch* mCamSwitchLandRight; + + UIView* mLandscapeLeft; + UIView* mDisplayLandLeft; + UIView* mPreviewLandLeft; + UIMuteButton* mMuteLandLeft; + UIHangUpButton* mHangUpLandLeft; + UICamSwitch* mCamSwitchLandLeft; BOOL isFirst; int maxCall; @@ -45,10 +52,17 @@ @property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUp; @property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitch; -@property (nonatomic, retain) IBOutlet UIView* mLandscape; -@property (nonatomic, retain) IBOutlet UIView* mDisplayLand; -@property (nonatomic, retain) IBOutlet UIView* mPreviewLand; -@property (nonatomic, retain) IBOutlet UIMuteButton* mMuteLand; -@property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUpLand; -@property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitchLand; +@property (nonatomic, retain) IBOutlet UIView* mLandscapeRight; +@property (nonatomic, retain) IBOutlet UIView* mDisplayLandRight; +@property (nonatomic, retain) IBOutlet UIView* mPreviewLandRight; +@property (nonatomic, retain) IBOutlet UIMuteButton* mMuteLandRight; +@property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUpLandRight; +@property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitchLandRight; + +@property (nonatomic, retain) IBOutlet UIView* mLandscapeLeft; +@property (nonatomic, retain) IBOutlet UIView* mDisplayLandLeft; +@property (nonatomic, retain) IBOutlet UIView* mPreviewLandLeft; +@property (nonatomic, retain) IBOutlet UIMuteButton* mMuteLandLeft; +@property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUpLandLeft; +@property (nonatomic, retain) IBOutlet UICamSwitch* mCamSwitchLandLeft; @end \ No newline at end of file diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index 94e7219a8..56d2476c5 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -29,12 +29,19 @@ @synthesize mHangUp; @synthesize mCamSwitch; -@synthesize mLandscape; -@synthesize mDisplayLand; -@synthesize mPreviewLand; -@synthesize mMuteLand; -@synthesize mHangUpLand; -@synthesize mCamSwitchLand; +@synthesize mLandscapeRight; +@synthesize mDisplayLandRight; +@synthesize mPreviewLandRight; +@synthesize mMuteLandRight; +@synthesize mHangUpLandRight; +@synthesize mCamSwitchLandRight; + +@synthesize mLandscapeLeft; +@synthesize mDisplayLandLeft; +@synthesize mPreviewLandLeft; +@synthesize mMuteLandLeft; +@synthesize mHangUpLandLeft; +@synthesize mCamSwitchLandLeft; - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { @@ -64,9 +71,11 @@ { [super viewDidLoad]; [mMute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ]; - [mMuteLand initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ]; + [mMuteLandRight initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ]; + [mMuteLandLeft initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"] offImage:[UIImage imageNamed:@"micro.png"] ]; [mCamSwitch setPreview:mPreview]; - [mCamSwitchLand setPreview:mPreviewLand]; + [mCamSwitchLandRight setPreview:mPreviewLandRight]; + [mCamSwitchLandLeft setPreview:mPreviewLandLeft]; isFirst=TRUE; } @@ -78,14 +87,19 @@ linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplay); linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreview); linphone_core_set_device_rotation([LinphoneManager getLc], 0); - + } else if (oritentation == UIInterfaceOrientationLandscapeRight ) { - [self.view addSubview:mLandscape]; - linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplayLand); - linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreviewLand); + [self.view addSubview:mLandscapeRight]; + linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplayLandRight); + linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreviewLandRight); linphone_core_set_device_rotation([LinphoneManager getLc], 270); - } - + + } else if (oritentation == UIInterfaceOrientationLandscapeLeft ) { + [self.view addSubview:mLandscapeLeft]; + linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplayLandLeft); + linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreviewLandLeft); + linphone_core_set_device_rotation([LinphoneManager getLc], 90); + } if ((oldLinphoneOrientation != linphone_core_get_device_rotation([LinphoneManager getLc])) && linphone_core_get_current_call([LinphoneManager getLc])) { //Orientation has change, must call update call @@ -126,7 +140,8 @@ withObject:nil waitUntilDone:YES]; [mMute reset]; - [mMuteLand reset]; + [mMuteLandRight reset]; + [mMuteLandLeft reset]; maxCall = linphone_core_get_max_calls([LinphoneManager getLc]); linphone_core_set_max_calls([LinphoneManager getLc], 1); } @@ -138,16 +153,20 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { // Return YES for supported orientations - return interfaceOrientation == UIInterfaceOrientationPortrait || interfaceOrientation == UIInterfaceOrientationLandscapeRight ; + return interfaceOrientation == UIInterfaceOrientationPortrait + || interfaceOrientation == UIInterfaceOrientationLandscapeRight + || interfaceOrientation == UIInterfaceOrientationLandscapeLeft; } - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { [self configureOrientation:self.interfaceOrientation]; [mMute reset]; - [mMuteLand reset]; + [mMuteLandRight reset]; + [mMuteLandLeft reset]; } - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { - [mLandscape removeFromSuperview]; + [mLandscapeLeft removeFromSuperview]; + [mLandscapeRight removeFromSuperview]; [mPortrait removeFromSuperview]; } @end diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib index 2e2c9748d..f754d3f1a 100644 --- a/Classes/VideoViewController.xib +++ b/Classes/VideoViewController.xib @@ -41,7 +41,6 @@ {320, 460} - 1 MCAwIDAAA @@ -134,7 +133,6 @@ {{211, 418}, {108, 62}} - NO IBCocoaTouchFramework 0 @@ -203,7 +201,7 @@ {{420, 0}, {60, 108}} - + NO IBCocoaTouchFramework 0 @@ -214,9 +212,9 @@ MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + NSImage - mic_active.png + micro.png NSImage @@ -231,7 +229,7 @@ {{420, 107}, {60, 106}} - + NO IBCocoaTouchFramework 0 @@ -253,7 +251,6 @@ {{420, 212}, {60, 108}} - NO IBCocoaTouchFramework 0 @@ -275,7 +272,7 @@ {{308, 233}, {106, 80}} - + 3 MQA @@ -299,6 +296,120 @@ IBCocoaTouchFramework + + + 292 + + YES + + + 274 + {{60, 0}, {420, 320}} + + + + + 3 + MQA + + + IBCocoaTouchFramework + + + + 292 + {60, 108} + + + + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + + + 292 + {{0, 107}, {60, 106}} + + + + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + + + 292 + {{0, 212}, {60, 108}} + + + NO + IBCocoaTouchFramework + 0 + 0 + Switch + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + + 274 + {{360, 233}, {106, 80}} + + + + + 3 + MQA + + + IBCocoaTouchFramework + + + {480, 320} + + + + + 3 + MQA + + + + 3 + 3 + + IBCocoaTouchFramework + @@ -343,22 +454,6 @@ 21 - - - mLandscape - - - - 22 - - - - mDisplayLand - - - - 23 - mHangUp @@ -367,30 +462,6 @@ 26 - - - mMuteLand - - - - 27 - - - - mHangUpLand - - - - 28 - - - - mCamSwitchLand - - - - 29 - view @@ -401,11 +472,99 @@ - mPreviewLand + mMuteLandRight + + + + 40 + + + + mHangUpLandRight + + + + 41 + + + + mCamSwitchLandRight + + + + 42 + + + + mLandscapeRight + + + + 43 + + + + mDisplayLandRight + + + + 44 + + + + mPreviewLandRight - 24 + 45 + + + + mDisplayLandLeft + + + + 46 + + + + mMuteLandLeft + + + + 47 + + + + mHangUpLandLeft + + + + 48 + + + + mCamSwitchLandLeft + + + + 49 + + + + mPreviewLandLeft + + + + 50 + + + + mLandscapeLeft + + + + 51 @@ -493,7 +652,7 @@ - landscape + landscape-right 19 @@ -528,6 +687,50 @@ preview + + 34 + + + YES + + + + + + + + landscape-left + + + 35 + + + preview + + + 36 + + + Cam Switch + + + 37 + + + HangHup + + + 38 + + + Mute + + + 39 + + + display + @@ -549,6 +752,15 @@ 19.CustomClassName 19.IBPluginDependency 31.IBPluginDependency + 34.IBPluginDependency + 35.IBPluginDependency + 36.CustomClassName + 36.IBPluginDependency + 37.CustomClassName + 37.IBPluginDependency + 38.CustomClassName + 38.IBPluginDependency + 39.IBPluginDependency 5.IBPluginDependency 6.CustomClassName 6.IBPluginDependency @@ -576,6 +788,15 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UICamSwitch + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIHangUpButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIMuteButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIMuteButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIHangUpButton @@ -597,7 +818,7 @@ - 33 + 51 @@ -653,29 +874,41 @@ YES mCamSwitch - mCamSwitchLand + mCamSwitchLandLeft + mCamSwitchLandRight mDisplay - mDisplayLand + mDisplayLandLeft + mDisplayLandRight mHangUp - mHangUpLand - mLandscape + mHangUpLandLeft + mHangUpLandRight + mLandscapeLeft + mLandscapeRight mMute - mMuteLand + mMuteLandLeft + mMuteLandRight mPortrait mPreview - mPreviewLand + mPreviewLandLeft + mPreviewLandRight YES UICamSwitch UICamSwitch + UICamSwitch + UIView UIView UIView UIHangUpButton UIHangUpButton + UIHangUpButton + UIView UIView UIMuteButton UIMuteButton + UIMuteButton + UIView UIView UIView UIView @@ -686,17 +919,23 @@ YES mCamSwitch - mCamSwitchLand + mCamSwitchLandLeft + mCamSwitchLandRight mDisplay - mDisplayLand + mDisplayLandLeft + mDisplayLandRight mHangUp - mHangUpLand - mLandscape + mHangUpLandLeft + mHangUpLandRight + mLandscapeLeft + mLandscapeRight mMute - mMuteLand + mMuteLandLeft + mMuteLandRight mPortrait mPreview - mPreviewLand + mPreviewLandLeft + mPreviewLandRight YES @@ -705,7 +944,11 @@ UICamSwitch - mCamSwitchLand + mCamSwitchLandLeft + UICamSwitch + + + mCamSwitchLandRight UICamSwitch @@ -713,7 +956,11 @@ UIView - mDisplayLand + mDisplayLandLeft + UIView + + + mDisplayLandRight UIView @@ -721,11 +968,19 @@ UIHangUpButton - mHangUpLand + mHangUpLandLeft UIHangUpButton - mLandscape + mHangUpLandRight + UIHangUpButton + + + mLandscapeLeft + UIView + + + mLandscapeRight UIView @@ -733,7 +988,11 @@ UIMuteButton - mMuteLand + mMuteLandLeft + UIMuteButton + + + mMuteLandRight UIMuteButton @@ -745,7 +1004,11 @@ UIView - mPreviewLand + mPreviewLandLeft + UIView + + + mPreviewLandRight UIView @@ -771,14 +1034,14 @@ YES clavier-01-106px.png clavier-01-108px.png - mic_active.png + micro.png stopcall-red.png YES {106, 60} {108, 60} - {20, 20} + {107, 67} {62, 54} diff --git a/linphone-Info.plist b/linphone-Info.plist index 549e8cff8..a2bb16988 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.4.10 + 3.4.11 CFBundleSignature ???? CFBundleVersion - 1.1 + 1.1.0.1 NSMainNibFile PhoneMainView UIApplicationExitsOnSuspend diff --git a/submodules/linphone b/submodules/linphone index 2001ce8a8..6818a24e2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2001ce8a8f32170223b182db840ef19afa9e256b +Subproject commit 6818a24e2d7ec20f3ff74026391c09ea88cc7091