From eb826bc5f889d6a6c98605926733684b93b43cb7 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 23 Jul 2015 11:50:06 +0200 Subject: [PATCH] update belle-sip & linphone submodules --- Classes/DialerViewController.m | 8 ++++---- Classes/InCallViewController.m | 4 ++-- linphone.xcodeproj/project.pbxproj | 2 -- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index c1d07cec3..b4a7d6dfa 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -128,7 +128,7 @@ static UICompositeViewDescription *compositeDescription = nil; BOOL previewPref = [mgr lpConfigBoolForKey:@"preview_preference"]; if (videoEnabled && previewPref) { - linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview); + linphone_core_set_native_preview_window_id(lc, (__bridge void *)(videoPreview)); if (!linphone_core_video_preview_enabled(lc)) { linphone_core_enable_video_preview(lc, TRUE); @@ -137,7 +137,7 @@ static UICompositeViewDescription *compositeDescription = nil; [backgroundView setHidden:FALSE]; [videoCameraSwitch setHidden:FALSE]; } else { - linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); + linphone_core_set_native_preview_window_id(lc, NULL); linphone_core_enable_video_preview(lc, FALSE); [backgroundView setHidden:TRUE]; [videoCameraSwitch setHidden:TRUE]; @@ -232,11 +232,11 @@ static UICompositeViewDescription *compositeDescription = nil; if ([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); + linphone_core_set_native_preview_window_id(lc, (__bridge void *)(videoPreview)); [backgroundView setHidden:FALSE]; [videoCameraSwitch setHidden:FALSE]; } else { - linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL); + linphone_core_set_native_preview_window_id(lc, NULL); [backgroundView setHidden:TRUE]; [videoCameraSwitch setHidden:TRUE]; } diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index a3603f9e8..b1a790bc1 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -132,8 +132,8 @@ static UICompositeViewDescription *compositeDescription = nil; [self callUpdate:call state:state animated:FALSE]; // Set windows (warn memory leaks) - linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView); - linphone_core_set_native_preview_window_id([LinphoneManager getLc], (unsigned long)videoPreview); + linphone_core_set_native_video_window_id([LinphoneManager getLc], (__bridge void *)(videoView)); + linphone_core_set_native_preview_window_id([LinphoneManager getLc], (__bridge void *)(videoPreview)); // Enable tap [singleFingerTap setEnabled:TRUE]; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 521ce0cbb..ed3299a3d 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -173,7 +173,6 @@ 63D2680F1B174A5E00A2CC11 /* numpad_one_voicemail_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680D1B174A5E00A2CC11 /* numpad_one_voicemail_default.png */; }; 63D268101B174A5E00A2CC11 /* numpad_one_voicemail_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680E1B174A5E00A2CC11 /* numpad_one_voicemail_over.png */; }; 63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; }; - 63EA4C951B50189D00922857 /* libmswebrtc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63EA4C941B50189D00922857 /* libmswebrtc.a */; }; 63FB30351A680E73008CA393 /* UIRoundedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63FB30341A680E73008CA393 /* UIRoundedImageView.m */; }; 70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; }; 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; }; @@ -1880,7 +1879,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 63EA4C951B50189D00922857 /* libmswebrtc.a in Frameworks */, 63A4280A1B26F576000DAB93 /* libSKP_SILK_SDK.a in Frameworks */, 152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */, 152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */, diff --git a/submodules/belle-sip b/submodules/belle-sip index 580012c55..703848fb1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 580012c556ba0e4d0f09bf3f182cdf55e030f215 +Subproject commit 703848fb1496c5a372c8a8f04447cd25fbb626cf diff --git a/submodules/linphone b/submodules/linphone index 04c43a9f6..4073c6e0d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 04c43a9f64db5152e2859528c40dbd79008ccf5b +Subproject commit 4073c6e0d0eaf331da8c458a3504b5c8f5924b62