diff --git a/Classes/BuschJaegerAppDelegate.h b/Classes/BuschJaegerAppDelegate.h new file mode 100644 index 000000000..0bdf1aee1 --- /dev/null +++ b/Classes/BuschJaegerAppDelegate.h @@ -0,0 +1,32 @@ +/* BuschJaegerAppDelegate.h + * + * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import +#import "BuschJaegerMainView.h" + +@interface BuschJaegerAppDelegate : NSObject { + @private + UIWindow *window; + BuschJaegerMainView* buschJaegerMainView; +} + +@property (nonatomic, retain) IBOutlet UIWindow *window; +@property (nonatomic, retain) IBOutlet BuschJaegerMainView* buschJaegerMainView; + +@end diff --git a/Classes/BuschJaegerAppDelegate.m b/Classes/BuschJaegerAppDelegate.m new file mode 100644 index 000000000..a9c0e683e --- /dev/null +++ b/Classes/BuschJaegerAppDelegate.m @@ -0,0 +1,87 @@ +/* BuschJaegerAppDelegate.m + * + * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ +#import "BuschJaegerAppDelegate.h" + +@implementation BuschJaegerAppDelegate +@synthesize window; +@synthesize buschJaegerMainView; + +- (void) loadDefaultSettings { + NSString *settingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"]; + if(!settingsBundle) { + NSLog(@"Could not find Settings.bundle"); + return; + } + + NSMutableDictionary *rootSettings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Root.plist"]]; + NSMutableArray *preferences = [rootSettings objectForKey:@"PreferenceSpecifiers"]; + NSMutableDictionary *defaultsToRegister = [[NSMutableDictionary alloc] initWithCapacity:[preferences count]]; + + NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: + @"YES", @"debugenable_preference", + @"YES", @"enable_video_preference", + @"YES", @"start_video_preference", + @"YES", @"h264_preference", + @"YES", @"vp8_preference", + @"NO", @"mpeg4_preference", + @"YES", @"pcmu_preference", + @"YES", @"pcma_preference", + @"tcp", @"transport_preference", + @"NO", @"enable_srtp_preference", + @"YES", @"backgroundmode_preference", + nil]; + + [defaultsToRegister addEntriesFromDictionary:appDefaults]; + [[NSUserDefaults standardUserDefaults] registerDefaults:defaultsToRegister]; + [defaultsToRegister release]; + [[NSUserDefaults standardUserDefaults] synchronize]; + +} + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{ + [self loadDefaultSettings]; + + [window addSubview:buschJaegerMainView.view]; + + [window makeKeyAndVisible]; + + [[LinphoneManager instance] setCallDelegate:buschJaegerMainView]; + [[LinphoneManager instance] startLibLinphone]; + + [[UIApplication sharedApplication] registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound]; + + linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)buschJaegerMainView.videoView); + linphone_core_set_device_rotation([LinphoneManager getLc], 0); + linphone_core_set_capture_device([LinphoneManager getLc], "Static picture"); + + return YES; +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + [[LinphoneManager instance] enterBackgroundMode]; +} +- (void)applicationDidBecomeActive:(UIApplication *)application { + [[LinphoneManager instance] becomeActive]; +} + +- (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification { + ms_message("Kikoo"); +} + +@end diff --git a/Classes/BuschJaegerMainView.h b/Classes/BuschJaegerMainView.h new file mode 100644 index 000000000..8a6878e0d --- /dev/null +++ b/Classes/BuschJaegerMainView.h @@ -0,0 +1,48 @@ +/* BuschJaegerMainView.h + * + * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import + +#import "linphonecore.h" +#import "UILinphone.h" +#import "CallDelegate.h" +#import "LinphoneManager.h" + +@interface BuschJaegerMainView : UIViewController { +@private + UIView* videoView; + UIImageView* imageView; + UIButton* startCall; + UIHangUpButton* stopCall; + UIToggleButton* mute; + UIDigitButton* lights; + UIDigitButton* openDoor; +} + +@property (nonatomic, retain) IBOutlet UIView* videoView; +@property (nonatomic, retain) IBOutlet UIImageView* imageView; +@property (nonatomic, retain) IBOutlet UIButton* startCall; +@property (nonatomic, retain) IBOutlet UIHangUpButton* stopCall; +@property (nonatomic, retain) IBOutlet UIToggleButton* mute; +@property (nonatomic, retain) IBOutlet UIDigitButton* lights; +@property (nonatomic, retain) IBOutlet UIDigitButton* openDoor; + +- (IBAction)acceptCall:(id)sender; + +@end diff --git a/Classes/BuschJaegerMainView.m b/Classes/BuschJaegerMainView.m new file mode 100644 index 000000000..3898f2a44 --- /dev/null +++ b/Classes/BuschJaegerMainView.m @@ -0,0 +1,154 @@ +/* BuschJaegerMainView.m + * + * Copyright (C) 2011 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "BuschJaegerMainView.h" + +@implementation BuschJaegerMainView + +@synthesize videoView; +@synthesize imageView; +@synthesize startCall; +@synthesize stopCall; +@synthesize mute; +@synthesize lights; +@synthesize openDoor; + + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; +} + +#pragma mark - View lifecycle + +- (void)viewDidLoad +{ + [super viewDidLoad]; + + [openDoor initWithNumber:'1']; + [lights initWithNumber:'2']; +} + +- (void)viewDidUnload +{ + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + +- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation +{ + // Return YES for supported orientations + return (interfaceOrientation == UIInterfaceOrientationPortrait); +} + +- (void) viewDidAppear:(BOOL)animated { + [[LinphoneManager instance] setRegistrationDelegate:self]; +} + +- (void) displayCall:(LinphoneCall *)call InProgressFromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName { + /* nothing */ + +} + +- (void) displayDialerFromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName { + [LinphoneManager set:stopCall hidden:YES withName:"STOP_CALL_BTN" andReason:__FUNCTION__]; + [LinphoneManager set:startCall hidden:NO withName:"START_CALL_BTN" andReason:__FUNCTION__]; + [LinphoneManager set:videoView hidden:YES withName:"VIDEO_VIEW" andReason:__FUNCTION__]; + [LinphoneManager set:imageView hidden:NO withName:"IMAGE_VIEW" andReason:__FUNCTION__]; + [startCall setEnabled:NO]; +} + +- (void) displayInCall:(LinphoneCall *)call FromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName { + +} + +- (void) displayIncomingCall:(LinphoneCall *)call NotificationFromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName { + if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] + && [UIApplication sharedApplication].applicationState != UIApplicationStateActive) { + // Create a new notification + UILocalNotification* notif = [[[UILocalNotification alloc] init] autorelease]; + if (notif) + { + notif.repeatInterval = 0; + notif.alertBody = NSLocalizedString(@" Ding Dong ! Guess who it is ?",nil); + notif.alertAction = @"See the answer"; + notif.soundName = @"oldphone-mono-30s.caf"; + NSData *callData = [NSData dataWithBytes:&call length:sizeof(call)]; + notif.userInfo = [NSDictionary dictionaryWithObject:callData forKey:@"call"]; + + [[UIApplication sharedApplication] presentLocalNotificationNow:notif]; + } + } + + [LinphoneManager set:stopCall hidden:YES withName:"STOP_CALL_BTN" andReason:__FUNCTION__]; + [LinphoneManager set:startCall hidden:NO withName:"START_CALL_BTN" andReason:__FUNCTION__]; + [LinphoneManager set:videoView hidden:NO withName:"VIDEO_VIEW" andReason:__FUNCTION__]; + [LinphoneManager set:imageView hidden:YES withName:"IMAGE_VIEW" andReason:__FUNCTION__]; + + linphone_call_enable_camera(call, FALSE); + + [startCall setEnabled:YES]; +} + +- (void) displayVideoCall:(LinphoneCall *)call FromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName { + [LinphoneManager set:stopCall hidden:NO withName:"STOP_CALL_BTN" andReason:__FUNCTION__]; + [LinphoneManager set:startCall hidden:YES withName:"START_CALL_BTN" andReason:__FUNCTION__]; + [LinphoneManager set:videoView hidden:NO withName:"VIDEO_VIEW" andReason:__FUNCTION__]; + [LinphoneManager set:imageView hidden:YES withName:"IMAGE_VIEW" andReason:__FUNCTION__]; +} + +- (void) displayStatus:(NSString *)message { + +} + +- (void) displayNotRegisteredFromUI:(UIViewController *)viewCtrl { + +} + +- (void) displayRegisteredFromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName onDomain:(NSString *)domain { + +} + +- (void) displayRegisteringFromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName onDomain:(NSString *)domain { + +} + +- (void) displayRegistrationFailedFromUI:(UIViewController *)viewCtrl forUser:(NSString *)username withDisplayName:(NSString *)displayName onDomain:(NSString *)domain forReason:(NSString *)reason { + +} + +- (void) actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex withUserDatas:(void *)datas { + +} + +- (IBAction)acceptCall:(id)sender { + const MSList* calls = linphone_core_get_calls([LinphoneManager getLc]); + + while(calls) { + LinphoneCall* c = (LinphoneCall*) calls->data; + if (linphone_call_get_state(c) == LinphoneCallIncoming || linphone_call_get_state(c) == LinphoneCallIncomingEarlyMedia) { + linphone_core_accept_call([LinphoneManager getLc], c); + } + calls = calls->next; + } + +} + +@end diff --git a/Classes/BuschJaegerMainView.xib b/Classes/BuschJaegerMainView.xib new file mode 100644 index 000000000..bdf8a8c24 --- /dev/null +++ b/Classes/BuschJaegerMainView.xib @@ -0,0 +1,934 @@ + + + + 1280 + 11C74 + 1938 + 1138.23 + 567.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 933 + + + IBProxyObject + IBUIImageView + IBUIViewController + IBUICustomObject + IBUIButton + IBUIWindow + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + + 274 + + + + 292 + {320, 431} + + + + _NS:567 + NO + IBCocoaTouchFramework + + NSImage + icone-linphone-72.png + + + + + -2147483374 + {320, 431} + + + + _NS:196 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 292 + {{1, 431}, {78, 49}} + + + + _NS:225 + + 3 + MCAwAA + + NO + IBCocoaTouchFramework + NO + 0 + 0 + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + NSImage + 06_004_68_68_des_call-0.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + -2147483356 + {{1, 431}, {78, 49}} + + + + _NS:225 + + NO + IBCocoaTouchFramework + 0 + 0 + + + 1 + MSAxIDEAA + + + + NSImage + 06_004_68_68_des_call-2.png + + + + + + + 292 + {{81, 431}, {78, 49}} + + + + _NS:225 + + NO + IBCocoaTouchFramework + 0 + 0 + + + + + NSImage + 06_003_68_68_des_open-0.png + + + + + + + 292 + {{161, 431}, {78, 49}} + + + + _NS:225 + + NO + IBCocoaTouchFramework + 0 + 0 + Light + + + + + + NSImage + 06_001_68_68_des_light-2.png + + + + + + + 292 + {{241, 431}, {78, 49}} + + + + _NS:225 + + NO + IBCocoaTouchFramework + 0 + 0 + + + + + NSImage + 06_005_68_68_des_mute-0.png + + + + + + {320, 480} + + + + + 2 + MC4wNTQ5MDE5NjA3OCAwLjA4MjM1Mjk0MTE4IDAuMTI5NDExNzY0NwA + + + IBCocoaTouchFramework + + + 1 + 1 + + IBCocoaTouchFramework + NO + + + + 292 + {320, 480} + + + + _NS:180 + + NO + NO + + IBCocoaTouchFramework + YES + + + IBCocoaTouchFramework + + + + + + + delegate + + + + 39 + + + + acceptCall: + + + 7 + + 42 + + + + stopCallPressed: + + + 7 + + 25 + + + + doAction: + + + 7 + + 22 + + + + doAction: + + + 7 + + 23 + + + + videoView + + + + 36 + + + + imageView + + + + 30 + + + + lights + + + + 31 + + + + mute + + + + 32 + + + + openDoor + + + + 33 + + + + stopCall + + + + 35 + + + + startCall + + + + 34 + + + + window + + + + 40 + + + + buschJaegerMainView + + + + 41 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 29 + + + + + + + + 37 + + + + + + 38 + + + + + 1 + + + + + + + + + + + + + + 4 + + + VideoView + + + 12 + + + + + 10 + + + Light + + + 9 + + + Mute + + + 8 + + + OpenDoor + + + 7 + + + StopCall + + + 6 + + + StartCall + + + + + UIApplication + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + IBBuiltInLabel-Red + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + BuschJaegerMainView + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + BuschJaegerAppDelegate + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + IBBuiltInLabel-Red + UIHangUpButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + IBBuiltInLabel-Red + UIDigitButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + IBBuiltInLabel-Red + UIMuteButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + IBBuiltInLabel-Red + + + + + + 42 + + + + + BuschJaegerAppDelegate + NSObject + + BuschJaegerMainView + UIWindow + + + + buschJaegerMainView + BuschJaegerMainView + + + window + UIWindow + + + + IBProjectSource + ./Classes/BuschJaegerAppDelegate.h + + + + BuschJaegerMainView + UIViewController + + acceptCall: + id + + + acceptCall: + + acceptCall: + id + + + + UIImageView + UIDigitButton + UIToggleButton + UIDigitButton + UIButton + UIHangUpButton + UIView + + + + imageView + UIImageView + + + lights + UIDigitButton + + + mute + UIToggleButton + + + openDoor + UIDigitButton + + + startCall + UIButton + + + stopCall + UIHangUpButton + + + videoView + UIView + + + + IBProjectSource + ./Classes/BuschJaegerMainView.h + + + + IncallViewController + UIViewController + + doAction: + id + + + doAction: + + doAction: + id + + + + UIButton + UIButton + UITableView + UIButton + UIViewController + UIButton + UIView + UIButton + UIButton + UIButton + UIButton + UIButton + UIView + UIButton + UIButton + UIButton + UIButton + UIButton + UIView + UIButton + UIButton + UIButton + UIButton + UIButton + UIButton + UIButton + VideoViewController + UIButton + + + + addCall + UIButton + + + addVideo + UIButton + + + callTableView + UITableView + + + close + UIButton + + + conferenceDetail + UIViewController + + + contacts + UIButton + + + controlSubView + UIView + + + dialer + UIButton + + + eight + UIButton + + + endCtrl + UIButton + + + five + UIButton + + + four + UIButton + + + hangUpView + UIView + + + hash + UIButton + + + mergeCalls + UIButton + + + mute + UIButton + + + nine + UIButton + + + one + UIButton + + + padSubView + UIView + + + pause + UIButton + + + seven + UIButton + + + six + UIButton + + + speaker + UIButton + + + star + UIButton + + + three + UIButton + + + two + UIButton + + + videoViewController + VideoViewController + + + zero + UIButton + + + + IBProjectSource + ./Classes/IncallViewController.h + + + + UICamSwitch + UIButton + + preview + UIView + + + preview + + preview + UIView + + + + IBProjectSource + ./Classes/UICamSwitch.h + + + + UIDigitButton + UIButton + + IBProjectSource + ./Classes/UIDigitButton.h + + + + UIHangUpButton + UIButton + + IBProjectSource + ./Classes/UIHangUpButton.h + + + + UIMuteButton + UIToggleButton + + IBProjectSource + ./Classes/UIMuteButton.h + + + + UIToggleButton + UIButton + + IBProjectSource + ./Classes/UIToggleButton.h + + + + VideoViewController + UIViewController + + UIImageView + UIImageView + UIImageView + UICamSwitch + UICamSwitch + UICamSwitch + UIView + UIView + UIView + UIHangUpButton + UIHangUpButton + UIHangUpButton + UIView + UIView + UIMuteButton + UIMuteButton + UIMuteButton + UIView + UIView + UIView + UIView + + + + mCallQuality + UIImageView + + + mCallQualityLandLeft + UIImageView + + + mCallQualityLandRight + UIImageView + + + mCamSwitch + UICamSwitch + + + mCamSwitchLandLeft + UICamSwitch + + + mCamSwitchLandRight + UICamSwitch + + + mDisplay + UIView + + + mDisplayLandLeft + UIView + + + mDisplayLandRight + UIView + + + mHangUp + UIHangUpButton + + + mHangUpLandLeft + UIHangUpButton + + + mHangUpLandRight + UIHangUpButton + + + mLandscapeLeft + UIView + + + mLandscapeRight + UIView + + + mMute + UIMuteButton + + + mMuteLandLeft + UIMuteButton + + + mMuteLandRight + UIMuteButton + + + mPortrait + UIView + + + mPreview + UIView + + + mPreviewLandLeft + UIView + + + mPreviewLandRight + UIView + + + + IBProjectSource + ./Classes/VideoViewController.h + + + + + 0 + IBCocoaTouchFramework + YES + 3 + + {34, 34} + {68, 68} + {68, 68} + {68, 68} + {68, 68} + {72, 72} + + 933 + + diff --git a/PhoneMainView.xib b/PhoneMainView.xib index 3953ea8da..d2b679979 100644 --- a/PhoneMainView.xib +++ b/PhoneMainView.xib @@ -47,6 +47,7 @@ {320, 480} + 1 MSAxIDEAA @@ -74,6 +75,7 @@ history-orange.png IBCocoaTouchFramework + @@ -95,6 +97,7 @@ dialer-orange.png IBCocoaTouchFramework + PhoneViewController @@ -109,6 +112,7 @@ IBCocoaTouchFramework + 5 @@ -123,6 +127,7 @@ IBCocoaTouchFramework + 0 @@ -140,12 +145,21 @@ 266 {{0, 431}, {320, 49}} + 3 MCAwAA NO IBCocoaTouchFramework + + YES + + + + + + @@ -366,10 +380,6 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 diff --git a/Resources/06_001_68_68_des_light-0.png b/Resources/06_001_68_68_des_light-0.png new file mode 100644 index 000000000..d2add9e97 Binary files /dev/null and b/Resources/06_001_68_68_des_light-0.png differ diff --git a/Resources/06_001_68_68_des_light-1.png b/Resources/06_001_68_68_des_light-1.png new file mode 100644 index 000000000..d2761b58c Binary files /dev/null and b/Resources/06_001_68_68_des_light-1.png differ diff --git a/Resources/06_001_68_68_des_light-2.png b/Resources/06_001_68_68_des_light-2.png new file mode 100644 index 000000000..d2761b58c Binary files /dev/null and b/Resources/06_001_68_68_des_light-2.png differ diff --git a/Resources/06_001_68_68_des_light.png b/Resources/06_001_68_68_des_light.png new file mode 100755 index 000000000..12c6c090d Binary files /dev/null and b/Resources/06_001_68_68_des_light.png differ diff --git a/Resources/06_002_84_84_des_light_glow.png b/Resources/06_002_84_84_des_light_glow.png new file mode 100755 index 000000000..4c187d63b Binary files /dev/null and b/Resources/06_002_84_84_des_light_glow.png differ diff --git a/Resources/06_003_68_68_des_open-0.png b/Resources/06_003_68_68_des_open-0.png new file mode 100644 index 000000000..d71d06961 Binary files /dev/null and b/Resources/06_003_68_68_des_open-0.png differ diff --git a/Resources/06_003_68_68_des_open-1.png b/Resources/06_003_68_68_des_open-1.png new file mode 100644 index 000000000..5abbfbc43 Binary files /dev/null and b/Resources/06_003_68_68_des_open-1.png differ diff --git a/Resources/06_003_68_68_des_open-2.png b/Resources/06_003_68_68_des_open-2.png new file mode 100644 index 000000000..732bd119a Binary files /dev/null and b/Resources/06_003_68_68_des_open-2.png differ diff --git a/Resources/06_003_68_68_des_open.png b/Resources/06_003_68_68_des_open.png new file mode 100755 index 000000000..f562b42fa Binary files /dev/null and b/Resources/06_003_68_68_des_open.png differ diff --git a/Resources/06_004_68_68_des_call-0.png b/Resources/06_004_68_68_des_call-0.png new file mode 100644 index 000000000..6d4833629 Binary files /dev/null and b/Resources/06_004_68_68_des_call-0.png differ diff --git a/Resources/06_004_68_68_des_call-1.png b/Resources/06_004_68_68_des_call-1.png new file mode 100644 index 000000000..08835575f Binary files /dev/null and b/Resources/06_004_68_68_des_call-1.png differ diff --git a/Resources/06_004_68_68_des_call-2.png b/Resources/06_004_68_68_des_call-2.png new file mode 100644 index 000000000..c567e6ed1 Binary files /dev/null and b/Resources/06_004_68_68_des_call-2.png differ diff --git a/Resources/06_004_68_68_des_call.png b/Resources/06_004_68_68_des_call.png new file mode 100755 index 000000000..511be6790 Binary files /dev/null and b/Resources/06_004_68_68_des_call.png differ diff --git a/Resources/06_005_68_68_des_mute-0.png b/Resources/06_005_68_68_des_mute-0.png new file mode 100644 index 000000000..faa306d6d Binary files /dev/null and b/Resources/06_005_68_68_des_mute-0.png differ diff --git a/Resources/06_005_68_68_des_mute-1.png b/Resources/06_005_68_68_des_mute-1.png new file mode 100644 index 000000000..960284ec7 Binary files /dev/null and b/Resources/06_005_68_68_des_mute-1.png differ diff --git a/Resources/06_005_68_68_des_mute-2.png b/Resources/06_005_68_68_des_mute-2.png new file mode 100644 index 000000000..f6280a00e Binary files /dev/null and b/Resources/06_005_68_68_des_mute-2.png differ diff --git a/Resources/06_005_68_68_des_mute.png b/Resources/06_005_68_68_des_mute.png new file mode 100755 index 000000000..8df8b9713 Binary files /dev/null and b/Resources/06_005_68_68_des_mute.png differ diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist index 4b6332f8e..ed1d58b1e 100644 --- a/Settings.bundle/Root.plist +++ b/Settings.bundle/Root.plist @@ -84,46 +84,6 @@ Type PSTextFieldSpecifier - - DefaultValue - - Key - outbound_proxy_preference - Title - Outbound proxy - Type - PSToggleSwitchSpecifier - - - Title - - Type - PSGroupSpecifier - - - File - audio - Title - Audio Codecs - Type - PSChildPaneSpecifier - - - File - video - Title - Video - Type - PSChildPaneSpecifier - - - File - Advanced - Title - Advanced - Type - PSChildPaneSpecifier - StringsTable Root diff --git a/linphone-Info.plist b/linphone-Info.plist index 44dca6b6c..698080aaa 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -16,7 +16,7 @@ icone-linphone-72.png CFBundleIdentifier - de.busch-jaeger + de.busch-jaeger.phone CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -24,13 +24,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.5.0 + 0.1.1 CFBundleSignature ???? CFBundleVersion - 1.1.1 + 0.1.1 NSMainNibFile - PhoneMainView + BuschJaegerMainView NSMainNibFile~ipad MainScreenWithVideoPreview UIApplicationExitsOnSuspend diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index d5a94982e..9e03b2663 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -251,6 +251,21 @@ 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 34957F3F147D3FBF00DD7A09 /* secured.png in Resources */ = {isa = PBXBuildFile; fileRef = 34957F3E147D3FBF00DD7A09 /* secured.png */; }; 34A6ECEB14CF13CB00460C04 /* icone-linphone-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */; }; + 34A6ECF714D0179C00460C04 /* BuschJaegerMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A6ECF514D0179C00460C04 /* BuschJaegerMainView.m */; }; + 34A6ECF814D0179C00460C04 /* BuschJaegerMainView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECF614D0179C00460C04 /* BuschJaegerMainView.xib */; }; + 34A6ED0614D1440300460C04 /* BuschJaegerAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 34A6ED0514D1440300460C04 /* BuschJaegerAppDelegate.m */; }; + 34ACD08214D2DBE000EE0B0A /* 06_001_68_68_des_light-0.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07614D2DBE000EE0B0A /* 06_001_68_68_des_light-0.png */; }; + 34ACD08314D2DBE000EE0B0A /* 06_001_68_68_des_light-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07714D2DBE000EE0B0A /* 06_001_68_68_des_light-2.png */; }; + 34ACD08414D2DBE000EE0B0A /* 06_002_84_84_des_light_glow.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07814D2DBE000EE0B0A /* 06_002_84_84_des_light_glow.png */; }; + 34ACD08514D2DBE000EE0B0A /* 06_003_68_68_des_open-0.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07914D2DBE000EE0B0A /* 06_003_68_68_des_open-0.png */; }; + 34ACD08614D2DBE000EE0B0A /* 06_003_68_68_des_open-1.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07A14D2DBE000EE0B0A /* 06_003_68_68_des_open-1.png */; }; + 34ACD08714D2DBE000EE0B0A /* 06_003_68_68_des_open-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07B14D2DBE000EE0B0A /* 06_003_68_68_des_open-2.png */; }; + 34ACD08814D2DBE000EE0B0A /* 06_004_68_68_des_call-0.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07C14D2DBE000EE0B0A /* 06_004_68_68_des_call-0.png */; }; + 34ACD08914D2DBE000EE0B0A /* 06_004_68_68_des_call-1.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07D14D2DBE000EE0B0A /* 06_004_68_68_des_call-1.png */; }; + 34ACD08A14D2DBE000EE0B0A /* 06_004_68_68_des_call-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07E14D2DBE000EE0B0A /* 06_004_68_68_des_call-2.png */; }; + 34ACD08B14D2DBE000EE0B0A /* 06_005_68_68_des_mute-0.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD07F14D2DBE000EE0B0A /* 06_005_68_68_des_mute-0.png */; }; + 34ACD08C14D2DBE000EE0B0A /* 06_005_68_68_des_mute-1.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD08014D2DBE000EE0B0A /* 06_005_68_68_des_mute-1.png */; }; + 34ACD08D14D2DBE000EE0B0A /* 06_005_68_68_des_mute-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 34ACD08114D2DBE000EE0B0A /* 06_005_68_68_des_mute-2.png */; }; 34C7646914CD51CD008E9607 /* contact_vide.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646814CD51CD008E9607 /* contact_vide.png */; }; 34C7646C14CD5585008E9607 /* dialer-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646A14CD5585008E9607 /* dialer-orange.png */; }; 34C7646D14CD5585008E9607 /* history-orange.png in Resources */ = {isa = PBXBuildFile; fileRef = 34C7646B14CD5585008E9607 /* history-orange.png */; }; @@ -630,6 +645,23 @@ 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; }; 34957F3E147D3FBF00DD7A09 /* secured.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = secured.png; path = Resources/secured.png; sourceTree = ""; }; 34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icone-linphone-72.png"; path = "Resources/icone-linphone-72.png"; sourceTree = ""; }; + 34A6ECF414D0179C00460C04 /* BuschJaegerMainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerMainView.h; sourceTree = ""; }; + 34A6ECF514D0179C00460C04 /* BuschJaegerMainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerMainView.m; sourceTree = ""; }; + 34A6ECF614D0179C00460C04 /* BuschJaegerMainView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BuschJaegerMainView.xib; sourceTree = ""; }; + 34A6ED0414D1440300460C04 /* BuschJaegerAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuschJaegerAppDelegate.h; sourceTree = ""; }; + 34A6ED0514D1440300460C04 /* BuschJaegerAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BuschJaegerAppDelegate.m; sourceTree = ""; }; + 34ACD07614D2DBE000EE0B0A /* 06_001_68_68_des_light-0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_001_68_68_des_light-0.png"; path = "Resources/06_001_68_68_des_light-0.png"; sourceTree = ""; }; + 34ACD07714D2DBE000EE0B0A /* 06_001_68_68_des_light-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_001_68_68_des_light-2.png"; path = "Resources/06_001_68_68_des_light-2.png"; sourceTree = ""; }; + 34ACD07814D2DBE000EE0B0A /* 06_002_84_84_des_light_glow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 06_002_84_84_des_light_glow.png; path = Resources/06_002_84_84_des_light_glow.png; sourceTree = ""; }; + 34ACD07914D2DBE000EE0B0A /* 06_003_68_68_des_open-0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_003_68_68_des_open-0.png"; path = "Resources/06_003_68_68_des_open-0.png"; sourceTree = ""; }; + 34ACD07A14D2DBE000EE0B0A /* 06_003_68_68_des_open-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_003_68_68_des_open-1.png"; path = "Resources/06_003_68_68_des_open-1.png"; sourceTree = ""; }; + 34ACD07B14D2DBE000EE0B0A /* 06_003_68_68_des_open-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_003_68_68_des_open-2.png"; path = "Resources/06_003_68_68_des_open-2.png"; sourceTree = ""; }; + 34ACD07C14D2DBE000EE0B0A /* 06_004_68_68_des_call-0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_004_68_68_des_call-0.png"; path = "Resources/06_004_68_68_des_call-0.png"; sourceTree = ""; }; + 34ACD07D14D2DBE000EE0B0A /* 06_004_68_68_des_call-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_004_68_68_des_call-1.png"; path = "Resources/06_004_68_68_des_call-1.png"; sourceTree = ""; }; + 34ACD07E14D2DBE000EE0B0A /* 06_004_68_68_des_call-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_004_68_68_des_call-2.png"; path = "Resources/06_004_68_68_des_call-2.png"; sourceTree = ""; }; + 34ACD07F14D2DBE000EE0B0A /* 06_005_68_68_des_mute-0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_005_68_68_des_mute-0.png"; path = "Resources/06_005_68_68_des_mute-0.png"; sourceTree = ""; }; + 34ACD08014D2DBE000EE0B0A /* 06_005_68_68_des_mute-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_005_68_68_des_mute-1.png"; path = "Resources/06_005_68_68_des_mute-1.png"; sourceTree = ""; }; + 34ACD08114D2DBE000EE0B0A /* 06_005_68_68_des_mute-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "06_005_68_68_des_mute-2.png"; path = "Resources/06_005_68_68_des_mute-2.png"; sourceTree = ""; }; 34C7646814CD51CD008E9607 /* contact_vide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_vide.png; path = Resources/contact_vide.png; sourceTree = ""; }; 34C7646A14CD5585008E9607 /* dialer-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer-orange.png"; path = "submodules/linphone/pixmaps/dialer-orange.png"; sourceTree = ""; }; 34C7646B14CD5585008E9607 /* history-orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "history-orange.png"; path = "submodules/linphone/pixmaps/history-orange.png"; sourceTree = ""; }; @@ -741,6 +773,7 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + 34A6ECF214D0176400460C04 /* BuschJaeger */, 2211DBBB14769C8200DEE054 /* CallDelegate.m */, 2214EB7012F84668002A5394 /* LinphoneUI */, 2218A92212FBE1340088A667 /* FirstLoginViewController.h */, @@ -1181,6 +1214,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 34ACD07414D2DBB300EE0B0A /* BuschJaeger */, 34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */, 34C7646A14CD5585008E9607 /* dialer-orange.png */, 34C7646B14CD5585008E9607 /* history-orange.png */, @@ -1242,6 +1276,37 @@ name = Frameworks; sourceTree = ""; }; + 34A6ECF214D0176400460C04 /* BuschJaeger */ = { + isa = PBXGroup; + children = ( + 34A6ECF414D0179C00460C04 /* BuschJaegerMainView.h */, + 34A6ECF514D0179C00460C04 /* BuschJaegerMainView.m */, + 34A6ECF614D0179C00460C04 /* BuschJaegerMainView.xib */, + 34A6ED0414D1440300460C04 /* BuschJaegerAppDelegate.h */, + 34A6ED0514D1440300460C04 /* BuschJaegerAppDelegate.m */, + ); + name = BuschJaeger; + sourceTree = ""; + }; + 34ACD07414D2DBB300EE0B0A /* BuschJaeger */ = { + isa = PBXGroup; + children = ( + 34ACD07614D2DBE000EE0B0A /* 06_001_68_68_des_light-0.png */, + 34ACD07714D2DBE000EE0B0A /* 06_001_68_68_des_light-2.png */, + 34ACD07814D2DBE000EE0B0A /* 06_002_84_84_des_light_glow.png */, + 34ACD07914D2DBE000EE0B0A /* 06_003_68_68_des_open-0.png */, + 34ACD07A14D2DBE000EE0B0A /* 06_003_68_68_des_open-1.png */, + 34ACD07B14D2DBE000EE0B0A /* 06_003_68_68_des_open-2.png */, + 34ACD07C14D2DBE000EE0B0A /* 06_004_68_68_des_call-0.png */, + 34ACD07D14D2DBE000EE0B0A /* 06_004_68_68_des_call-1.png */, + 34ACD07E14D2DBE000EE0B0A /* 06_004_68_68_des_call-2.png */, + 34ACD07F14D2DBE000EE0B0A /* 06_005_68_68_des_mute-0.png */, + 34ACD08014D2DBE000EE0B0A /* 06_005_68_68_des_mute-1.png */, + 34ACD08114D2DBE000EE0B0A /* 06_005_68_68_des_mute-2.png */, + ); + name = BuschJaeger; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -1378,6 +1443,19 @@ 34C7646C14CD5585008E9607 /* dialer-orange.png in Resources */, 34C7646D14CD5585008E9607 /* history-orange.png in Resources */, 34A6ECEB14CF13CB00460C04 /* icone-linphone-72.png in Resources */, + 34A6ECF814D0179C00460C04 /* BuschJaegerMainView.xib in Resources */, + 34ACD08214D2DBE000EE0B0A /* 06_001_68_68_des_light-0.png in Resources */, + 34ACD08314D2DBE000EE0B0A /* 06_001_68_68_des_light-2.png in Resources */, + 34ACD08414D2DBE000EE0B0A /* 06_002_84_84_des_light_glow.png in Resources */, + 34ACD08514D2DBE000EE0B0A /* 06_003_68_68_des_open-0.png in Resources */, + 34ACD08614D2DBE000EE0B0A /* 06_003_68_68_des_open-1.png in Resources */, + 34ACD08714D2DBE000EE0B0A /* 06_003_68_68_des_open-2.png in Resources */, + 34ACD08814D2DBE000EE0B0A /* 06_004_68_68_des_call-0.png in Resources */, + 34ACD08914D2DBE000EE0B0A /* 06_004_68_68_des_call-1.png in Resources */, + 34ACD08A14D2DBE000EE0B0A /* 06_004_68_68_des_call-2.png in Resources */, + 34ACD08B14D2DBE000EE0B0A /* 06_005_68_68_des_mute-0.png in Resources */, + 34ACD08C14D2DBE000EE0B0A /* 06_005_68_68_des_mute-1.png in Resources */, + 34ACD08D14D2DBE000EE0B0A /* 06_005_68_68_des_mute-2.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1484,6 +1562,8 @@ 344ABD77147FCB68007420B6 /* ConferenceCallDetailView.m in Sources */, 34CA8539148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */, 3418844814C6CAD300EA48C7 /* StatusSubViewController.m in Sources */, + 34A6ECF714D0179C00460C04 /* BuschJaegerMainView.m in Sources */, + 34A6ED0614D1440300460C04 /* BuschJaegerAppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/linphonerc b/linphonerc index f0dff0146..248fb872a 100644 --- a/linphonerc +++ b/linphonerc @@ -21,6 +21,7 @@ register_only_when_network_is_up=1 auto_net_state_mon=0 keepalive_period=30000 media_encryption=zrtp +incoming_calls_early_media=1 [rtp] audio_rtp_port=7076 @@ -37,11 +38,11 @@ echocancellation=0 [misc] history_max_size=30 -max_calls=3 +max_calls=1 [video] display=1 -capture=1 +capture=0 show_local=0 enabled=1 size=qvga