mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update belle-sip & linphone submodules

Browse source
This commit is contained in:
Jehan Monnier 2015-07-23 11:50:06 +02:00
parent bbbd10c1d9
commit eb826bc5f8
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Classes/DialerViewController.m
View file

@ -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];
}

4
Classes/InCallViewController.m
View file

@ -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];

2
linphone.xcodeproj/project.pbxproj
View file

@ -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 */,

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 580012c556ba0e4d0f09bf3f182cdf55e030f215
Subproject commit 703848fb1496c5a372c8a8f04447cd25fbb626cf

2
submodules/linphone

@ -1 +1 @@
Subproject commit 04c43a9f64db5152e2859528c40dbd79008ccf5b
Subproject commit 4073c6e0d0eaf331da8c458a3504b5c8f5924b62