From 59978a1de2f40d87afbee7669a63b213e5a8d2c0 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 19 Jan 2015 16:00:17 +0100 Subject: [PATCH] Fix #2000: video preview not enabled at first launch (iPad) --- Classes/DialerViewController.m | 16 ++++++++++++---- Resources/linphonerc~ipad | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index e9cd810ff..652e42947 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -144,15 +144,23 @@ static UICompositeViewDescription *compositeDescription = nil; [callButton setEnabled:TRUE]; // Update on show - LinphoneManager *mgr=[LinphoneManager instance]; - LinphoneCore* lc = [LinphoneManager getLc]; - LinphoneCall* call = linphone_core_get_current_call(lc); + LinphoneManager *mgr = [LinphoneManager instance]; + 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([LinphoneManager runningOnIpad]) { - if(linphone_core_video_enabled(lc) && [mgr lpConfigBoolForKey:@"preview_preference"]) { + BOOL videoEnabled = linphone_core_video_enabled(lc); + BOOL previewPref = [mgr lpConfigBoolForKey:@"preview_preference"]; + + if( videoEnabled && previewPref ) { linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); + + if( !linphone_core_video_preview_enabled(lc)){ + linphone_core_enable_video_preview(lc, TRUE); + } + [backgroundView setHidden:FALSE]; [videoCameraSwitch setHidden:FALSE]; } else { diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index c19045ae8..1b6ff9d07 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -30,6 +30,7 @@ capture_dev_id=AU: Audio Unit Receiver eq_active=0 [app] +preview_preference=1 animations_preference=1 edge_opt_preference=0 use_system_contacts=0