diff --git a/Classes/VideoViewController.h b/Classes/VideoViewController.h index 117404fce..4ab762d2c 100644 --- a/Classes/VideoViewController.h +++ b/Classes/VideoViewController.h @@ -21,12 +21,14 @@ @interface VideoViewController : UIViewController { UIImageView* mDisplay; + UIView* mPreview; UIMuteButton* mMute; UIHangUpButton* mHangUp; } @property (nonatomic, retain) IBOutlet UIImageView* mDisplay; +@property (nonatomic, retain) IBOutlet UIView* mPreview; @property (nonatomic, retain) IBOutlet UIMuteButton* mMute; @property (nonatomic, retain) IBOutlet UIHangUpButton* mHangUp; @end \ No newline at end of file diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m index 9b03ae3f1..d84e9b731 100644 --- a/Classes/VideoViewController.m +++ b/Classes/VideoViewController.m @@ -22,6 +22,7 @@ @implementation VideoViewController @synthesize mDisplay; +@synthesize mPreview; @synthesize mMute; @synthesize mHangUp; @@ -64,6 +65,7 @@ -(void) viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)mDisplay); + linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)mPreview); } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation diff --git a/Classes/VideoViewController.xib b/Classes/VideoViewController.xib index 5aa3cd0f7..759671486 100644 --- a/Classes/VideoViewController.xib +++ b/Classes/VideoViewController.xib @@ -110,7 +110,6 @@ {{240, 408}, {72, 37}} - NO IBCocoaTouchFramework 0 @@ -174,6 +173,14 @@ 10 + + + mPreview + + + + 11 + @@ -280,7 +287,7 @@ - 10 + 11 @@ -319,12 +326,14 @@ mDisplay mHangUp mMute + mPreview YES UIImageView UIHangUpButton UIMuteButton + UIView @@ -334,6 +343,7 @@ mDisplay mHangUp mMute + mPreview YES @@ -349,6 +359,10 @@ mMute UIMuteButton + + mPreview + UIView + diff --git a/submodules/linphone b/submodules/linphone index c22169c22..8dde32f19 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c22169c221f91dcf38347410deff544f2786185f +Subproject commit 8dde32f19c1421443f8a6e42ab1efdfb00d97246