mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

submodules: update linphone and update linphone core instantiation

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2016-02-03 10:17:59 +01:00
parent dd72bfe6e4
commit ee8ecb4117
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Classes/LinphoneManager.m
View file

@ -1428,19 +1428,19 @@ static BOOL libStarted = FALSE;
[Log enableLogs:[self lpConfigIntForKey:@"debugenable_preference"]];
connectivity = none;
ms_init(); // Need to initialize mediastreamer2 before loading the plugins
// Load plugins if available in the linphone SDK - otherwise these calls will do nothing
libmsilbc_init(ms_factory_get_fallback());
libmssilk_init(ms_factory_get_fallback());
libmsamr_init(ms_factory_get_fallback());
libmsx264_init(ms_factory_get_fallback());
libmsopenh264_init(ms_factory_get_fallback());
libmsbcg729_init(ms_factory_get_fallback());
libmswebrtc_init(ms_factory_get_fallback());
theLinphoneCore = linphone_core_new_with_config(&linphonec_vtable, _configDb, (__bridge void *)(self));
LOGI(@"Create linphonecore %p", theLinphoneCore);
// Load plugins if available in the linphone SDK - otherwise these calls will do nothing
MSFactory *f = linphone_core_get_ms_factory(theLinphoneCore);
libmsilbc_init(f);
libmssilk_init(f);
libmsamr_init(f);
libmsx264_init(f);
libmsopenh264_init(f);
libmsbcg729_init(f);
libmswebrtc_init(f);
// Set audio assets
NSString *ring =
([LinphoneManager
@ -1507,7 +1507,6 @@ static BOOL libStarted = FALSE;
linphone_core_destroy(theLinphoneCore);
LOGI(@"Destroy linphonecore %p", theLinphoneCore);
theLinphoneCore = nil;
ms_exit(); // Uninitialize mediastreamer2
// Post event
NSDictionary *dict =

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit f76447b43e3bbd31dfe6fdbe280e99e2aea73382
Subproject commit 39a660c07feaaaae0eca8e1d8c18d52adb8e7cf3

2
submodules/linphone

@ -1 +1 @@
Subproject commit b0ea18f83cd642243c5a2e1690d5cf95bfe55000
Subproject commit 1db3b9a2978d64dc886c6c7db7b5ed21ee39bbe7