diff --git a/Classes/InCallViewController-ipad.xib b/Classes/InCallViewController-ipad.xib
new file mode 100644
index 000000000..cdf915ea3
--- /dev/null
+++ b/Classes/InCallViewController-ipad.xib
@@ -0,0 +1,1568 @@
+
+
+
+ 1280
+ 11C74
+ 1938
+ 1138.23
+ 567.00
+
+
+ IBUIViewController
+ IBUIButton
+ IBUIView
+ IBUITableView
+ IBProxyObject
+
+
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
+
+
+
+
+
+
+
+
+ 0
+ IBIPadFramework
+ YES
+ 3
+
+ {107, 67}
+ {107, 67}
+ {107, 67}
+ {106, 60}
+ {160, 60}
+ {106, 67}
+ {16, 16}
+ {107, 67}
+ {106, 67}
+ {20, 20}
+ {107, 67}
+ {107, 67}
+ {106, 67}
+ {106, 67}
+ {62, 54}
+
+ 933
+
+
diff --git a/Classes/IncallViewController.h b/Classes/IncallViewController.h
index e6ea4e234..f185a0445 100644
--- a/Classes/IncallViewController.h
+++ b/Classes/IncallViewController.h
@@ -27,7 +27,7 @@
@interface IncallViewController : UIViewController {
- UIView* controlSubView, *callControlSubView, *hangUpView;
+ UIView* controlSubView, *hangUpView;
UIButton* endCtrl;
UIButton* dialer;
@@ -37,7 +37,7 @@
UIButton* contacts;
UIButton* addVideo;
UITableView* callTableView;
- UIButton* addCall, *mergeCalls, *addToConf;
+ UIButton* addCall, *mergeCalls;
//key pad
@@ -87,7 +87,6 @@
+ (void) updateCellImageView:(UIImageView*)imageView Label:(UILabel*)label DetailLabel:(UILabel*)detailLabel AndAccessoryView:(UIButton*)accessoryView withCall:(LinphoneCall*) call;
@property (nonatomic, retain) IBOutlet UIView* controlSubView;
-@property (nonatomic, retain) IBOutlet UIView* callControlSubView;
@property (nonatomic, retain) IBOutlet UIView* padSubView;
@property (nonatomic, retain) IBOutlet UIView* hangUpView;
@property (nonatomic, retain) IBOutlet UIViewController* conferenceDetail;
@@ -103,7 +102,6 @@
@property (nonatomic, retain) IBOutlet UITableView* callTableView;
@property (nonatomic, retain) IBOutlet UIButton* addCall;
@property (nonatomic, retain) IBOutlet UIButton* mergeCalls;
-@property (nonatomic, retain) IBOutlet UIButton* addToConf;
@property (nonatomic, retain) IBOutlet UIButton* one;
@property (nonatomic, retain) IBOutlet UIButton* two;
diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index d3b984f60..4edef94a3 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -28,12 +28,10 @@
@synthesize controlSubView;
-@synthesize callControlSubView;
@synthesize padSubView;
@synthesize hangUpView;
@synthesize conferenceDetail;
-@synthesize addToConf;
@synthesize endCtrl;
@synthesize close;
@synthesize mute;
@@ -117,11 +115,17 @@ int callCount(LinphoneCore* lc) {
[addCall addTarget:self action:@selector(addCallPressed) forControlEvents:UIControlEventTouchUpInside];
[mergeCalls addTarget:self action:@selector(mergeCallsPressed) forControlEvents:UIControlEventTouchUpInside];
//[endCtrl addTarget:self action:@selector(endCallPressed) forControlEvents:UIControlEventTouchUpInside];
- [addToConf addTarget:self action:@selector(addToConfCallPressed) forControlEvents:UIControlEventTouchUpInside];
[pause addTarget:self action:@selector(pauseCallPressed) forControlEvents:UIControlEventTouchUpInside];
[mergeCalls setHidden:YES];
- mVideoViewController = [[VideoViewController alloc] initWithNibName:@"VideoViewController"
+
+ if ([LinphoneManager runningOnIpad]) {
+ ms_message("Running on iPad");
+ mVideoViewController = [[VideoViewController alloc] initWithNibName:@"VideoViewController-ipad"
+ bundle:[NSBundle mainBundle]];
+ } else {
+ mVideoViewController = [[VideoViewController alloc] initWithNibName:@"VideoViewController"
bundle:[NSBundle mainBundle]];
+ }
conferenceDetail = [[ConferenceCallDetailView alloc] initWithNibName:@"ConferenceCallDetailView"
bundle:[NSBundle mainBundle]];
@@ -145,13 +149,6 @@ int callCount(LinphoneCore* lc) {
linphone_core_add_all_to_conference(lc);
}
--(void) addToConfCallPressed {
- LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
- if (!selectedCall)
- return;
- linphone_core_add_to_conference([LinphoneManager getLc], selectedCall);
-}
-
-(void) pauseCallPressed {
LinphoneCore* lc = [LinphoneManager getLc];
@@ -341,13 +338,6 @@ int callCount(LinphoneCore* lc) {
return;
}
LinphoneCall* selectedCall = linphone_core_get_current_call([LinphoneManager getLc]);
- // hide call control subview if no call selected
- [callControlSubView setHidden:(selectedCall == NULL)];
- // hide add to conf if no conf exist
- if (!callControlSubView.hidden) {
- [addToConf setHidden:(linphone_core_get_conference_size(lc) == 0 ||
- isInConference(selectedCall))];
- }
int callsCount = linphone_core_get_calls_nb(lc);
// hide pause/resume if in conference
if (selectedCall) {
diff --git a/Classes/LinphoneUI/LinphoneManager.h b/Classes/LinphoneUI/LinphoneManager.h
index 5da93e076..6cfec8e7d 100644
--- a/Classes/LinphoneUI/LinphoneManager.h
+++ b/Classes/LinphoneUI/LinphoneManager.h
@@ -48,6 +48,7 @@ typedef enum _Connectivity {
}
+(LinphoneManager*) instance;
+(LinphoneCore*) getLc;
++(BOOL) runningOnIpad;
-(void) registerLogView:(id) view;
diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m
index fbfc39ae2..f7ba9945a 100644
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@@ -711,7 +711,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
//get default config from bundle
NSBundle* myBundle = [NSBundle mainBundle];
- NSString* factoryConfig = [myBundle pathForResource:@"linphonerc"ofType:nil] ;
+ NSString* factoryConfig = [myBundle pathForResource:[LinphoneManager runningOnIpad]?@"linphonerc-ipad":@"linphonerc" ofType:nil] ;
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *confiFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/.linphonerc"];
NSString *zrtpSecretsFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/zrtp_secrets"];
@@ -852,6 +852,12 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
}
}
++(BOOL) runningOnIpad {
+#ifdef UI_USER_INTERFACE_IDIOM
+ return (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad);
+#endif
+ return NO;
+}
@end
diff --git a/Classes/MainScreenWithVideoPreview.h b/Classes/MainScreenWithVideoPreview.h
new file mode 100644
index 000000000..6b443b6b2
--- /dev/null
+++ b/Classes/MainScreenWithVideoPreview.h
@@ -0,0 +1,30 @@
+//
+// MainScreenWithVideoPreview.h
+// linphone
+//
+// Created by Pierre-Eric Pelloux-Prayer on 07/12/11.
+// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import
+#import
+#import "PhoneViewController.h"
+
+@interface MainScreenWithVideoPreview : UIViewController {
+ UIWindow *window;
+ PhoneViewController* phoneMainView;
+
+
+ AVCaptureSession* session;
+ AVCaptureDeviceInput* input;
+
+ int currentCamera;
+}
+
+-(void) showPreview:(BOOL) show;
+
+-(void) useCameraAtIndex:(NSInteger)camIndex startSession:(BOOL)start;
+
+@property (nonatomic, retain) IBOutlet PhoneViewController* phoneMainView;
+@property (nonatomic, retain) IBOutlet UIWindow *window;
+@end
diff --git a/Classes/MainScreenWithVideoPreview.m b/Classes/MainScreenWithVideoPreview.m
new file mode 100644
index 000000000..5c7d962b0
--- /dev/null
+++ b/Classes/MainScreenWithVideoPreview.m
@@ -0,0 +1,127 @@
+//
+// MainScreenWithVideoPreview.m
+// linphone
+//
+// Created by Pierre-Eric Pelloux-Prayer on 07/12/11.
+// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "MainScreenWithVideoPreview.h"
+#import
+
+@implementation MainScreenWithVideoPreview
+@synthesize window;
+@synthesize phoneMainView;
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+ if (self) {
+ // Custom initialization
+ }
+ return self;
+}
+
+- (void)didReceiveMemoryWarning
+{
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Release any cached data, images, etc that aren't in use.
+}
+
+#pragma mark - View lifecycle
+
+/*
+// Implement loadView to create a view hierarchy programmatically, without using a nib.
+- (void)loadView
+{
+}
+*/
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad
+{
+ [super viewDidLoad];
+
+ session = [[AVCaptureSession alloc] init];
+
+
+
+ currentCamera = 0;
+
+
+
+ AVCaptureVideoPreviewLayer* previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:session];
+
+ previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
+ previewLayer.frame = self.view.bounds;
+ [self.view.layer addSublayer:previewLayer];
+
+ [session beginConfiguration];
+ [session setSessionPreset:AVCaptureSessionPresetHigh];
+ [session commitConfiguration];
+
+ [self useCameraAtIndex:0 startSession:NO];
+}
+
+-(void) switchCameraPressed {
+ [self useCameraAtIndex: (currentCamera + 1) startSession:YES];
+}
+
+-(void) useCameraAtIndex:(NSInteger)camIndex startSession:(BOOL)start {
+ [session stopRunning];
+
+ if (input != nil)
+ [session removeInput:input];
+
+ NSError* error;
+
+ NSAutoreleasePool* pool = [[NSAutoreleasePool alloc]init];
+ NSArray* array = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+ currentCamera = camIndex % [array count];
+ AVCaptureDevice* device = (AVCaptureDevice*) [array objectAtIndex:currentCamera];
+ input = [[AVCaptureDeviceInput deviceInputWithDevice:device
+ error:&error] retain];
+
+ [session addInput:input];
+
+ [pool drain];
+
+ if (start)
+ [session startRunning];
+}
+
+
+-(void) showPreview:(BOOL) show {
+ if (show && !session.running) {
+ [window addSubview:self.view];
+ [window sendSubviewToBack:self.view];
+ [session startRunning];
+ } else if (!show && session.running) {
+ [self.view removeFromSuperview];
+ [session stopRunning];
+ }
+}
+
+-(void) viewDidAppear:(BOOL)animated {
+ [phoneMainView.switchCamera addTarget:self action:@selector(switchCameraPressed) forControlEvents:UIControlEventTouchUpInside];
+}
+
+-(void) viewDidDisappear:(BOOL)animated {
+
+}
+
+- (void)viewDidUnload
+{
+ [super viewDidUnload];
+ // Release any retained subviews of the main view.
+ // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+ return NO;
+}
+
+@end
diff --git a/Classes/MainScreenWithVideoPreview.xib b/Classes/MainScreenWithVideoPreview.xib
new file mode 100644
index 000000000..8670a5b07
--- /dev/null
+++ b/Classes/MainScreenWithVideoPreview.xib
@@ -0,0 +1,393 @@
+
+
+
+ 1280
+ 11C74
+ 1938
+ 1138.23
+ 567.00
+
+
+ IBProxyObject
+ IBUITabBarItem
+ IBUIViewController
+ IBUICustomObject
+ IBUITabBarController
+ IBUIWindow
+ IBUITabBar
+ IBUIView
+
+
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBIPadFramework
+ YES
+ 3
+
+ {25, 24}
+ {25, 23}
+
+ 933
+
+
diff --git a/Classes/PhoneViewController-ipad.xib b/Classes/PhoneViewController-ipad.xib
new file mode 100644
index 000000000..ca23ef6e4
--- /dev/null
+++ b/Classes/PhoneViewController-ipad.xib
@@ -0,0 +1,1157 @@
+
+
+
+ 1280
+ 11C74
+ 1938
+ 1138.23
+ 567.00
+
+
+ IBUILabel
+ IBUIViewController
+ IBUIButton
+ IBUIView
+ IBUITextField
+ IBProxyObject
+
+
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
+
+
+
+
+
+
+
+
+ 0
+ IBIPadFramework
+ YES
+ 3
+
+ {106, 60}
+ {108, 60}
+ {160, 60}
+ {66, 65}
+ {60, 52}
+
+ 933
+
+
diff --git a/Classes/PhoneViewController.h b/Classes/PhoneViewController.h
index b9f5f09e2..f30177d2c 100644
--- a/Classes/PhoneViewController.h
+++ b/Classes/PhoneViewController.h
@@ -22,7 +22,7 @@
#import "UILinphone.h"
#import "CallDelegate.h"
-
+@class MainScreenWithVideoPreview;
@class IncallViewController;
@class FirstLoginViewController;
@@ -54,7 +54,6 @@
UIDigitButton* zero;
UIDigitButton* hash;
- UIButton* back;
UIButton* backToCallView;
UITabBarController* myTabBarController;
@@ -62,6 +61,9 @@
UIActionSheet *mIncomingCallActionSheet;
FirstLoginViewController* myFirstLoginViewController;
IncallViewController* mIncallViewController;
+ MainScreenWithVideoPreview* mMainScreenWithVideoPreview;
+
+ UIButton* switchCamera;
}
@property (nonatomic, retain) IBOutlet UIView* dialerView;
@@ -69,7 +71,6 @@
@property (nonatomic, retain) IBOutlet UITextField* address;
@property (nonatomic, retain) IBOutlet UIButton* callShort;
@property (nonatomic, retain) IBOutlet UIButton* callLarge;
-@property (nonatomic, retain) IBOutlet UIButton* hangup;
@property (nonatomic, retain) IBOutlet UILabel* status;
@property (nonatomic, retain) IBOutlet UIEraseButton* erase;
@@ -86,13 +87,15 @@
@property (nonatomic, retain) IBOutlet UIButton* zero;
@property (nonatomic, retain) IBOutlet UIButton* hash;
-@property (nonatomic, retain) IBOutlet UIButton* back;
@property (nonatomic, retain) IBOutlet UIButton* backToCallView;
+@property (nonatomic, retain) IBOutlet UIButton* switchCamera;
+
// method to handle keypad event
- (IBAction)doKeyPad:(id)sender;
@property (nonatomic, retain) IBOutlet UITabBarController* myTabBarController;
+@property (nonatomic, retain) IBOutlet MainScreenWithVideoPreview* mMainScreenWithVideoPreview;
@end
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index 6fd2f0fbc..97cd28226 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -23,6 +23,7 @@
#import
#import "LinphoneManager.h"
#include "FirstLoginViewController.h"
+#include "MainScreenWithVideoPreview.h"
#include "linphonecore.h"
#include "private.h"
@@ -31,7 +32,6 @@
@synthesize address ;
@synthesize callShort;
@synthesize callLarge;
-@synthesize hangup;
@synthesize status;
@synthesize erase;
@@ -48,13 +48,15 @@
@synthesize zero;
@synthesize hash;
-@synthesize back;
@synthesize myTabBarController;
+@synthesize mMainScreenWithVideoPreview;
@synthesize backToCallView;
+@synthesize switchCamera;
+
//implements keypad behavior
--(IBAction) doKeyPad:(id)sender {
+/*-(IBAction) doKeyPad:(id)sender {
if (sender == back) {
if ([address.text length] >0) {
NSString* newAddress;
@@ -63,7 +65,7 @@
}
}
-}
+}*/
- (void)viewDidAppear:(BOOL)animated {
[[UIApplication sharedApplication] setIdleTimerDisabled:true];
@@ -73,6 +75,13 @@
[[LinphoneManager instance] setRegistrationDelegate:myFirstLoginViewController];
[self presentModalViewController:myFirstLoginViewController animated:true];
};
+
+ [mMainScreenWithVideoPreview showPreview:YES];
+ [self updateCallAndBackButtons];
+}
+
+-(void) viewWillDisappear:(BOOL)animated {
+ [mMainScreenWithVideoPreview showPreview:NO];
}
@@ -97,7 +106,8 @@
[callLarge initWithAddress:address];
[erase initWithAddressField:address];
[backToCallView addTarget:self action:@selector(backToCallViewPressed) forControlEvents:UIControlEventTouchUpInside];
- mIncallViewController = [[IncallViewController alloc] initWithNibName:@"IncallViewController"
+
+ mIncallViewController = [[IncallViewController alloc] initWithNibName:[LinphoneManager runningOnIpad]?@"InCallViewController-ipad":@"IncallViewController"
bundle:[NSBundle mainBundle]];
}
@@ -189,6 +199,8 @@
withDisplayName:displayName];
[myTabBarController setSelectedIndex:DIALER_TAB_INDEX];
+
+ [mMainScreenWithVideoPreview showPreview:YES];
}
@@ -232,6 +244,7 @@
[mIncomingCallActionSheet release];
}
+ [mMainScreenWithVideoPreview showPreview:NO];
}
-(void) backToCallViewPressed {
@@ -248,6 +261,8 @@
[mIncallViewController displayCall:call InProgressFromUI:viewCtrl
forUser:username
withDisplayName:displayName];
+
+ [mMainScreenWithVideoPreview showPreview:NO];
}
@@ -274,6 +289,8 @@
[mIncallViewController displayVideoCall:call FromUI:viewCtrl
forUser:username
withDisplayName:displayName];
+
+ [mMainScreenWithVideoPreview showPreview:NO];
}
@@ -294,7 +311,6 @@
[dialerView dealloc];
[callShort dealloc];
[callLarge dealloc];
- [hangup dealloc];
[status dealloc];
[one dealloc];
[two dealloc];
@@ -308,7 +324,6 @@
[star dealloc];
[zero dealloc];
[hash dealloc];
- [back dealloc];
[myTabBarController release];
[mIncallViewController release];
[super dealloc];
diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib
index 8e5e6ac92..97777b7b0 100644
--- a/Classes/PhoneViewController.xib
+++ b/Classes/PhoneViewController.xib
@@ -541,8 +541,8 @@
5
IBCocoaTouchFramework
@@ -1265,7 +1265,7 @@
{106, 60}
{108, 60}
{160, 60}
- {164, 104}
+ {66, 65}
{60, 52}
diff --git a/Classes/VideoViewController-ipad.xib b/Classes/VideoViewController-ipad.xib
new file mode 100644
index 000000000..a4270d57d
--- /dev/null
+++ b/Classes/VideoViewController-ipad.xib
@@ -0,0 +1,661 @@
+
+
+
+ 1280
+ 11C74
+ 1938
+ 1138.23
+ 567.00
+
+
+ IBUIButton
+ IBUIImageView
+ IBUIView
+ IBProxyObject
+
+
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
+
+
+
+
+
+
+
+
+
+
+ 0
+ IBIPadFramework
+ YES
+ 3
+
+ {108, 60}
+ {62, 54}
+
+ 933
+
+
diff --git a/PhoneMainView.xib b/PhoneMainView.xib
index f7b3253b1..3953ea8da 100644
--- a/PhoneMainView.xib
+++ b/PhoneMainView.xib
@@ -47,7 +47,6 @@
{320, 480}
-
IBCocoaTouchFramework
NO
-