diff --git a/.gitmodules b/.gitmodules index 9707bbffb..e614fb27a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -55,3 +55,6 @@ [submodule "submodules/externals/antlr3"] path = submodules/externals/antlr3 url = gitosis@git.linphone.org:antlr3 +[submodule "submodules/externals/polarssl"] + path = submodules/externals/polarssl + url = git://git.linphone.org/polarssl.git diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 1ac0bf331..8f49fd838 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -643,7 +643,8 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C #pragma mark - UITableViewDelegate Functions -- (void)setEditing:(BOOL)editing animated:(BOOL)animated { +- (void)setEditing:(BOOL)editing animated:(BOOL)animated { + bool_t showEmails = [[LinphoneManager instance] lpConfigBoolForKey:@"show_contacts_emails_preference"]; // Resign keyboard if(!editing) { [LinphoneUtils findAndResignFirstResponder:[self tableView]]; @@ -659,14 +660,14 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) { if(contactSections[section] == ContactSections_Number || contactSections[section] == ContactSections_Sip || - contactSections[section] == ContactSections_Email) + (showEmails && contactSections[section] == ContactSections_Email)) [self addEntry:self.tableView section:section animated:animated]; } } else { for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) { if(contactSections[section] == ContactSections_Number || contactSections[section] == ContactSections_Sip || - contactSections[section] == ContactSections_Email) + (showEmails && contactSections[section] == ContactSections_Email)) [self removeEmptyEntry:self.tableView section:section animated:animated]; } } diff --git a/Classes/ImageSharing.m b/Classes/ImageSharing.m index e853e54f8..c0ec61489 100644 --- a/Classes/ImageSharing.m +++ b/Classes/ImageSharing.m @@ -115,7 +115,7 @@ now lets create the body of the post */ NSMutableData *body = [NSMutableData data]; - NSString *imageName = [NSString stringWithFormat:@"%i.jpg", [image hash]]; + NSString *imageName = [NSString stringWithFormat:@"%i-%f.jpg", [image hash],[NSDate timeIntervalSinceReferenceDate]]; [body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",boundary] dataUsingEncoding:NSUTF8StringEncoding]]; [body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"userfile\"; filename=\"%@\"\r\n",imageName] dataUsingEncoding:NSUTF8StringEncoding]]; [body appendData:[@"Content-Type: application/octet-stream\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]]; diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index fe54143e8..e23e914ed 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -202,24 +202,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration]; - CGRect frame = [videoPreview frame]; - switch (toInterfaceOrientation) { - case UIInterfaceOrientationPortrait: - [videoPreview setTransform: CGAffineTransformMakeRotation(0)]; - break; - case UIInterfaceOrientationPortraitUpsideDown: - [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)]; - break; - case UIInterfaceOrientationLandscapeLeft: - [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)]; - break; - case UIInterfaceOrientationLandscapeRight: - [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)]; - break; - default: - break; - } - [videoPreview setFrame:frame]; +// in mode display_filter_auto_rotate=0, no need to rotate the preview } diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index b35d91fe0..c537ea521 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -354,7 +354,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); //possible valid config detected proxyCfg = linphone_core_create_proxy_config(lc); char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(lc)); + LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain(linphoneAddress, [domain cStringUsingEncoding:[NSString defaultCStringEncoding]]); diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 5b4e8f741..b90e36f74 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -45,6 +45,7 @@ extern NSString *const kLinphoneMainViewChange; extern NSString *const kLinphoneAddressBookUpdate; extern NSString *const kLinphoneLogsUpdate; extern NSString *const kLinphoneSettingsUpdate; +extern NSString *const kLinphoneBluetoothAvailabilityUpdate; extern NSString *const kContactSipField; @@ -164,6 +165,8 @@ typedef struct _LinphoneManagerSounds { @property (readonly) LinphoneManagerSounds sounds; @property (readonly) NSMutableArray *logs; @property (nonatomic, assign) BOOL speakerEnabled; +@property (nonatomic, assign) BOOL bluetoothAvailable; +@property (nonatomic, assign) BOOL bluetoothEnabled; @property (readonly) ALAssetsLibrary *photoLibrary; @end diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index adb9244eb..92976227d 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -56,6 +56,7 @@ NSString *const kLinphoneAddressBookUpdate = @"LinphoneAddressBookUpdate"; NSString *const kLinphoneMainViewChange = @"LinphoneMainViewChange"; NSString *const kLinphoneLogsUpdate = @"LinphoneLogsUpdate"; NSString *const kLinphoneSettingsUpdate = @"LinphoneSettingsUpdate"; +NSString *const kLinphoneBluetoothAvailabilityUpdate = @"LinphoneBluetoothAvailabilityUpdate"; NSString *const kContactSipField = @"SIP"; @@ -105,6 +106,8 @@ extern void libmsbcg729_init(); @synthesize sounds; @synthesize logs; @synthesize speakerEnabled; +@synthesize bluetoothAvailable; +@synthesize bluetoothEnabled; @synthesize photoLibrary; struct codec_name_pref_table{ @@ -128,6 +131,8 @@ struct codec_name_pref_table codec_pref_table[]={ { "mp4v-es", 90000, @"mp4v-es_preference"}, { "h264", 90000, @"h264_preference"}, { "vp8", 90000, @"vp8_preference"}, + { "mpeg4-generic", 44100, @"aaceld_44k_preference"}, + { "mpeg4-generic", 22050, @"aaceld_22k_preference"}, { NULL,0,Nil } }; @@ -235,6 +240,7 @@ struct codec_name_pref_table codec_pref_table[]={ logs = [[NSMutableArray alloc] init]; database = NULL; speakerEnabled = FALSE; + bluetoothEnabled = FALSE; [self openDatabase]; [self copyDefaultSettings]; pendindCallIdFromRemoteNotif = [[NSMutableArray alloc] init ]; @@ -466,6 +472,10 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char if(linphone_core_get_calls_nb(theLinphoneCore) == 0) { [self setSpeakerEnabled:FALSE]; [self removeCTCallCenterCb]; + bluetoothAvailable = FALSE; + bluetoothEnabled = FALSE; + /*IOS specific*/ + linphone_core_start_dtmf_stream(theLinphoneCore); } if (incallBgTask) { [[UIApplication sharedApplication] endBackgroundTask:incallBgTask]; @@ -570,7 +580,7 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo [chat setMessage:[NSString stringWithUTF8String:linphone_chat_message_get_text(msg)]]; } [chat setDirection:[NSNumber numberWithInt:1]]; - [chat setTime:[NSDate date]]; + [chat setTime:[NSDate dateWithTimeIntervalSince1970:linphone_chat_message_get_time(msg)]]; [chat setRead:[NSNumber numberWithInt:0]]; [chat create]; @@ -1087,7 +1097,6 @@ static int comp_call_state_paused (const LinphoneCall* call, const void* param) /*IOS specific*/ linphone_core_start_dtmf_stream(theLinphoneCore); - } @@ -1119,7 +1128,7 @@ static int comp_call_state_paused (const LinphoneCall* call, const void* param) } -#pragma mark - Speaker Functions +#pragma mark - Audio route Functions - (bool)allowSpeaker { bool notallow = false; @@ -1147,35 +1156,63 @@ static void audioRouteChangeListenerCallback ( if (inPropertyID != kAudioSessionProperty_AudioRouteChange) return; // 5 LinphoneManager* lm = (LinphoneManager*)inUserData; - bool enabled = false; + bool speakerEnabled = false; CFStringRef lNewRoute = CFSTR("Unknown"); UInt32 lNewRouteSize = sizeof(lNewRoute); OSStatus lStatus = AudioSessionGetProperty(kAudioSessionProperty_AudioRoute, &lNewRouteSize, &lNewRoute); if (!lStatus && lNewRouteSize > 0) { NSString *route = (NSString *) lNewRoute; [LinphoneLogger logc:LinphoneLoggerLog format:"Current audio route is [%s]", [route cStringUsingEncoding:[NSString defaultCStringEncoding]]]; - enabled = [route isEqualToString: @"Speaker"] || [route isEqualToString: @"SpeakerAndMicrophone"]; + speakerEnabled = [route isEqualToString: @"Speaker"] || [route isEqualToString: @"SpeakerAndMicrophone"]; + if (![LinphoneManager runningOnIpad] && [route isEqualToString:@"HeadsetBT"] && !speakerEnabled) { + lm.bluetoothEnabled = TRUE; + lm.bluetoothAvailable = TRUE; + NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithBool:lm.bluetoothAvailable], @"available", nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneBluetoothAvailabilityUpdate object:lm userInfo:dict]; + } else { + lm.bluetoothEnabled = FALSE; + } CFRelease(lNewRoute); } - if(enabled != lm.speakerEnabled) { // Reforce value + if(speakerEnabled != lm.speakerEnabled) { // Reforce value lm.speakerEnabled = lm.speakerEnabled; } } - (void)setSpeakerEnabled:(BOOL)enable { speakerEnabled = enable; + if(enable && [self allowSpeaker]) { - UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_Speaker; + UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_Speaker; AudioSessionSetProperty (kAudioSessionProperty_OverrideAudioRoute , sizeof (audioRouteOverride) , &audioRouteOverride); + bluetoothEnabled = FALSE; } else { - UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_None; + UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_None; AudioSessionSetProperty (kAudioSessionProperty_OverrideAudioRoute , sizeof (audioRouteOverride) , &audioRouteOverride); } + + if (bluetoothAvailable) { + UInt32 bluetoothInputOverride = bluetoothEnabled; + AudioSessionSetProperty(kAudioSessionProperty_OverrideCategoryEnableBluetoothInput, sizeof(bluetoothInputOverride), &bluetoothInputOverride); + } +} + +- (void)setBluetoothEnabled:(BOOL)enable { + if (bluetoothAvailable) { + // The change of route will be done in setSpeakerEnabled + bluetoothEnabled = enable; + if (bluetoothEnabled) { + [self setSpeakerEnabled:FALSE]; + } else { + [self setSpeakerEnabled:speakerEnabled]; + } + } } #pragma mark - Call Functions @@ -1254,14 +1291,14 @@ static void audioRouteChangeListenerCallback ( [error release]; } else { char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(theLinphoneCore)); + LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(theLinphoneCore)); linphone_proxy_config_normalize_number(proxyCfg,[address cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); if(displayName!=nil) { linphone_address_set_display_name(linphoneAddress, [displayName cStringUsingEncoding:[NSString defaultCStringEncoding]]); } if(transfer) { - linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), normalizedUserName); + linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), linphone_address_as_string_uri_only(linphoneAddress)); } else { call=linphone_core_invite_address_with_params(theLinphoneCore, linphoneAddress, lcallParams); } diff --git a/Classes/LinphoneUI/UICallBar.h b/Classes/LinphoneUI/UICallBar.h index d328c2173..791ea4d52 100644 --- a/Classes/LinphoneUI/UICallBar.h +++ b/Classes/LinphoneUI/UICallBar.h @@ -35,11 +35,15 @@ @property (nonatomic, retain) IBOutlet UIVideoButton* videoButton; @property (nonatomic, retain) IBOutlet UIMicroButton* microButton; @property (nonatomic, retain) IBOutlet UISpeakerButton* speakerButton; +@property (nonatomic, retain) IBOutlet UIToggleButton* routesButton; @property (nonatomic, retain) IBOutlet UIToggleButton* optionsButton; @property (nonatomic, retain) IBOutlet UIHangUpButton* hangupButton; @property (nonatomic, retain) IBOutlet UIView* padView; +@property (nonatomic, retain) IBOutlet UIView* routesView; @property (nonatomic, retain) IBOutlet UIView* optionsView; - +@property (nonatomic, retain) IBOutlet UIButton* routesReceiverButton; +@property (nonatomic, retain) IBOutlet UIButton* routesSpeakerButton; +@property (nonatomic, retain) IBOutlet UIButton* routesBluetoothButton; @property (nonatomic, retain) IBOutlet UIButton* optionsAddButton; @property (nonatomic, retain) IBOutlet UIButton* optionsTransferButton; @property (nonatomic, retain) IBOutlet UIToggleButton* dialerButton; @@ -57,6 +61,10 @@ @property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton; @property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton; +- (IBAction)onRoutesClick:(id)sender; +- (IBAction)onRoutesBluetoothClick:(id)sender; +- (IBAction)onRoutesReceiverClick:(id)sender; +- (IBAction)onRoutesSpeakerClick:(id)sender; - (IBAction)onOptionsClick:(id)sender; - (IBAction)onOptionsTransferClick:(id)sender; - (IBAction)onOptionsAddClick:(id)sender; diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index c1848ad14..b56cfc255 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -31,15 +31,19 @@ @synthesize conferenceButton; @synthesize videoButton; @synthesize microButton; -@synthesize speakerButton; +@synthesize speakerButton; +@synthesize routesButton; @synthesize optionsButton; @synthesize hangupButton; - +@synthesize routesBluetoothButton; +@synthesize routesReceiverButton; +@synthesize routesSpeakerButton; @synthesize optionsAddButton; @synthesize optionsTransferButton; @synthesize dialerButton; @synthesize padView; +@synthesize routesView; @synthesize optionsView; @synthesize oneButton; @@ -67,9 +71,12 @@ [conferenceButton release]; [videoButton release]; [microButton release]; - [speakerButton release]; + [speakerButton release]; + [routesButton release]; [optionsButton release]; - + [routesBluetoothButton release]; + [routesReceiverButton release]; + [routesSpeakerButton release]; [optionsAddButton release]; [optionsTransferButton release]; [dialerButton release]; @@ -88,6 +95,7 @@ [sharpButton release]; [padView release]; + [routesView release]; [optionsView release]; [[NSNotificationCenter defaultCenter] removeObserver:self]; @@ -125,7 +133,7 @@ [starButton setDtmf:true]; [sharpButton setDigit:'#']; [sharpButton setDtmf:true]; - + { UIButton *videoButtonLandscape = (UIButton*)[landscapeView viewWithTag:[videoButton tag]]; // Set selected+disabled background: IB lack ! @@ -162,6 +170,18 @@ [LinphoneUtils buttonFixStates:speakerButtonLandscape]; } + if (![LinphoneManager runningOnIpad]) { + UIButton *routesButtonLandscape = (UIButton*) [landscapeView viewWithTag:[routesButton tag]]; + // Set selected+over background: IB lack ! + [routesButton setBackgroundImage:[UIImage imageNamed:@"routes_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [routesButtonLandscape setBackgroundImage:[UIImage imageNamed:@"routes_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:routesButton]; + [LinphoneUtils buttonFixStates:routesButtonLandscape]; + } + { UIButton *microButtonLandscape = (UIButton*) [landscapeView viewWithTag:[microButton tag]]; // Set selected+disabled background: IB lack ! @@ -226,12 +246,18 @@ selector:@selector(callUpdateEvent:) name:kLinphoneCallUpdate object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(bluetoothAvailabilityUpdateEvent:) + name:kLinphoneBluetoothAvailabilityUpdate + object:nil]; // Update on show LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0; [self callUpdate:call state:state]; + [self hideRoutes:FALSE]; [self hideOptions:FALSE]; [self hidePad:FALSE]; + [self showSpeaker]; } - (void)viewWillDisappear:(BOOL)animated { @@ -254,6 +280,11 @@ [self callUpdate:call state:state]; } +- (void)bluetoothAvailabilityUpdateEvent:(NSNotification*)notif { + bool available = [[notif.userInfo objectForKey:@"available"] intValue]; + [self bluetoothAvailabilityUpdate:available]; +} + #pragma mark - @@ -314,13 +345,22 @@ LinphoneCallOutgoing: [self hidePad:TRUE]; [self hideOptions:TRUE]; + [self hideRoutes:TRUE]; default: break; } } +- (void)bluetoothAvailabilityUpdate:(bool)available { + if (available) { + [self hideSpeaker]; + } else { + [self showSpeaker]; + } +} -#pragma mark - + +#pragma mark - - (void)showAnimation:(NSString*)animationID target:(UIView*)target completion:(void (^)(BOOL finished))completion { CGRect frame = [target frame]; @@ -386,6 +426,35 @@ } } +- (void)showRoutes:(BOOL)animated { + if (![LinphoneManager runningOnIpad]) { + [routesButton setOn]; + [routesBluetoothButton setSelected:[[LinphoneManager instance] bluetoothEnabled]]; + [routesSpeakerButton setSelected:[[LinphoneManager instance] speakerEnabled]]; + [routesReceiverButton setSelected:!([[LinphoneManager instance] bluetoothEnabled] || [[LinphoneManager instance] speakerEnabled])]; + if([routesView isHidden]) { + if(animated) { + [self showAnimation:@"show" target:routesView completion:^(BOOL finished){}]; + } else { + [routesView setHidden:FALSE]; + } + } + } +} + +- (void)hideRoutes:(BOOL)animated { + if (![LinphoneManager runningOnIpad]) { + [routesButton setOff]; + if(![routesView isHidden]) { + if(animated) { + [self hideAnimation:@"hide" target:routesView completion:^(BOOL finished){}]; + } else { + [routesView setHidden:TRUE]; + } + } + } +} + - (void)showOptions:(BOOL)animated { [optionsButton setOn]; if([optionsView isHidden]) { @@ -408,6 +477,20 @@ } } +- (void)showSpeaker { + if (![LinphoneManager runningOnIpad]) { + [speakerButton setHidden:FALSE]; + [routesButton setHidden:TRUE]; + } +} + +- (void)hideSpeaker { + if (![LinphoneManager runningOnIpad]) { + [speakerButton setHidden:TRUE]; + [routesButton setHidden:FALSE]; + } +} + #pragma mark - Action Functions @@ -419,6 +502,30 @@ } } +- (IBAction)onRoutesBluetoothClick:(id)sender { + [self hideRoutes:TRUE]; + [[LinphoneManager instance] setBluetoothEnabled:TRUE]; +} + +- (IBAction)onRoutesReceiverClick:(id)sender { + [self hideRoutes:TRUE]; + [[LinphoneManager instance] setSpeakerEnabled:FALSE]; + [[LinphoneManager instance] setBluetoothEnabled:FALSE]; +} + +- (IBAction)onRoutesSpeakerClick:(id)sender { + [self hideRoutes:TRUE]; + [[LinphoneManager instance] setSpeakerEnabled:TRUE]; +} + +- (IBAction)onRoutesClick:(id)sender { + if([routesView isHidden]) { + [self showRoutes:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; + } else { + [self hideRoutes:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; + } +} + - (IBAction)onOptionsTransferClick:(id)sender { [self hideOptions:TRUE]; // Go to dialer view diff --git a/Classes/LinphoneUI/en.lproj/UICallBar.xib b/Classes/LinphoneUI/en.lproj/UICallBar.xib index 3398db0d7..103729845 100644 --- a/Classes/LinphoneUI/en.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/en.lproj/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject @@ -42,7 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} - + _NS:9 1 @@ -64,7 +64,6 @@ 274 {281, 260} - _NS:9 2 @@ -80,7 +79,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -124,7 +122,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -152,7 +149,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -180,7 +176,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -208,7 +203,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -236,7 +230,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -264,7 +257,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -292,7 +284,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -320,7 +311,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -348,7 +338,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -376,7 +365,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -404,7 +392,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -430,7 +417,6 @@ {{20, 57}, {281, 260}} - _NS:9 @@ -440,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Receiver + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Speaker + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -449,7 +608,6 @@ 292 {{3, 0}, {77, 68}} - _NS:9 NO @@ -492,23 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - - _NS:9 NO 17 @@ -542,12 +691,11 @@ options_add_default.png - + {{240, 208}, {80, 126}} - _NS:9 @@ -563,7 +711,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -579,7 +726,6 @@ 292 {{320, -8}, {44, 90}} - _NS:9 101 @@ -595,8 +741,7 @@ 290 {{0, 135}, {320, 2000}} - - + _NS:9 1 @@ -610,7 +755,6 @@ 292 {80, 67} - _NS:9 NO @@ -650,14 +794,13 @@ video_off_default.png - + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -670,7 +813,6 @@ 292 {{80, 0}, {80, 67}} - _NS:9 NO @@ -710,15 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - - + _NS:9 NO 22 @@ -757,14 +898,68 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + 292 {{240, 0}, {80, 67}} - _NS:9 NO @@ -804,14 +999,13 @@ options_default.png - + 264 {{0, 67}, {105, 68}} - _NS:9 NO @@ -848,7 +1042,6 @@ -2147483384 {{0, 67}, {105, 68}} - _NS:9 NO @@ -878,7 +1071,6 @@ 264 {{105, 67}, {111, 68}} - _NS:9 NO @@ -908,7 +1100,6 @@ 264 {{215, 67}, {105, 68}} - _NS:9 NO @@ -944,7 +1135,6 @@ {{0, 325}, {320, 135}} - _NS:9 @@ -954,7 +1144,6 @@ {320, 460} - _NS:9 @@ -969,7 +1158,6 @@ -2147483355 {{0, 248}, {480, 72}} - _NS:9 @@ -992,7 +1180,6 @@ 274 {281, 260} - _NS:9 2 @@ -1005,7 +1192,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -1028,7 +1214,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -1047,7 +1232,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -1066,7 +1250,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -1085,7 +1268,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -1104,7 +1286,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1123,7 +1304,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1142,7 +1322,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1161,7 +1340,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1180,7 +1358,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1199,7 +1376,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1218,7 +1394,7 @@ 292 {{193, 196}, {107, 54}} - + NO NO 14 @@ -1234,13 +1410,178 @@ {{91, 0}, {281, 260}} - _NS:9 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1250,7 +1591,6 @@ 292 {65, 55} - _NS:9 NO @@ -1285,15 +1625,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {65, 55}} - - _NS:9 NO 17 @@ -1327,12 +1665,11 @@ options_add_default_landscape.png - + {{415, 140}, {65, 105}} - _NS:9 @@ -1348,7 +1685,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -1361,7 +1697,6 @@ 292 {{480, -8}, {44, 90}} - _NS:9 101 @@ -1374,8 +1709,7 @@ 290 {{0, 82}, {480, 2000}} - - + _NS:9 1 @@ -1389,7 +1723,6 @@ 292 {{65, 0}, {65, 82}} - _NS:9 NO @@ -1429,14 +1762,13 @@ video_off_default_landscape.png - + -2147483356 {{79, 20}, {37, 37}} - _NS:9 NO @@ -1449,7 +1781,6 @@ 292 {{130, 0}, {65, 82}} - _NS:9 NO @@ -1489,15 +1820,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - - + _NS:9 NO 22 @@ -1536,14 +1866,68 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + 292 {{350, 0}, {65, 82}} - _NS:9 NO @@ -1583,14 +1967,13 @@ options_default_landscape.png - + 264 {65, 82} - _NS:9 NO @@ -1624,7 +2007,6 @@ -2147483384 {65, 82} - _NS:9 NO @@ -1654,7 +2036,6 @@ 264 {{195, 0}, {90, 82}} - _NS:9 NO @@ -1684,7 +2065,6 @@ 264 {{415, 0}, {65, 82}} - _NS:9 NO @@ -1717,7 +2097,6 @@ {{0, 238}, {480, 82}} - _NS:9 @@ -1727,7 +2106,6 @@ {480, 320} - _NS:9 @@ -1956,6 +2334,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2098,6 +2516,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2126,6 +2580,7 @@ + Portrait View @@ -2153,6 +2608,7 @@ + buttons @@ -2340,6 +2796,7 @@ + Landscape View @@ -2481,6 +2938,7 @@ + buttons @@ -2581,6 +3039,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2591,7 +3119,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2683,6 +3211,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2743,7 +3299,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2753,289 +3309,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3117,6 +3393,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3134,6 +3442,6 @@ {160, 134} {130, 163} - 1926 + 2083 diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.xib b/Classes/LinphoneUI/fr.lproj/UICallBar.xib index 166865260..a0dc7c585 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject @@ -42,6 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} + _NS:9 1 @@ -425,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Écouteur + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Écouteur + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Haut parleur + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Haut parleur + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -476,22 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - _NS:9 NO 17 @@ -525,7 +691,7 @@ options_add_default.png - + {{240, 208}, {80, 126}} @@ -575,7 +741,7 @@ 290 {{0, 135}, {320, 2000}} - + _NS:9 1 @@ -628,7 +794,7 @@ video_off_default.png - + @@ -686,14 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - + _NS:9 NO 22 @@ -732,7 +898,62 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + @@ -778,7 +999,7 @@ options_default.png - + @@ -1172,6 +1393,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1193,6 +1415,172 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Écouteur + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Haut parleur + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1236,14 +1624,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {65, 55}} - _NS:9 NO 17 @@ -1277,7 +1664,7 @@ options_add_default_landscape.png - + {{415, 140}, {65, 105}} @@ -1321,7 +1708,7 @@ 290 {{0, 82}, {480, 2000}} - + _NS:9 1 @@ -1374,7 +1761,7 @@ video_off_default_landscape.png - + @@ -1432,14 +1819,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - + _NS:9 NO 22 @@ -1478,7 +1865,62 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + @@ -1524,7 +1966,7 @@ options_default_landscape.png - + @@ -1890,6 +2332,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2032,6 +2514,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2060,6 +2578,7 @@ + Portrait View @@ -2087,6 +2606,7 @@ + buttons @@ -2274,6 +2794,7 @@ + Landscape View @@ -2415,6 +2936,7 @@ + buttons @@ -2515,6 +3037,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2525,7 +3117,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2617,6 +3209,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2677,7 +3297,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2687,289 +3307,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3051,6 +3391,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3068,6 +3440,6 @@ {160, 134} {130, 163} - 1926 + 2083 diff --git a/Classes/LinphoneUI/ru.lproj/UICallBar.xib b/Classes/LinphoneUI/ru.lproj/UICallBar.xib index 5c3284b42..eb48de3a3 100644 --- a/Classes/LinphoneUI/ru.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/ru.lproj/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 12C60 - 2844 - 1187.34 - 625.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1930 + 2083 IBProxyObject @@ -42,6 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} + _NS:9 1 @@ -425,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Receiver + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Динамик + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Динамик + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -476,22 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - _NS:9 NO 17 @@ -525,7 +691,7 @@ options_add_default.png - + {{240, 208}, {80, 126}} @@ -575,7 +741,7 @@ 290 {{0, 135}, {320, 2000}} - + _NS:9 1 @@ -628,7 +794,7 @@ video_off_default.png - + @@ -686,14 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - + _NS:9 NO 22 @@ -732,7 +898,62 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + @@ -778,7 +999,7 @@ options_default.png - + @@ -1175,6 +1396,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1199,6 +1421,172 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Динамик + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1242,14 +1630,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {70, 55}} - _NS:9 NO 17 @@ -1283,7 +1670,7 @@ options_add_default_landscape.png - + {{410, 140}, {70, 105}} @@ -1327,7 +1714,7 @@ 290 {{0, 82}, {480, 2000}} - + _NS:9 1 @@ -1380,7 +1767,7 @@ video_off_default_landscape.png - + @@ -1438,14 +1825,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - + _NS:9 NO 22 @@ -1484,7 +1871,62 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + @@ -1530,7 +1972,7 @@ options_default_landscape.png - + @@ -1896,6 +2338,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2038,6 +2520,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2066,6 +2584,7 @@ + Portrait View @@ -2093,6 +2612,7 @@ + buttons @@ -2280,6 +2800,7 @@ + Landscape View @@ -2421,6 +2942,7 @@ + buttons @@ -2521,6 +3043,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2531,7 +3123,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2623,6 +3215,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2683,7 +3303,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2693,289 +3313,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3057,6 +3397,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3074,6 +3446,6 @@ {160, 134} {130, 163} - 1930 + 2083 diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 125a992b4..bdd693925 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -384,18 +384,17 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server { - LinphoneCore *lc = [LinphoneManager getLc]; [self clearProxyConfig]; if(server == nil) { server = domain; } + LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]); char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(lc)); - linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); + LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); + linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain(linphoneAddress, [domain UTF8String]); const char* identity = linphone_address_as_string_uri_only(linphoneAddress); - LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]); LinphoneAuthInfo* info = linphone_auth_info_new([username UTF8String], NULL, [password UTF8String], NULL, NULL); linphone_proxy_config_set_identity(proxyCfg, identity); linphone_proxy_config_set_server_addr(proxyCfg, [server UTF8String]); @@ -416,7 +415,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (NSString*)identityFromUsername:(NSString*)username { char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity([LinphoneManager getLc])); + LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain(linphoneAddress, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] UTF8String]); diff --git a/Resources/linphonerc b/Resources/linphonerc index 040abc310..560a9780a 100644 --- a/Resources/linphonerc +++ b/Resources/linphonerc @@ -14,7 +14,6 @@ capture=1 show_local=0 enabled=1 size=qvga -display_filter_auto_rotate=1 automatically_initiate=0 automatically_accept=0 diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index 0025fff93..fb48ebbdf 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -42,6 +42,8 @@ expires=604800 push_notification=1 transport=tls sharing_server=https://www.linphone.org:444/upload.php -ice=0 +ice=1 stun=stun.linphone.org +[video] +display_filter_auto_rotate=0 diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index fac1148f1..80aa4e891 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -42,5 +42,8 @@ expires=604800 push_notification=1 transport=tls sharing_server=https://www.linphone.org:444/upload.php -ice=0 +ice=1 stun=stun.linphone.org + +[video] +display_filter_auto_rotate=0 diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index 9458f6e74..4efe5a33e 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -14,7 +14,6 @@ capture=1 show_local=1 enabled=1 size=vga -display_filter_auto_rotate=1 automatically_initiate=0 automatically_accept=0 @@ -27,4 +26,5 @@ animations_preference=1 edge_opt_preference=0 [default_values] -reg_expires=600 \ No newline at end of file +reg_expires=600 + diff --git a/Resources/route_bluetooth_off_default.png b/Resources/route_bluetooth_off_default.png new file mode 100644 index 000000000..01bc1f291 Binary files /dev/null and b/Resources/route_bluetooth_off_default.png differ diff --git a/Resources/route_bluetooth_off_default_landscape.png b/Resources/route_bluetooth_off_default_landscape.png new file mode 100644 index 000000000..84a001275 Binary files /dev/null and b/Resources/route_bluetooth_off_default_landscape.png differ diff --git a/Resources/route_bluetooth_off_disabled.png b/Resources/route_bluetooth_off_disabled.png new file mode 100644 index 000000000..3d03f1cba Binary files /dev/null and b/Resources/route_bluetooth_off_disabled.png differ diff --git a/Resources/route_bluetooth_off_disabled_landscape.png b/Resources/route_bluetooth_off_disabled_landscape.png new file mode 100644 index 000000000..f523bd6c3 Binary files /dev/null and b/Resources/route_bluetooth_off_disabled_landscape.png differ diff --git a/Resources/route_bluetooth_off_over.png b/Resources/route_bluetooth_off_over.png new file mode 100644 index 000000000..66112a8d7 Binary files /dev/null and b/Resources/route_bluetooth_off_over.png differ diff --git a/Resources/route_bluetooth_off_over_landscape.png b/Resources/route_bluetooth_off_over_landscape.png new file mode 100644 index 000000000..ebaffea54 Binary files /dev/null and b/Resources/route_bluetooth_off_over_landscape.png differ diff --git a/Resources/route_bluetooth_on_default.png b/Resources/route_bluetooth_on_default.png new file mode 100644 index 000000000..841c93b65 Binary files /dev/null and b/Resources/route_bluetooth_on_default.png differ diff --git a/Resources/route_bluetooth_on_default_landscape.png b/Resources/route_bluetooth_on_default_landscape.png new file mode 100644 index 000000000..9cbdf574d Binary files /dev/null and b/Resources/route_bluetooth_on_default_landscape.png differ diff --git a/Resources/route_phone_off_default.png b/Resources/route_phone_off_default.png new file mode 100644 index 000000000..4510f0bcb Binary files /dev/null and b/Resources/route_phone_off_default.png differ diff --git a/Resources/route_phone_off_default_landscape.png b/Resources/route_phone_off_default_landscape.png new file mode 100644 index 000000000..e9b944cc6 Binary files /dev/null and b/Resources/route_phone_off_default_landscape.png differ diff --git a/Resources/route_phone_off_disabled.png b/Resources/route_phone_off_disabled.png new file mode 100644 index 000000000..8c9405533 Binary files /dev/null and b/Resources/route_phone_off_disabled.png differ diff --git a/Resources/route_phone_off_disabled_landscape.png b/Resources/route_phone_off_disabled_landscape.png new file mode 100644 index 000000000..1d58d39c8 Binary files /dev/null and b/Resources/route_phone_off_disabled_landscape.png differ diff --git a/Resources/route_phone_off_over.png b/Resources/route_phone_off_over.png new file mode 100644 index 000000000..bc383167e Binary files /dev/null and b/Resources/route_phone_off_over.png differ diff --git a/Resources/route_phone_off_over_landscape.png b/Resources/route_phone_off_over_landscape.png new file mode 100644 index 000000000..f9b8f9734 Binary files /dev/null and b/Resources/route_phone_off_over_landscape.png differ diff --git a/Resources/route_phone_on_default.png b/Resources/route_phone_on_default.png new file mode 100644 index 000000000..16cc9e2f3 Binary files /dev/null and b/Resources/route_phone_on_default.png differ diff --git a/Resources/route_phone_on_default_landscape.png b/Resources/route_phone_on_default_landscape.png new file mode 100644 index 000000000..b35b9aa64 Binary files /dev/null and b/Resources/route_phone_on_default_landscape.png differ diff --git a/Resources/route_speaker_off_default.png b/Resources/route_speaker_off_default.png new file mode 100644 index 000000000..908031972 Binary files /dev/null and b/Resources/route_speaker_off_default.png differ diff --git a/Resources/route_speaker_off_default_landscape.png b/Resources/route_speaker_off_default_landscape.png new file mode 100644 index 000000000..d6c7eacde Binary files /dev/null and b/Resources/route_speaker_off_default_landscape.png differ diff --git a/Resources/route_speaker_off_disabled.png b/Resources/route_speaker_off_disabled.png new file mode 100644 index 000000000..8294f5251 Binary files /dev/null and b/Resources/route_speaker_off_disabled.png differ diff --git a/Resources/route_speaker_off_disabled_landscape.png b/Resources/route_speaker_off_disabled_landscape.png new file mode 100644 index 000000000..f750b1610 Binary files /dev/null and b/Resources/route_speaker_off_disabled_landscape.png differ diff --git a/Resources/route_speaker_off_over.png b/Resources/route_speaker_off_over.png new file mode 100644 index 000000000..f6c5ce9f6 Binary files /dev/null and b/Resources/route_speaker_off_over.png differ diff --git a/Resources/route_speaker_off_over_landscape.png b/Resources/route_speaker_off_over_landscape.png new file mode 100644 index 000000000..74bf86fa1 Binary files /dev/null and b/Resources/route_speaker_off_over_landscape.png differ diff --git a/Resources/route_speaker_on_default.png b/Resources/route_speaker_on_default.png new file mode 100644 index 000000000..8cfdc036a Binary files /dev/null and b/Resources/route_speaker_on_default.png differ diff --git a/Resources/route_speaker_on_default_landscape.png b/Resources/route_speaker_on_default_landscape.png new file mode 100644 index 000000000..293e675e2 Binary files /dev/null and b/Resources/route_speaker_on_default_landscape.png differ diff --git a/Resources/routes_default.png b/Resources/routes_default.png new file mode 100644 index 000000000..a0502e293 Binary files /dev/null and b/Resources/routes_default.png differ diff --git a/Resources/routes_default_landscape.png b/Resources/routes_default_landscape.png new file mode 100644 index 000000000..cc68859a8 Binary files /dev/null and b/Resources/routes_default_landscape.png differ diff --git a/Resources/routes_disabled.png b/Resources/routes_disabled.png new file mode 100644 index 000000000..aa54e1ab5 Binary files /dev/null and b/Resources/routes_disabled.png differ diff --git a/Resources/routes_disabled_landscape.png b/Resources/routes_disabled_landscape.png new file mode 100644 index 000000000..437bdcb35 Binary files /dev/null and b/Resources/routes_disabled_landscape.png differ diff --git a/Resources/routes_over.png b/Resources/routes_over.png new file mode 100644 index 000000000..c6e555a46 Binary files /dev/null and b/Resources/routes_over.png differ diff --git a/Resources/routes_over_landscape.png b/Resources/routes_over_landscape.png new file mode 100644 index 000000000..958cdc28c Binary files /dev/null and b/Resources/routes_over_landscape.png differ diff --git a/Resources/routes_selected.png b/Resources/routes_selected.png new file mode 100644 index 000000000..9930fd81e Binary files /dev/null and b/Resources/routes_selected.png differ diff --git a/Resources/routes_selected_landscape.png b/Resources/routes_selected_landscape.png new file mode 100644 index 000000000..54a0aa48c Binary files /dev/null and b/Resources/routes_selected_landscape.png differ diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index 422f9fc29..4331a88d4 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -120,6 +120,26 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + aaceld_44k_preference + Title + AAC-ELD 44kHz + Type + PSToggleSwitchSpecifier + + + DefaultValue + + Key + aaceld_22k_preference + Title + AAC-ELD 22kHz + Type + PSToggleSwitchSpecifier + Key audio_advanced_group diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj index 2aa526a1c..0624e7e05 100755 --- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj +++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj @@ -7,6 +7,39 @@ objects = { /* Begin PBXBuildFile section */ + 154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1A981715642E00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 15FC168517157478003FDB31 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167E17157478003FDB31 /* buddy_status.c */; }; + 15FC168817157478003FDB31 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167F17157478003FDB31 /* chatroom.c */; }; + 15FC168A17157478003FDB31 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168017157478003FDB31 /* helloworld.c */; }; + 15FC168F17157478003FDB31 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168117157478003FDB31 /* registration.c */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; @@ -34,29 +67,18 @@ 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; }; 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; 22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; - 22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC3133A2E260044EA25 /* libssl.a */; }; - 22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC4133A2E260044EA25 /* libcrypto.a */; }; - 22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC7133A2E3F0044EA25 /* libssl.a */; }; - 22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */; }; - 22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCB133A2E5C0044EA25 /* libssl.a */; }; - 22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */; }; 22E5AFD1133A2E760044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; 22E5AFD2133A2E760044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; - 34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE514C418B600E1BC69 /* helloworld.c */; }; 34F9DFF514C41EBA00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; 34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; - 34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; 34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; }; 34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; }; - 34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE314C418B600E1BC69 /* buddy_status.c */; }; - 34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE414C418B600E1BC69 /* chatroom.c */; }; - 34F9E00114C41F5300E1BC69 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE614C418B600E1BC69 /* registration.c */; }; 34F9E00314C41FB400E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; }; 34F9E00614C41FCF00E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; }; 34F9E00714C41FCF00E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; }; @@ -67,7 +89,6 @@ 34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; }; 34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; 34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; - 34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -82,7 +103,6 @@ 34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; 34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; }; 34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; }; - 34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00A14C4202100E1BC69 /* QuartzCore.framework */; }; 34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; }; 34F9E02414C4211000E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; }; @@ -92,7 +112,6 @@ 34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; 34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; - 34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -115,6 +134,15 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 154E1A931715638900A0D168 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = ""; }; + 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = ""; }; + 154E1A971715642E00A0D168 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; }; + 154E1A991715644400A0D168 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; }; + 154E1A9B1715645F00A0D168 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; + 15FC167E17157478003FDB31 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/buddy_status.c"; sourceTree = ""; }; + 15FC167F17157478003FDB31 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/chatroom.c"; sourceTree = ""; }; + 15FC168017157478003FDB31 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/helloworld.c"; sourceTree = ""; }; + 15FC168117157478003FDB31 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/registration.c"; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -126,25 +154,14 @@ 229499BA12A5417D00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 229499FF12A5433F00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 22D1B6A012A3E159001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; - 22E5AFC3133A2E260044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFC4133A2E260044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; - 22E5AFC7133A2E3F0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; - 22E5AFCB133A2E5C0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 22E5AFCF133A2E760044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; 22E5AFD0133A2E760044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hello_world_Prefix.pch; sourceTree = ""; }; - 34F9DFE314C418B600E1BC69 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = ../../submodules/linphone/coreapi/help/buddy_status.c; sourceTree = ""; }; - 34F9DFE414C418B600E1BC69 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = ../../submodules/linphone/coreapi/help/chatroom.c; sourceTree = ""; }; - 34F9DFE514C418B600E1BC69 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = ../../submodules/linphone/coreapi/help/helloworld.c; sourceTree = ""; }; - 34F9DFE614C418B600E1BC69 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = ../../submodules/linphone/coreapi/help/registration.c; sourceTree = ""; }; 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; 34F9DFED14C41EBA00E1BC69 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; - 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = ""; }; 34F9DFF014C41EBA00E1BC69 /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; 34F9DFF114C41EBA00E1BC69 /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = ""; }; 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = ""; }; @@ -165,6 +182,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */, + 154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */, + 154E1A981715642E00A0D168 /* libavutil.a in Frameworks */, 34F9E03714C424AF00E1BC69 /* CoreMedia.framework in Frameworks */, 34F9E03514C4249600E1BC69 /* CoreVideo.framework in Frameworks */, 34F9E03414C4247A00E1BC69 /* AVFoundation.framework in Frameworks */, @@ -176,14 +196,13 @@ 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */, 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */, 34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */, - 34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */, + 154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */, 34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */, 34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */, 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */, 34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */, 34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */, - 22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */, - 22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */, @@ -191,6 +210,8 @@ 2220D5DA1278461C008F2C2E /* CoreAudio.framework in Frameworks */, 2220D5EA12784672008F2C2E /* AudioToolbox.framework in Frameworks */, 22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */, + 154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */, + 154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -207,15 +228,12 @@ 34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */, 34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */, 34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */, - 34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */, 34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */, 34F9E00E14C4204600E1BC69 /* libsrtp.a in Frameworks */, 34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */, 34F9E00C14C4203900E1BC69 /* OpenGLES.framework in Frameworks */, 34F9E00D14C4203900E1BC69 /* QuartzCore.framework in Frameworks */, - 22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */, - 22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */, 2294996912A53FEE00D6CF48 /* Foundation.framework in Frameworks */, 2294996A12A53FEE00D6CF48 /* UIKit.framework in Frameworks */, 2294996B12A53FEE00D6CF48 /* CoreGraphics.framework in Frameworks */, @@ -223,6 +241,14 @@ 2294997712A53FEE00D6CF48 /* CoreAudio.framework in Frameworks */, 2294997812A53FEE00D6CF48 /* AudioToolbox.framework in Frameworks */, 2294997912A53FEE00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */, + 154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */, + 154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */, + 154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */, + 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -237,7 +263,6 @@ 34F9E02514C4211000E1BC69 /* libvpx.a in Frameworks */, 34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */, 34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */, - 34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E01914C420DD00E1BC69 /* libeXosip2.a in Frameworks */, 34F9E01A14C420DD00E1BC69 /* libgsm.a in Frameworks */, 34F9E01B14C420DD00E1BC69 /* liblinphone.a in Frameworks */, @@ -246,8 +271,6 @@ 34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */, 34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */, 34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */, - 22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */, - 22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */, 229499A612A5417D00D6CF48 /* Foundation.framework in Frameworks */, 229499A712A5417D00D6CF48 /* UIKit.framework in Frameworks */, 229499A812A5417D00D6CF48 /* CoreGraphics.framework in Frameworks */, @@ -255,6 +278,14 @@ 229499B412A5417D00D6CF48 /* CoreAudio.framework in Frameworks */, 229499B512A5417D00D6CF48 /* AudioToolbox.framework in Frameworks */, 229499B612A5417D00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */, + 154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */, + 154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */, + 154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */, + 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,7 +299,6 @@ 34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */, 34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */, 34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */, - 34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */, 34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */, 34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */, @@ -287,6 +317,12 @@ 229499F912A5433F00D6CF48 /* CoreAudio.framework in Frameworks */, 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */, 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */, + 154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */, + 154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -318,27 +354,25 @@ 34F9E03314C4247A00E1BC69 /* AVFoundation.framework */, 34F9E00A14C4202100E1BC69 /* QuartzCore.framework */, 34F9E00814C41FE900E1BC69 /* CoreVideo.framework */, - 34F9E00414C41FCF00E1BC69 /* libsrtp.a */, - 34F9E00514C41FCF00E1BC69 /* libvpx.a */, 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */, + 154E1A991715644400A0D168 /* libavcodec.a */, + 154E1A971715642E00A0D168 /* libavutil.a */, + 22E5AFD0133A2E760044EA25 /* libcrypto.a */, 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */, 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */, 34F9DFED14C41EBA00E1BC69 /* libilbc.a */, 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */, - 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */, + 154E1A931715638900A0D168 /* libmediastreamer_base.a */, + 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */, 34F9DFF014C41EBA00E1BC69 /* libortp.a */, 34F9DFF114C41EBA00E1BC69 /* libosip2.a */, 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */, 34F9DFF314C41EBA00E1BC69 /* libspeex.a */, 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */, + 34F9E00414C41FCF00E1BC69 /* libsrtp.a */, 22E5AFCF133A2E760044EA25 /* libssl.a */, - 22E5AFD0133A2E760044EA25 /* libcrypto.a */, - 22E5AFCB133A2E5C0044EA25 /* libssl.a */, - 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */, - 22E5AFC7133A2E3F0044EA25 /* libssl.a */, - 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */, - 22E5AFC3133A2E260044EA25 /* libssl.a */, - 22E5AFC4133A2E260044EA25 /* libcrypto.a */, + 154E1A9B1715645F00A0D168 /* libswscale.a */, + 34F9E00514C41FCF00E1BC69 /* libvpx.a */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, @@ -356,10 +390,10 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( - 34F9DFE314C418B600E1BC69 /* buddy_status.c */, - 34F9DFE414C418B600E1BC69 /* chatroom.c */, - 34F9DFE514C418B600E1BC69 /* helloworld.c */, - 34F9DFE614C418B600E1BC69 /* registration.c */, + 15FC167E17157478003FDB31 /* buddy_status.c */, + 15FC167F17157478003FDB31 /* chatroom.c */, + 15FC168017157478003FDB31 /* helloworld.c */, + 15FC168117157478003FDB31 /* registration.c */, 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */, ); name = "Other Sources"; @@ -517,7 +551,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */, + 15FC168A17157478003FDB31 /* helloworld.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -525,7 +559,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9E00114C41F5300E1BC69 /* registration.c in Sources */, + 15FC168F17157478003FDB31 /* registration.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -533,7 +567,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */, + 15FC168817157478003FDB31 /* chatroom.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -541,7 +575,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */, + 15FC168517157478003FDB31 /* buddy_status.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/linphone-Info.plist b/linphone-Info.plist index b24ab61b5..6118fb186 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -42,7 +42,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.5.100 + 3.5.101 CFBundleURLTypes @@ -59,7 +59,7 @@ CFBundleVersion - 2.0.2 + 2.0.3 NSMainNibFile LinphoneApp NSMainNibFile~ipad diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index a44da0b0c..170d97bda 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -7915,17 +7915,17 @@ backup - 12 + 13 class BLWrapperHandle name - LinphoneUI/UICallBar/12/UICallBar.xib + LinphoneUI/UICallBar/13/UICallBar.xib change date - 2012-11-13T08:39:33Z + 2013-03-19T11:14:29Z changed values class @@ -7935,7 +7935,7 @@ flags 0 hash - 6ce20b228103dd1de3d5c07ecc8cc68a + 9f9815d56c4734db373f49582fd9605c name UICallBar.xib @@ -8839,6 +8839,312 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Route"; ObjectID = "164"; + errors + + flags + 0 + key + 164.accessibilityLabel + localizations + + en + Route + fr + Route + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Route"; ObjectID = "164"; + errors + + flags + 0 + key + 164.normalTitle + localizations + + en + Route + fr + Route + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Speaker"; ObjectID = "168"; + errors + + flags + 0 + key + 168.accessibilityLabel + localizations + + en + Speaker + fr + Haut parleur + ru + Динамик + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "168"; + errors + + flags + 0 + key + 168.normalTitle + localizations + + en + Speaker + fr + Haut parleur + ru + Динамик + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Receiver"; ObjectID = "169"; + errors + + flags + 0 + key + 169.accessibilityLabel + localizations + + en + Receiver + fr + Écouteur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Receiver"; ObjectID = "169"; + errors + + flags + 0 + key + 169.normalTitle + localizations + + en + Receiver + fr + Écouteur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Bluetooth"; ObjectID = "174"; + errors + + flags + 0 + key + 174.accessibilityLabel + localizations + + en + Bluetooth + fr + Bluetooth + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Bluetooth"; ObjectID = "174"; + errors + + flags + 0 + key + 174.normalTitle + localizations + + en + Bluetooth + fr + Bluetooth + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Route"; ObjectID = "183"; + errors + + flags + 0 + key + 183.normalTitle + localizations + + en + Route + fr + Route + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "187"; + errors + + flags + 0 + key + 187.normalTitle + localizations + + en + Speaker + fr + Haut parleur + ru + Динамик + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Receiver"; ObjectID = "188"; + errors + + flags + 0 + key + 188.normalTitle + localizations + + en + Receiver + fr + Écouteur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Bluetooth"; ObjectID = "193"; + errors + + flags + 0 + key + 193.normalTitle + localizations + + en + Bluetooth + fr + Bluetooth + + snapshots + + old objects @@ -9085,11 +9391,11 @@ versions en - 12 + 13 fr - 12 + 13 ru - 12 + 13 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar/13/UICallBar.xib similarity index 79% rename from linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib rename to linphone.ldb/Resources/LinphoneUI/UICallBar/13/UICallBar.xib index 3398db0d7..103729845 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/13/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject @@ -42,7 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} - + _NS:9 1 @@ -64,7 +64,6 @@ 274 {281, 260} - _NS:9 2 @@ -80,7 +79,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -124,7 +122,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -152,7 +149,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -180,7 +176,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -208,7 +203,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -236,7 +230,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -264,7 +257,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -292,7 +284,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -320,7 +311,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -348,7 +338,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -376,7 +365,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -404,7 +392,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -430,7 +417,6 @@ {{20, 57}, {281, 260}} - _NS:9 @@ -440,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Receiver + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Speaker + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -449,7 +608,6 @@ 292 {{3, 0}, {77, 68}} - _NS:9 NO @@ -492,23 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - - _NS:9 NO 17 @@ -542,12 +691,11 @@ options_add_default.png - + {{240, 208}, {80, 126}} - _NS:9 @@ -563,7 +711,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -579,7 +726,6 @@ 292 {{320, -8}, {44, 90}} - _NS:9 101 @@ -595,8 +741,7 @@ 290 {{0, 135}, {320, 2000}} - - + _NS:9 1 @@ -610,7 +755,6 @@ 292 {80, 67} - _NS:9 NO @@ -650,14 +794,13 @@ video_off_default.png - + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -670,7 +813,6 @@ 292 {{80, 0}, {80, 67}} - _NS:9 NO @@ -710,15 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - - + _NS:9 NO 22 @@ -757,14 +898,68 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + 292 {{240, 0}, {80, 67}} - _NS:9 NO @@ -804,14 +999,13 @@ options_default.png - + 264 {{0, 67}, {105, 68}} - _NS:9 NO @@ -848,7 +1042,6 @@ -2147483384 {{0, 67}, {105, 68}} - _NS:9 NO @@ -878,7 +1071,6 @@ 264 {{105, 67}, {111, 68}} - _NS:9 NO @@ -908,7 +1100,6 @@ 264 {{215, 67}, {105, 68}} - _NS:9 NO @@ -944,7 +1135,6 @@ {{0, 325}, {320, 135}} - _NS:9 @@ -954,7 +1144,6 @@ {320, 460} - _NS:9 @@ -969,7 +1158,6 @@ -2147483355 {{0, 248}, {480, 72}} - _NS:9 @@ -992,7 +1180,6 @@ 274 {281, 260} - _NS:9 2 @@ -1005,7 +1192,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -1028,7 +1214,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -1047,7 +1232,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -1066,7 +1250,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -1085,7 +1268,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -1104,7 +1286,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1123,7 +1304,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1142,7 +1322,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1161,7 +1340,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1180,7 +1358,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1199,7 +1376,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1218,7 +1394,7 @@ 292 {{193, 196}, {107, 54}} - + NO NO 14 @@ -1234,13 +1410,178 @@ {{91, 0}, {281, 260}} - _NS:9 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1250,7 +1591,6 @@ 292 {65, 55} - _NS:9 NO @@ -1285,15 +1625,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {65, 55}} - - _NS:9 NO 17 @@ -1327,12 +1665,11 @@ options_add_default_landscape.png - + {{415, 140}, {65, 105}} - _NS:9 @@ -1348,7 +1685,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -1361,7 +1697,6 @@ 292 {{480, -8}, {44, 90}} - _NS:9 101 @@ -1374,8 +1709,7 @@ 290 {{0, 82}, {480, 2000}} - - + _NS:9 1 @@ -1389,7 +1723,6 @@ 292 {{65, 0}, {65, 82}} - _NS:9 NO @@ -1429,14 +1762,13 @@ video_off_default_landscape.png - + -2147483356 {{79, 20}, {37, 37}} - _NS:9 NO @@ -1449,7 +1781,6 @@ 292 {{130, 0}, {65, 82}} - _NS:9 NO @@ -1489,15 +1820,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - - + _NS:9 NO 22 @@ -1536,14 +1866,68 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + 292 {{350, 0}, {65, 82}} - _NS:9 NO @@ -1583,14 +1967,13 @@ options_default_landscape.png - + 264 {65, 82} - _NS:9 NO @@ -1624,7 +2007,6 @@ -2147483384 {65, 82} - _NS:9 NO @@ -1654,7 +2036,6 @@ 264 {{195, 0}, {90, 82}} - _NS:9 NO @@ -1684,7 +2065,6 @@ 264 {{415, 0}, {65, 82}} - _NS:9 NO @@ -1717,7 +2097,6 @@ {{0, 238}, {480, 82}} - _NS:9 @@ -1727,7 +2106,6 @@ {480, 320} - _NS:9 @@ -1956,6 +2334,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2098,6 +2516,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2126,6 +2580,7 @@ + Portrait View @@ -2153,6 +2608,7 @@ + buttons @@ -2340,6 +2796,7 @@ + Landscape View @@ -2481,6 +2938,7 @@ + buttons @@ -2581,6 +3039,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2591,7 +3119,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2683,6 +3211,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2743,7 +3299,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2753,289 +3309,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3117,6 +3393,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3134,6 +3442,6 @@ {160, 134} {130, 163} - 1926 + 2083 diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index efbe68d5a..01f92038b 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -7,6 +7,70 @@ objects = { /* Begin PBXBuildFile section */ + 1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; + 1599105416F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; + 1599105516F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */; }; + 1599105616F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */; }; + 1599105716F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */; }; + 1599105816F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */; }; + 1599105916F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */; }; + 1599105A16F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */; }; + 1599105B16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */; }; + 1599105C16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */; }; + 1599105D16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */; }; + 1599105E16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */; }; + 1599105F16F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */; }; + 1599106016F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */; }; + 1599106116F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */; }; + 1599106216F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */; }; + 1599106316F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */; }; + 1599106416F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */; }; + 1599106516F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */; }; + 1599106616F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */; }; + 1599106716F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */; }; + 1599106816F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */; }; + 1599106916F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */; }; + 1599106A16F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */; }; + 1599106B16F746B2007BF52B /* routes_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104F16F746B2007BF52B /* routes_default_landscape.png */; }; + 1599106C16F746B2007BF52B /* routes_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104F16F746B2007BF52B /* routes_default_landscape.png */; }; + 1599106D16F746B2007BF52B /* routes_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105016F746B2007BF52B /* routes_disabled_landscape.png */; }; + 1599106E16F746B2007BF52B /* routes_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105016F746B2007BF52B /* routes_disabled_landscape.png */; }; + 1599106F16F746B2007BF52B /* routes_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105116F746B2007BF52B /* routes_over_landscape.png */; }; + 1599107016F746B2007BF52B /* routes_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105116F746B2007BF52B /* routes_over_landscape.png */; }; + 1599107116F746B2007BF52B /* routes_selected_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105216F746B2007BF52B /* routes_selected_landscape.png */; }; + 1599107216F746B2007BF52B /* routes_selected_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105216F746B2007BF52B /* routes_selected_landscape.png */; }; + 15AF3C5416F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */; }; + 15AF3C5516F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */; }; + 15AF3C5616F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */; }; + 15AF3C5716F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */; }; + 15AF3C5816F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */; }; + 15AF3C5916F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */; }; + 15AF3C5C16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */; }; + 15AF3C5D16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */; }; + 15AF3C6C16F37A4A00FC52EC /* route_phone_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */; }; + 15AF3C6D16F37A4A00FC52EC /* route_phone_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */; }; + 15AF3C6E16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */; }; + 15AF3C6F16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */; }; + 15AF3C7016F37A4A00FC52EC /* route_phone_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */; }; + 15AF3C7116F37A4A00FC52EC /* route_phone_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */; }; + 15AF3C7416F37A4A00FC52EC /* route_phone_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */; }; + 15AF3C7516F37A4A00FC52EC /* route_phone_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */; }; + 15AF3C8416F37A5500FC52EC /* route_speaker_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */; }; + 15AF3C8516F37A5500FC52EC /* route_speaker_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */; }; + 15AF3C8616F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */; }; + 15AF3C8716F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */; }; + 15AF3C8816F37A5500FC52EC /* route_speaker_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */; }; + 15AF3C8916F37A5500FC52EC /* route_speaker_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */; }; + 15AF3C8C16F37A5500FC52EC /* route_speaker_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */; }; + 15AF3C8D16F37A5500FC52EC /* route_speaker_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */; }; + 15AF3C9816F37A5D00FC52EC /* routes_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9416F37A5D00FC52EC /* routes_default.png */; }; + 15AF3C9916F37A5D00FC52EC /* routes_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9416F37A5D00FC52EC /* routes_default.png */; }; + 15AF3C9A16F37A5D00FC52EC /* routes_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */; }; + 15AF3C9B16F37A5D00FC52EC /* routes_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */; }; + 15AF3C9C16F37A5D00FC52EC /* routes_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9616F37A5D00FC52EC /* routes_over.png */; }; + 15AF3C9D16F37A5D00FC52EC /* routes_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9616F37A5D00FC52EC /* routes_over.png */; }; + 15AF3C9E16F37A5D00FC52EC /* routes_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9716F37A5D00FC52EC /* routes_selected.png */; }; + 15AF3C9F16F37A5D00FC52EC /* routes_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9716F37A5D00FC52EC /* routes_selected.png */; }; 1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; }; 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; @@ -1339,6 +1403,38 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default_landscape.png; path = Resources/route_bluetooth_off_default_landscape.png; sourceTree = ""; }; + 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_disabled_landscape.png; path = Resources/route_bluetooth_off_disabled_landscape.png; sourceTree = ""; }; + 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_over_landscape.png; path = Resources/route_bluetooth_off_over_landscape.png; sourceTree = ""; }; + 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_on_default_landscape.png; path = Resources/route_bluetooth_on_default_landscape.png; sourceTree = ""; }; + 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_default_landscape.png; path = Resources/route_phone_off_default_landscape.png; sourceTree = ""; }; + 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_disabled_landscape.png; path = Resources/route_phone_off_disabled_landscape.png; sourceTree = ""; }; + 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_over_landscape.png; path = Resources/route_phone_off_over_landscape.png; sourceTree = ""; }; + 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_on_default_landscape.png; path = Resources/route_phone_on_default_landscape.png; sourceTree = ""; }; + 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_default_landscape.png; path = Resources/route_speaker_off_default_landscape.png; sourceTree = ""; }; + 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_disabled_landscape.png; path = Resources/route_speaker_off_disabled_landscape.png; sourceTree = ""; }; + 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_over_landscape.png; path = Resources/route_speaker_off_over_landscape.png; sourceTree = ""; }; + 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_on_default_landscape.png; path = Resources/route_speaker_on_default_landscape.png; sourceTree = ""; }; + 1599104F16F746B2007BF52B /* routes_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_default_landscape.png; path = Resources/routes_default_landscape.png; sourceTree = ""; }; + 1599105016F746B2007BF52B /* routes_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_disabled_landscape.png; path = Resources/routes_disabled_landscape.png; sourceTree = ""; }; + 1599105116F746B2007BF52B /* routes_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_over_landscape.png; path = Resources/routes_over_landscape.png; sourceTree = ""; }; + 1599105216F746B2007BF52B /* routes_selected_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_selected_landscape.png; path = Resources/routes_selected_landscape.png; sourceTree = ""; }; + 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default.png; path = Resources/route_bluetooth_off_default.png; sourceTree = ""; }; + 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_disabled.png; path = Resources/route_bluetooth_off_disabled.png; sourceTree = ""; }; + 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_over.png; path = Resources/route_bluetooth_off_over.png; sourceTree = ""; }; + 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_on_default.png; path = Resources/route_bluetooth_on_default.png; sourceTree = ""; }; + 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_default.png; path = Resources/route_phone_off_default.png; sourceTree = ""; }; + 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_disabled.png; path = Resources/route_phone_off_disabled.png; sourceTree = ""; }; + 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_over.png; path = Resources/route_phone_off_over.png; sourceTree = ""; }; + 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_on_default.png; path = Resources/route_phone_on_default.png; sourceTree = ""; }; + 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_default.png; path = Resources/route_speaker_off_default.png; sourceTree = ""; }; + 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_disabled.png; path = Resources/route_speaker_off_disabled.png; sourceTree = ""; }; + 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_over.png; path = Resources/route_speaker_off_over.png; sourceTree = ""; }; + 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_on_default.png; path = Resources/route_speaker_on_default.png; sourceTree = ""; }; + 15AF3C9416F37A5D00FC52EC /* routes_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_default.png; path = Resources/routes_default.png; sourceTree = ""; }; + 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_disabled.png; path = Resources/routes_disabled.png; sourceTree = ""; }; + 15AF3C9616F37A5D00FC52EC /* routes_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_over.png; path = Resources/routes_over.png; sourceTree = ""; }; + 15AF3C9716F37A5D00FC52EC /* routes_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_selected.png; path = Resources/routes_selected.png; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* LinphoneAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneAppDelegate.h; sourceTree = ""; }; 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneAppDelegate.m; sourceTree = ""; }; @@ -3303,6 +3399,38 @@ 2237D4081084D7A9001383EE /* ring.wav */, 22F254801073D99800AC9B3F /* ringback.wav */, 70571E1913FABCB000CDD3C2 /* rootca.pem */, + 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */, + 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */, + 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */, + 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */, + 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */, + 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */, + 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */, + 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */, + 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */, + 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */, + 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */, + 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */, + 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */, + 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */, + 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */, + 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */, + 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */, + 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */, + 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */, + 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */, + 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */, + 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */, + 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */, + 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */, + 15AF3C9416F37A5D00FC52EC /* routes_default.png */, + 1599104F16F746B2007BF52B /* routes_default_landscape.png */, + 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */, + 1599105016F746B2007BF52B /* routes_disabled_landscape.png */, + 15AF3C9616F37A5D00FC52EC /* routes_over.png */, + 1599105116F746B2007BF52B /* routes_over_landscape.png */, + 15AF3C9716F37A5D00FC52EC /* routes_selected.png */, + 1599105216F746B2007BF52B /* routes_selected_landscape.png */, D3D6A3A5159B0EFE005F692C /* security_ko.png */, D3D6A3A7159B0EFE005F692C /* security_ok.png */, D3D6A3A6159B0EFE005F692C /* security_pending.png */, @@ -4208,6 +4336,38 @@ D310392A162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, D33E1F08164CF35100CFA363 /* callbar_left_padding.png in Resources */, D33E1F0A164CF35100CFA363 /* callbar_right_padding.png in Resources */, + 15AF3C5416F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */, + 15AF3C5616F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */, + 15AF3C5816F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */, + 15AF3C5C16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */, + 15AF3C6C16F37A4A00FC52EC /* route_phone_off_default.png in Resources */, + 15AF3C6E16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */, + 15AF3C7016F37A4A00FC52EC /* route_phone_off_over.png in Resources */, + 15AF3C7416F37A4A00FC52EC /* route_phone_on_default.png in Resources */, + 15AF3C8416F37A5500FC52EC /* route_speaker_off_default.png in Resources */, + 15AF3C8616F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */, + 15AF3C8816F37A5500FC52EC /* route_speaker_off_over.png in Resources */, + 15AF3C8C16F37A5500FC52EC /* route_speaker_on_default.png in Resources */, + 15AF3C9816F37A5D00FC52EC /* routes_default.png in Resources */, + 15AF3C9A16F37A5D00FC52EC /* routes_disabled.png in Resources */, + 15AF3C9C16F37A5D00FC52EC /* routes_over.png in Resources */, + 15AF3C9E16F37A5D00FC52EC /* routes_selected.png in Resources */, + 1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */, + 1599105516F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */, + 1599105716F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */, + 1599105916F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */, + 1599105B16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */, + 1599105D16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */, + 1599105F16F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */, + 1599106116F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */, + 1599106316F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */, + 1599106516F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */, + 1599106716F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */, + 1599106916F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */, + 1599106B16F746B2007BF52B /* routes_default_landscape.png in Resources */, + 1599106D16F746B2007BF52B /* routes_disabled_landscape.png in Resources */, + 1599106F16F746B2007BF52B /* routes_over_landscape.png in Resources */, + 1599107116F746B2007BF52B /* routes_selected_landscape.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4712,6 +4872,38 @@ D310392B162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, D33E1F09164CF35100CFA363 /* callbar_left_padding.png in Resources */, D33E1F0B164CF35100CFA363 /* callbar_right_padding.png in Resources */, + 15AF3C5516F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */, + 15AF3C5716F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */, + 15AF3C5916F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */, + 15AF3C5D16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */, + 15AF3C6D16F37A4A00FC52EC /* route_phone_off_default.png in Resources */, + 15AF3C6F16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */, + 15AF3C7116F37A4A00FC52EC /* route_phone_off_over.png in Resources */, + 15AF3C7516F37A4A00FC52EC /* route_phone_on_default.png in Resources */, + 15AF3C8516F37A5500FC52EC /* route_speaker_off_default.png in Resources */, + 15AF3C8716F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */, + 15AF3C8916F37A5500FC52EC /* route_speaker_off_over.png in Resources */, + 15AF3C8D16F37A5500FC52EC /* route_speaker_on_default.png in Resources */, + 15AF3C9916F37A5D00FC52EC /* routes_default.png in Resources */, + 15AF3C9B16F37A5D00FC52EC /* routes_disabled.png in Resources */, + 15AF3C9D16F37A5D00FC52EC /* routes_over.png in Resources */, + 15AF3C9F16F37A5D00FC52EC /* routes_selected.png in Resources */, + 1599105416F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */, + 1599105616F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */, + 1599105816F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */, + 1599105A16F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */, + 1599105C16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */, + 1599105E16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */, + 1599106016F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */, + 1599106216F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */, + 1599106416F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */, + 1599106616F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */, + 1599106816F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */, + 1599106A16F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */, + 1599106C16F746B2007BF52B /* routes_default_landscape.png in Resources */, + 1599106E16F746B2007BF52B /* routes_disabled_landscape.png in Resources */, + 1599107016F746B2007BF52B /* routes_over_landscape.png in Resources */, + 1599107216F746B2007BF52B /* routes_selected_landscape.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/Default-568h@2x.png b/submodules/Default-568h@2x.png new file mode 100644 index 000000000..0891b7aab Binary files /dev/null and b/submodules/Default-568h@2x.png differ diff --git a/submodules/belle-sip b/submodules/belle-sip index 9b6ee4c14..db7440f29 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 9b6ee4c140ba1bb83142b921764bbbb1b42ed22c +Subproject commit db7440f29b1f632df236170f9b796f903df12e3b diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 2ca2f3b62..86d69cb12 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -112,17 +112,18 @@ veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-libantlr build-belle-sip build-srtp build-zrtpcpp build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-polarssl build-libantlr build-belle-sip build-srtp build-zrtpcpp build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install + mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/ -clean-linphone: clean-libantlr clean-belle-sip clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 +clean-linphone: clean-libantlr clean-polarssl clean-belle-sip clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-libantlrc3 veryclean-belle-sip veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx +veryclean-linphone: veryclean-libantlr veryclean-polarssl veryclean-belle-sip veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-libantlr clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk +clean-makefile-linphone: clean-makefile-libantlr clean-makefile-polarssl clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile diff --git a/submodules/build/builders.d/belle-sip.mk b/submodules/build/builders.d/belle-sip.mk index 6b95dec3f..8628c5c55 100644 --- a/submodules/build/builders.d/belle-sip.mk +++ b/submodules/build/builders.d/belle-sip.mk @@ -27,7 +27,7 @@ $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(belle-sip_d mkdir -p $(BUILDER_BUILD_DIR)/$(belle-sip_dir) cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/ \ && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --disable-tls + $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --enable-tls build-belle-sip: $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install diff --git a/submodules/build/builders.d/polarssl.mk b/submodules/build/builders.d/polarssl.mk new file mode 100644 index 000000000..f1ac89ae1 --- /dev/null +++ b/submodules/build/builders.d/polarssl.mk @@ -0,0 +1,19 @@ +polarssl_dir?=externals/polarssl + +$(BUILDER_BUILD_DIR)/$(polarssl_dir)/Makefile: $(BUILDER_SRC_DIR)/$(polarssl_dir)/Makefile + mkdir -p $(BUILDER_BUILD_DIR)/$(polarssl_dir) + cd $(BUILDER_BUILD_DIR)/$(polarssl_dir)/ && \ + rsync -rvLpgoc --exclude ".git" $(BUILDER_SRC_DIR)/$(polarssl_dir)/ . + +build-polarssl: $(BUILDER_BUILD_DIR)/$(polarssl_dir)/Makefile + host_alias=$(host) && . /$(BUILDER_SRC_DIR)/build/$(config_site) && \ + cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make lib && make install DESTDIR=$(prefix) + +clean-polarssl: + -cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make clean + +veryclean-polarssl: + -rm -rf $(BUILDER_BUILD_DIR)/$(polarssl_dir) + +clean-makefile-polarssl: veryclean-polarssl + diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index 203ffe351..3db77bc3f 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -51,7 +51,7 @@ x264_dir?=externals/x264 $(BUILDER_BUILD_DIR)/$(x264_dir)/configure: mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir) cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \ - && rsync -av --exclude ".git" $(BUILDER_SRC_DIR)/$(x264_dir)/* . + && rsync -rvLpgoc --exclude ".git" $(BUILDER_SRC_DIR)/$(x264_dir)/* . $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak: $(BUILDER_BUILD_DIR)/$(x264_dir)/configure cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \ diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl new file mode 160000 index 000000000..b772d5593 --- /dev/null +++ b/submodules/externals/polarssl @@ -0,0 +1 @@ +Subproject commit b772d5593c025e6fb945e21ee683b50ba327e211 diff --git a/submodules/linphone b/submodules/linphone index d69d96a0c..25f44cc7c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d69d96a0cabe126676524c30d637eb8c2b138a99 +Subproject commit 25f44cc7c90bcde78f97d51f489e91f5094827f1