diff --git a/Classes/ChatRoomTableViewController.m b/Classes/ChatRoomTableViewController.m index 8182eca56..608316be5 100644 --- a/Classes/ChatRoomTableViewController.m +++ b/Classes/ChatRoomTableViewController.m @@ -149,7 +149,6 @@ return cell; } - - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath { if(editingStyle == UITableViewCellEditingStyleDelete) { [tableView beginUpdates]; diff --git a/Classes/DialerViewController.h b/Classes/DialerViewController.h index c23b7218f..49e6d857c 100644 --- a/Classes/DialerViewController.h +++ b/Classes/DialerViewController.h @@ -56,6 +56,7 @@ @property (nonatomic, retain) IBOutlet UIDigitButton* starButton; @property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton; @property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton; +@property (nonatomic, retain) IBOutlet UIView* backgroundView; @property (nonatomic, retain) IBOutlet UIView* videoPreview; @property (nonatomic, retain) IBOutlet UICamSwitch* videoCameraSwitch; diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index 9abd60d74..68fe4ed06 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -54,6 +54,7 @@ @synthesize zeroButton; @synthesize sharpButton; +@synthesize backgroundView; @synthesize videoPreview; @synthesize videoCameraSwitch; @@ -129,15 +130,27 @@ static UICompositeViewDescription *compositeDescription = nil; selector:@selector(callUpdateEvent:) name:kLinphoneCallUpdate object:nil]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(coreUpdateEvent:) + name:kLinphoneCoreUpdate + object:nil]; // Update on show if([LinphoneManager isLcReady]) { - LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); + LinphoneCore* lc = [LinphoneManager getLc]; + LinphoneCall* call = linphone_core_get_current_call(lc); LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0; [self callUpdate:call state:state]; - } - - if(videoPreview) { - linphone_core_set_native_preview_window_id([LinphoneManager getLc], (unsigned long)videoPreview); + + if([LinphoneManager runningOnIpad]) { + if(linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) { + linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); + [backgroundView setHidden:FALSE]; + } else { + linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); + [backgroundView setHidden:TRUE]; + } + } } } @@ -148,6 +161,11 @@ static UICompositeViewDescription *compositeDescription = nil; [[NSNotificationCenter defaultCenter] removeObserver:self name:kLinphoneCallUpdate object:nil]; + + [[NSNotificationCenter defaultCenter] removeObserver:self + name:kLinphoneCoreUpdate + object:nil]; + } - (void)viewDidLoad { @@ -169,8 +187,6 @@ static UICompositeViewDescription *compositeDescription = nil; [addressField setAdjustsFontSizeToFitWidth:TRUE]; // Not put it in IB: issue with placeholder size if([LinphoneManager runningOnIpad]) { - linphone_core_enable_video_preview([LinphoneManager getLc], TRUE); - if ([LinphoneManager instance].frontCamId != nil) { // only show camera switch button if we have more than 1 camera [videoCameraSwitch setHidden:FALSE]; @@ -180,10 +196,6 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewDidUnload { [super viewDidUnload]; - - if([LinphoneManager runningOnIpad]) { - linphone_core_enable_video_preview([LinphoneManager getLc], FALSE); - } } - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { @@ -197,10 +209,10 @@ static UICompositeViewDescription *compositeDescription = nil; [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)]; break; case UIInterfaceOrientationLandscapeLeft: - [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)]; + [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)]; break; case UIInterfaceOrientationLandscapeRight: - [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)]; + [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)]; break; default: break; @@ -217,6 +229,18 @@ static UICompositeViewDescription *compositeDescription = nil; [self callUpdate:call state:state]; } +- (void)coreUpdateEvent:(NSNotification*)notif { + if([LinphoneManager isLcReady] && [LinphoneManager runningOnIpad]) { + LinphoneCore* lc = [LinphoneManager getLc]; + if(linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) { + linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); + [backgroundView setHidden:FALSE]; + } else { + linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); + [backgroundView setHidden:TRUE]; + } + } +} #pragma mark - diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index 7d991642f..d094e4ffe 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -372,7 +372,7 @@ static UICompositeViewDescription *compositeDescription = nil; [UIView commitAnimations]; } - if([[LinphoneManager instance] lpConfigBoolForKey:@"self_video_preference"]) { + if(linphone_core_self_view_enabled([LinphoneManager getLc])) { [videoPreview setHidden:FALSE]; } else { [videoPreview setHidden:TRUE]; diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 6a820991e..31c2c50a8 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -218,7 +218,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); pol=linphone_core_get_video_policy(lc); [self setBool:(pol->automatically_initiate) forKey:@"start_video_preference"]; [self setBool:(pol->automatically_accept) forKey:@"accept_video_preference"]; - [self setBool:lp_config_get_int(linphone_core_get_config(lc),"app","self_video_preference", 1) forKey:@"self_video_preference"]; + [self setBool:linphone_core_self_view_enabled(lc) forKey:@"self_video_preference"]; + [self setBool:linphone_core_video_preview_enabled(lc) forKey:@"preview_preference"]; } { [self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","sipinfo_dtmf_preference", 0) forKey:@"sipinfo_dtmf_preference"]; @@ -460,8 +461,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); policy.automatically_accept = [self boolForKey:@"accept_video_preference"]; policy.automatically_initiate = [self boolForKey:@"start_video_preference"]; linphone_core_set_video_policy(lc, &policy); - lp_config_set_int(linphone_core_get_config(lc),"app","self_video_preference", [self boolForKey:@"self_video_preference"]); - + linphone_core_enable_self_view(lc, [self boolForKey:@"self_video_preference"]); + linphone_core_enable_video_preview(lc, [self boolForKey:@"preview_preference"]); // Primary contact NSString* displayname = [self stringForKey:@"primary_displayname_preference"]; diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 1ab4f74d1..cd288e3f1 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -31,6 +31,7 @@ #include "linphonecore.h" +extern NSString *const kLinphoneCoreUpdate; extern NSString *const kLinphoneDisplayStatusUpdate; extern NSString *const kLinphoneTextReceived; extern NSString *const kLinphoneCallUpdate; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 5da9bc990..a16ae335d 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -44,6 +44,7 @@ static void audioRouteChangeListenerCallback ( static LinphoneCore* theLinphoneCore = nil; static LinphoneManager* theLinphoneManager = nil; +NSString *const kLinphoneCoreUpdate = @"kLinphoneCoreUpdate"; NSString *const kLinphoneDisplayStatusUpdate = @"LinphoneDisplayStatusUpdate"; NSString *const kLinphoneTextReceived = @"LinphoneTextReceived"; NSString *const kLinphoneCallUpdate = @"LinphoneCallUpdate"; @@ -601,13 +602,11 @@ static LinphoneCoreVTable linphonec_vtable = { - (void)startLibLinphone { //get default config from bundle - NSBundle* myBundle = [NSBundle mainBundle]; - NSString* factoryConfig = [myBundle pathForResource:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory" ofType:nil] ; - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - NSString *confiFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/.linphonerc"]; - NSString *zrtpSecretsFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/zrtp_secrets"]; - const char* lRootCa = [[myBundle pathForResource:@"rootca"ofType:@"pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; - connectivity=none; + NSString* factoryConfig = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory"]; + NSString *confiFileName = [LinphoneManager documentFile:@".linphonerc"]; + NSString *zrtpSecretsFileName = [LinphoneManager documentFile:@"zrtp_secrets"]; + const char* lRootCa = [[LinphoneManager bundleFile:@"rootca.pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + connectivity = none; signal(SIGPIPE, SIG_IGN); //log management @@ -633,17 +632,16 @@ static LinphoneCoreVTable linphonec_vtable = { , [confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]] , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]] ,self); - - + fastAddressBook = [[FastAddressBook alloc] init]; linphone_core_set_root_ca(theLinphoneCore, lRootCa); // Set audio assets - const char* lRing = [[myBundle pathForResource:@"ring"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; - linphone_core_set_ring(theLinphoneCore, lRing ); - const char* lRingBack = [[myBundle pathForResource:@"ringback"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char* lRing = [[LinphoneManager bundleFile:@"ring.wab"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + linphone_core_set_ring(theLinphoneCore, lRing); + const char* lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; linphone_core_set_ringback(theLinphoneCore, lRingBack); - const char* lPlay = [[myBundle pathForResource:@"hold"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; + const char* lPlay = [[LinphoneManager bundleFile:@"hold.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]]; linphone_core_set_play_file(theLinphoneCore, lPlay); linphone_core_set_zrtp_secrets_file(theLinphoneCore, [zrtpSecretsFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]); @@ -673,7 +671,7 @@ static LinphoneCoreVTable linphonec_vtable = { [error release]; } - NSString* path = [myBundle pathForResource:@"nowebcamCIF" ofType:@"jpg"]; + NSString* path = [LinphoneManager bundleFile:@"nowebcamCIF.jpg"]; if (path) { const char* imagePath = [path cStringUsingEncoding:[NSString defaultCStringEncoding]]; [LinphoneLogger logc:LinphoneLoggerLog format:"Using '%s' as source image for no webcam", imagePath]; @@ -722,7 +720,11 @@ static LinphoneCoreVTable linphonec_vtable = { && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground) { //go directly to bg mode [self resignActive]; - } + } + + // Post event + NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"]; + [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCoreUpdate object:[LinphoneManager instance] userInfo:dict]; } - (void)destroyLibLinphone { @@ -734,6 +736,11 @@ static LinphoneCoreVTable linphonec_vtable = { [LinphoneLogger logc:LinphoneLoggerLog format:"Destroy linphonecore"]; linphone_core_destroy(theLinphoneCore); theLinphoneCore = nil; + + // Post event + NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"]; + [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCoreUpdate object:[LinphoneManager instance] userInfo:dict]; + SCNetworkReachabilityUnscheduleFromRunLoop(proxyReachability, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); if (proxyReachability) CFRelease(proxyReachability); diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index ea0953c9a..7bbf7f4dc 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -253,10 +253,12 @@ #pragma mark - Event Functions - (void)orientationDidChange:(NSNotification*)notif { - // Update rotation - UIInterfaceOrientation correctOrientation = [self getCorrectInterfaceOrientation:[[UIDevice currentDevice] orientation]]; - if(currentOrientation != correctOrientation) { - [PhoneMainView setOrientation:correctOrientation animated:currentOrientation!=UIDeviceOrientationUnknown]; + if([LinphoneManager isLcReady]) { + // Update rotation + UIInterfaceOrientation correctOrientation = [self getCorrectInterfaceOrientation:[[UIDevice currentDevice] orientation]]; + if(currentOrientation != correctOrientation) { + [PhoneMainView setOrientation:correctOrientation animated:currentOrientation != UIDeviceOrientationUnknown]; + } } } diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 87a7f11c6..f2e04f05e 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -32,9 +32,6 @@ static PhoneMainView* phoneMainViewInstance=nil; @synthesize mainViewController; @synthesize currentView; -// TO READ -// If a Controller set wantFullScreenLayout then DON'T set the autoresize! -// So DON'T set autoresize for PhoneMainView #pragma mark - Lifecycle Functions @@ -716,7 +713,7 @@ static PhoneMainView* phoneMainViewInstance=nil; if (level < 0.1 && !appData->batteryWarningShown) { DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Battery is running low. Stop video ?",nil)] autorelease]; [sheet addCancelButtonWithTitle:NSLocalizedString(@"Continue video", nil)]; - [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() { + [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() { LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call)); // stop video linphone_call_params_enable_video(paramsCopy, FALSE); diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 573842b47..4ab119257 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -530,6 +530,10 @@ static UICompositeViewDescription *compositeDescription = nil; [hiddenKeys addObject:@"console_button"]; } + if(![LinphoneManager runningOnIpad]) { + [hiddenKeys addObject:@"preview_preference"]; + } + return hiddenKeys; } diff --git a/Classes/en.lproj/DialerViewController~ipad.xib b/Classes/en.lproj/DialerViewController~ipad.xib index 26bc622af..60f9db3be 100644 --- a/Classes/en.lproj/DialerViewController~ipad.xib +++ b/Classes/en.lproj/DialerViewController~ipad.xib @@ -62,7 +62,7 @@ 3 MCAwAA - 1 + 2 IBIPadFramework @@ -726,6 +726,7 @@ {{126, 0}, {186, 85}} + _NS:9 NO @@ -954,6 +955,14 @@ 75 + + + backgroundView + + + + 77 + onAddressChange: @@ -1337,6 +1346,7 @@ 76 + backgroundView @@ -1416,7 +1426,7 @@ - 76 + 77 @@ -1447,6 +1457,7 @@ UIButton UITextField UIButton + UIView UICallButton UIDigitButton UIEraseButton @@ -1482,6 +1493,10 @@ backButton UIButton + + backgroundView + UIView + callButton UICallButton diff --git a/Classes/en.lproj/InCallViewController.xib b/Classes/en.lproj/InCallViewController.xib index d849e1ca3..87f56054e 100644 --- a/Classes/en.lproj/InCallViewController.xib +++ b/Classes/en.lproj/InCallViewController.xib @@ -146,7 +146,6 @@ {{0, 23}, {85, 33}} - _NS:9 NO diff --git a/Classes/fr.lproj/DialerViewController~ipad.xib b/Classes/fr.lproj/DialerViewController~ipad.xib index 58f381dce..90e271b5c 100644 --- a/Classes/fr.lproj/DialerViewController~ipad.xib +++ b/Classes/fr.lproj/DialerViewController~ipad.xib @@ -60,7 +60,7 @@ 3 MCAwAA - 1 + 2 IBIPadFramework @@ -925,6 +925,14 @@ 75 + + + backgroundView + + + + 77 + onAddressChange: @@ -1308,6 +1316,7 @@ 76 + backgroundView @@ -1387,7 +1396,7 @@ - 76 + 77 @@ -1418,6 +1427,7 @@ UIButton UITextField UIButton + UIView UICallButton UIDigitButton UIEraseButton @@ -1453,6 +1463,10 @@ backButton UIButton + + backgroundView + UIView + callButton UICallButton diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index 121edc3e6..35826eef3 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -30,12 +30,3 @@ dtmf_player_amp=0.007 [misc] history_max_size=30 max_calls=3 - -[video] -display=1 -capture=1 -show_local=0 -enabled=1 -size=vga -display_filter_auto_rotate=1 - diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index 768e62443..7275d321e 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -10,4 +10,12 @@ audio_rtp_port=7076 video_rtp_port=9078 [net] -firewall_policy=0 \ No newline at end of file +firewall_policy=0 + +[video] +display=1 +capture=1 +show_local=1 +enabled=1 +size=vga +display_filter_auto_rotate=1 \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/Video.plist b/Settings/InAppSettings.bundle/Video.plist index 2cc185b15..77aa2e894 100644 --- a/Settings/InAppSettings.bundle/Video.plist +++ b/Settings/InAppSettings.bundle/Video.plist @@ -32,6 +32,14 @@ Key self_video_preference + + Type + PSToggleSwitchSpecifier + Title + Show preview + Key + preview_preference + Title Codecs diff --git a/Settings/InAppSettings.bundle/en.lproj/Video.strings b/Settings/InAppSettings.bundle/en.lproj/Video.strings index 1072b20c8..9ef83a74b 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Video.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Video.strings @@ -7,6 +7,9 @@ /* Show self view */ "Show self view" = "Show self view"; +/* Show preview */ +"Show preview" = "Show preview"; + /* Codecs */ "Codecs" = "Codecs"; diff --git a/Settings/InAppSettings.bundle/fr.lproj/Video.strings b/Settings/InAppSettings.bundle/fr.lproj/Video.strings index a94d95b18..66d51eea6 100644 Binary files a/Settings/InAppSettings.bundle/fr.lproj/Video.strings and b/Settings/InAppSettings.bundle/fr.lproj/Video.strings differ diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 83ccf3060..09f16f942 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -1410,17 +1410,17 @@ backup - 3 + 7 class BLWrapperHandle name - Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib + Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib change date - 2012-09-14T08:21:20Z + 2012-09-17T15:00:19Z changed values class @@ -1430,7 +1430,7 @@ flags 0 hash - 199b213a86204679336e2f627d919b3d + 2ba8580f9c2559276f0f27f8ec043517 name DialerViewController~ipad.xib @@ -1969,9 +1969,9 @@ versions en - 3 + 7 fr - 3 + 7 @@ -2776,17 +2776,17 @@ backup - 1 + 2 class BLWrapperHandle name - Classes/InCallViewController/1/InCallViewController.xib + Classes/InCallViewController/2/InCallViewController.xib change date - 2012-09-10T15:34:47Z + 2012-09-17T15:00:02Z changed values class @@ -2796,7 +2796,7 @@ flags 0 hash - ef39c975bbcbb80f09bc1b599428075d + 43dc274f749d7ce59719b7aff1ab2889 name InCallViewController.xib @@ -2835,9 +2835,9 @@ versions en - 1 + 2 fr - 1 + 2 @@ -11155,7 +11155,7 @@ Raison: %2$s change date - 2012-09-11T10:16:55Z + 2012-09-17T13:29:57Z changed values class @@ -11165,7 +11165,7 @@ Raison: %2$s flags 0 hash - ab1400cd24f02dacc6b2b98b0ce939b5 + b7297749603f255583f59fcea3174690 name Video.strings @@ -11246,6 +11246,31 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Show preview + errors + + flags + 0 + key + Show preview + localizations + + en + Show preview + fr + Activer prévisualisation + + snapshots + + change date 2001-01-01T00:00:00Z diff --git a/linphone.ldb/Resources/Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib b/linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib similarity index 99% rename from linphone.ldb/Resources/Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib rename to linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib index 26bc622af..60f9db3be 100644 --- a/linphone.ldb/Resources/Classes/DialerViewController~ipad/3/DialerViewController~ipad.xib +++ b/linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib @@ -62,7 +62,7 @@ 3 MCAwAA - 1 + 2 IBIPadFramework @@ -726,6 +726,7 @@ {{126, 0}, {186, 85}} + _NS:9 NO @@ -954,6 +955,14 @@ 75 + + + backgroundView + + + + 77 + onAddressChange: @@ -1337,6 +1346,7 @@ 76 + backgroundView @@ -1416,7 +1426,7 @@ - 76 + 77 @@ -1447,6 +1457,7 @@ UIButton UITextField UIButton + UIView UICallButton UIDigitButton UIEraseButton @@ -1482,6 +1493,10 @@ backButton UIButton + + backgroundView + UIView + callButton UICallButton diff --git a/linphone.ldb/Resources/Classes/InCallViewController/1/InCallViewController.xib b/linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/InCallViewController/1/InCallViewController.xib rename to linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib index d849e1ca3..87f56054e 100644 --- a/linphone.ldb/Resources/Classes/InCallViewController/1/InCallViewController.xib +++ b/linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib @@ -146,7 +146,6 @@ {{0, 23}, {85, 33}} - _NS:9 NO diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings b/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings index 1072b20c8..9ef83a74b 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings @@ -7,6 +7,9 @@ /* Show self view */ "Show self view" = "Show self view"; +/* Show preview */ +"Show preview" = "Show preview"; + /* Codecs */ "Codecs" = "Codecs"; diff --git a/submodules/linphone b/submodules/linphone index efe7222f2..e683675e5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit efe7222f2efb7eae906b7337925fc080ce9d6b0e +Subproject commit e683675e57e22cf07744dbf6f6c40e8dd374ef78