diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index bd1cdf406..f2144563a 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -31,7 +31,7 @@ #import "LinphoneCoreSettingsStore.h" #import "ChatModel.h" -#include "linphonecore_utils.h" +#include "linphone/linphonecore_utils.h" #include "lpconfig.h" #define LINPHONE_LOGS_MAX_ENTRY 5000 @@ -780,7 +780,7 @@ static LinphoneCoreVTable linphonec_vtable = { .show =NULL, .call_state_changed =(LinphoneCallStateCb)linphone_iphone_call_state, .registration_state_changed = linphone_iphone_registration_state, - .notify_recv = NULL, + .notify_presence_recv=NULL, .new_subscription_request = NULL, .auth_info_requested = NULL, .display_status = linphone_iphone_display_status, diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 8ec10367f..29e3052be 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5451,7 +5451,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( - IN_LINPHONE, VIDEO_ENABLED, HAVE_X264, HAVE_SILK, @@ -5460,14 +5459,7 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; HEADER_SEARCH_PATHS = ( - submodules/linphone/coreapi, - submodules/linphone/mediastreamer2/include, - submodules/linphone/mediastreamer2/include, - submodules/linphone/oRTP/include, - submodules/externals/gsm/, - submodules/externals/osip/include, - submodules/externals/exosip/include, - submodules/externals/speex/include, + "liblinphone-sdk/apple-darwin/include", Classes/Utils/NinePatch/, Classes/Utils/XMLRPC/, ); @@ -5533,14 +5525,7 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; HEADER_SEARCH_PATHS = ( - submodules/linphone/coreapi, - submodules/linphone/mediastreamer2/include, - submodules/linphone/mediastreamer2/include, - submodules/linphone/oRTP/include, - submodules/externals/gsm/, - submodules/externals/osip/include, - submodules/externals/exosip/include, - submodules/externals/speex/include, + "liblinphone-sdk/apple-darwin/include", Classes/Utils/NinePatch/, Classes/Utils/XMLRPC/, ); @@ -5776,14 +5761,7 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; HEADER_SEARCH_PATHS = ( - submodules/linphone/coreapi, - submodules/linphone/mediastreamer2/include, - submodules/linphone/mediastreamer2/include, - submodules/linphone/oRTP/include, - submodules/externals/gsm/, - submodules/externals/osip/include, - submodules/externals/exosip/include, - submodules/externals/speex/include, + "liblinphone-sdk/apple-darwin/include", Classes/Utils/NinePatch/, Classes/Utils/XMLRPC/, ); @@ -5848,14 +5826,7 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; HEADER_SEARCH_PATHS = ( - submodules/linphone/coreapi, - submodules/linphone/mediastreamer2/include, - submodules/linphone/mediastreamer2/include, - submodules/linphone/oRTP/include, - submodules/externals/gsm/, - submodules/externals/osip/include, - submodules/externals/exosip/include, - submodules/externals/speex/include, + "liblinphone-sdk/apple-darwin/include", Classes/Utils/NinePatch/, Classes/Utils/XMLRPC/, ); diff --git a/submodules/belle-sip b/submodules/belle-sip index 89aa5d6a1..8b7546d3b 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 89aa5d6a1b9957b73696f250043b799b462a5c0f +Subproject commit 8b7546d3bebce04c9c67457bfe44805e0b87caee diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 8e528f6b3..3c118704b 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -21,6 +21,7 @@ ############################################################################ enable_gpl_third_parties=yes enable_zrtp=no +enable_opus=yes .NOTPARALLEL all: check_options build warning ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) @@ -57,7 +58,7 @@ warning: @echo "*****************************************************************" endif -LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) +LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) enable_opus=$(enable_opus) build: make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 826660b82..812f12d7f 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -20,10 +20,6 @@ 2211DBA1147660BB00DEE054 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; 221DCB561529FE660025E54D /* linphonecall.c in Sources */ = {isa = PBXBuildFile; fileRef = 225D3559124B1FF60008581C /* linphonecall.c */; }; 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */ = {isa = PBXBuildFile; fileRef = 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */; }; - 221DCB6C153584410025E54D /* yuv2rgb.fs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6A153584410025E54D /* yuv2rgb.fs */; }; - 221DCB6D153584410025E54D /* yuv2rgb.fs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6A153584410025E54D /* yuv2rgb.fs */; }; - 221DCB6E153584410025E54D /* yuv2rgb.vs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6B153584410025E54D /* yuv2rgb.vs */; }; - 221DCB6F153584410025E54D /* yuv2rgb.vs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6B153584410025E54D /* yuv2rgb.vs */; }; 221F58A013AB50F800D603C9 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 221F589F13AB50F800D603C9 /* CoreMedia.framework */; }; 222CA63211F6CF7600621220 /* allfilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BE11F6CF7600621220 /* allfilters.h */; }; 222CA63311F6CF7600621220 /* dsptools.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BF11F6CF7600621220 /* dsptools.h */; }; @@ -92,29 +88,9 @@ 222CA77A11F6CFB100621220 /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75811F6CFB100621220 /* private.h */; }; 222CA77B11F6CFB100621220 /* proxy.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75911F6CFB100621220 /* proxy.c */; }; 222CA77C11F6CFB100621220 /* sal.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75A11F6CFB100621220 /* sal.c */; }; - 222CA77D11F6CFB100621220 /* sal.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75B11F6CFB100621220 /* sal.h */; }; 222CA78411F6CFB100621220 /* siplogin.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA76211F6CFB100621220 /* siplogin.c */; }; 222CA78511F6CFB100621220 /* sipsetup.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA76311F6CFB100621220 /* sipsetup.c */; }; 222CA78611F6CFB100621220 /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; }; - 223CA86716D9268D00EF1BEC /* alaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F016D9268D00EF1BEC /* alaw.c */; }; - 223CA86916D9268D00EF1BEC /* aqsnd.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F216D9268D00EF1BEC /* aqsnd.c */; }; - 223CA86B16D9268D00EF1BEC /* audiomixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F416D9268D00EF1BEC /* audiomixer.c */; }; - 223CA86C16D9268D00EF1BEC /* chanadapt.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F516D9268D00EF1BEC /* chanadapt.c */; }; - 223CA86D16D9268D00EF1BEC /* dtmfgen.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F616D9268D00EF1BEC /* dtmfgen.c */; }; - 223CA86E16D9268D00EF1BEC /* equalizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F716D9268D00EF1BEC /* equalizer.c */; }; - 223CA87016D9268D00EF1BEC /* genericplc.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F916D9268D00EF1BEC /* genericplc.c */; }; - 223CA87116D9268D00EF1BEC /* gsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FA16D9268D00EF1BEC /* gsm.c */; }; - 223CA87216D9268D00EF1BEC /* l16.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FB16D9268D00EF1BEC /* l16.c */; }; - 223CA87416D9268D00EF1BEC /* msconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FD16D9268D00EF1BEC /* msconf.c */; }; - 223CA87516D9268D00EF1BEC /* msfileplayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FE16D9268D00EF1BEC /* msfileplayer.c */; }; - 223CA87616D9268D00EF1BEC /* msfilerec.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FF16D9268D00EF1BEC /* msfilerec.c */; }; - 223CA87716D9268D00EF1BEC /* msg722.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80016D9268D00EF1BEC /* msg722.c */; }; - 223CA87816D9268D00EF1BEC /* msiounit.m in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80116D9268D00EF1BEC /* msiounit.m */; }; - 223CA87916D9268D00EF1BEC /* msresample.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80216D9268D00EF1BEC /* msresample.c */; }; - 223CA87A16D9268D00EF1BEC /* msspeex.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80316D9268D00EF1BEC /* msspeex.c */; }; - 223CA87B16D9268D00EF1BEC /* msvolume.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80416D9268D00EF1BEC /* msvolume.c */; }; - 223CA88016D9268D00EF1BEC /* tonedetector.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80916D9268D00EF1BEC /* tonedetector.c */; }; - 223CA88116D9268D00EF1BEC /* ulaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80A16D9268D00EF1BEC /* ulaw.c */; }; 223CA88216D9268D00EF1BEC /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA80B16D9268D00EF1BEC /* waveheader.h */; }; 223CA88816D9268D00EF1BEC /* eventqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81216D9268D00EF1BEC /* eventqueue.c */; }; 223CA88916D9268D00EF1BEC /* mscommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81316D9268D00EF1BEC /* mscommon.c */; }; @@ -124,62 +100,22 @@ 223CA88D16D9268D00EF1BEC /* msticker.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81716D9268D00EF1BEC /* msticker.c */; }; 223CA88E16D9268D00EF1BEC /* mswebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81816D9268D00EF1BEC /* mswebcam.c */; }; 223CA88F16D9268D00EF1BEC /* mtu.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81916D9268D00EF1BEC /* mtu.c */; }; - 223CA89016D9268D00EF1BEC /* itc.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81B16D9268D00EF1BEC /* itc.c */; }; - 223CA89116D9268D00EF1BEC /* join.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81C16D9268D00EF1BEC /* join.c */; }; - 223CA89216D9268D00EF1BEC /* msrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81D16D9268D00EF1BEC /* msrtp.c */; }; - 223CA89316D9268D00EF1BEC /* tee.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81E16D9268D00EF1BEC /* tee.c */; }; - 223CA89416D9268D00EF1BEC /* void.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81F16D9268D00EF1BEC /* void.c */; }; 223CA89516D9268D00EF1BEC /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82116D9268D00EF1BEC /* _kiss_fft_guts.h */; }; - 223CA89616D9268D00EF1BEC /* dsptools.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82216D9268D00EF1BEC /* dsptools.c */; }; 223CA89716D9268D00EF1BEC /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82316D9268D00EF1BEC /* ffmpeg-priv.h */; }; 223CA89816D9268D00EF1BEC /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82416D9268D00EF1BEC /* g711common.h */; }; 223CA89916D9268D00EF1BEC /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82516D9268D00EF1BEC /* g722.h */; }; - 223CA89A16D9268D00EF1BEC /* g722_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82616D9268D00EF1BEC /* g722_decode.c */; }; - 223CA89B16D9268D00EF1BEC /* g722_encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82716D9268D00EF1BEC /* g722_encode.c */; }; - 223CA89C16D9268D00EF1BEC /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82816D9268D00EF1BEC /* kiss_fft.c */; }; 223CA89D16D9268D00EF1BEC /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82916D9268D00EF1BEC /* kiss_fft.h */; }; - 223CA89E16D9268D00EF1BEC /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82A16D9268D00EF1BEC /* kiss_fftr.c */; }; 223CA89F16D9268D00EF1BEC /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82B16D9268D00EF1BEC /* kiss_fftr.h */; }; - 223CA8A116D9268D00EF1BEC /* opengles_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82D16D9268D00EF1BEC /* opengles_display.c */; }; 223CA8A216D9268D00EF1BEC /* opengles_display.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82E16D9268D00EF1BEC /* opengles_display.h */; }; - 223CA8A316D9268D00EF1BEC /* shaders.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82F16D9268D00EF1BEC /* shaders.c */; }; 223CA8A416D9268D00EF1BEC /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA83016D9268D00EF1BEC /* shaders.h */; }; 223CA8A516D9268D00EF1BEC /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA83116D9268D00EF1BEC /* swscale.h */; }; 223CA8A616D9268D00EF1BEC /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA83216D9268D00EF1BEC /* vfw-missing.h */; }; - 223CA8A816D9268D00EF1BEC /* extdisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83516D9268D00EF1BEC /* extdisplay.c */; }; - 223CA8AA16D9268D00EF1BEC /* h264dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83716D9268D00EF1BEC /* h264dec.c */; }; - 223CA8AB16D9268D00EF1BEC /* ioscapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83816D9268D00EF1BEC /* ioscapture.m */; }; - 223CA8AC16D9268D00EF1BEC /* iosdisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83916D9268D00EF1BEC /* iosdisplay.m */; }; - 223CA8AD16D9268D00EF1BEC /* jpegwriter.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83A16D9268D00EF1BEC /* jpegwriter.c */; }; - 223CA8AE16D9268D00EF1BEC /* mire.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83B16D9268D00EF1BEC /* mire.c */; }; - 223CA8B316D9268D00EF1BEC /* nowebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84016D9268D00EF1BEC /* nowebcam.c */; }; - 223CA8B416D9268D00EF1BEC /* pixconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84116D9268D00EF1BEC /* pixconv.c */; }; - 223CA8B616D9268D00EF1BEC /* sizeconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84316D9268D00EF1BEC /* sizeconv.c */; }; - 223CA8B816D9268D00EF1BEC /* videodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84516D9268D00EF1BEC /* videodec.c */; }; - 223CA8B916D9268D00EF1BEC /* videoenc.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84616D9268D00EF1BEC /* videoenc.c */; }; - 223CA8BB16D9268D00EF1BEC /* vp8.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84816D9268D00EF1BEC /* vp8.c */; }; - 223CA8C116D9268D00EF1BEC /* audioconference.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84F16D9268D00EF1BEC /* audioconference.c */; }; - 223CA8C216D9268D00EF1BEC /* audiostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85016D9268D00EF1BEC /* audiostream.c */; }; - 223CA8C316D9268D00EF1BEC /* bitratecontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85116D9268D00EF1BEC /* bitratecontrol.c */; }; - 223CA8C416D9268D00EF1BEC /* bitratedriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85216D9268D00EF1BEC /* bitratedriver.c */; }; - 223CA8C516D9268D00EF1BEC /* ice.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85316D9268D00EF1BEC /* ice.c */; }; - 223CA8C616D9268D00EF1BEC /* layouts.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85416D9268D00EF1BEC /* layouts.c */; }; 223CA8C716D9268D00EF1BEC /* layouts.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85516D9268D00EF1BEC /* layouts.h */; }; - 223CA8C816D9268D00EF1BEC /* mediastream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85616D9268D00EF1BEC /* mediastream.c */; }; - 223CA8C916D9268D00EF1BEC /* msvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85716D9268D00EF1BEC /* msvideo.c */; }; - 223CA8CA16D9268D00EF1BEC /* msvideo_neon.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85816D9268D00EF1BEC /* msvideo_neon.c */; }; 223CA8CB16D9268D00EF1BEC /* msvideo_neon.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85916D9268D00EF1BEC /* msvideo_neon.h */; }; - 223CA8CC16D9268D00EF1BEC /* msvoip.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85A16D9268D00EF1BEC /* msvoip.c */; }; 223CA8CD16D9268D00EF1BEC /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85B16D9268D00EF1BEC /* nowebcam.h */; }; 223CA8CE16D9268D00EF1BEC /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85D16D9268D00EF1BEC /* private.h */; }; - 223CA8CF16D9268D00EF1BEC /* qosanalyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85E16D9268D00EF1BEC /* qosanalyzer.c */; }; - 223CA8D016D9268D00EF1BEC /* qualityindicator.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85F16D9268D00EF1BEC /* qualityindicator.c */; }; 223CA8D116D9268D00EF1BEC /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA86016D9268D00EF1BEC /* rfc2429.h */; }; - 223CA8D216D9268D00EF1BEC /* rfc3984.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86116D9268D00EF1BEC /* rfc3984.c */; }; - 223CA8D316D9268D00EF1BEC /* ringstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86216D9268D00EF1BEC /* ringstream.c */; }; - 223CA8D416D9268D00EF1BEC /* scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86316D9268D00EF1BEC /* scaler.c */; }; 223CA8D516D9268D00EF1BEC /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA86416D9268D00EF1BEC /* scaler.h */; }; - 223CA8D716D9268D00EF1BEC /* videostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86616D9268D00EF1BEC /* videostream.c */; }; 223CA8E316D9298F00EF1BEC /* sal_address_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8D916D9298F00EF1BEC /* sal_address_impl.c */; }; 223CA8E416D9298F00EF1BEC /* sal_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8DA16D9298F00EF1BEC /* sal_impl.c */; }; 223CA8E516D9298F00EF1BEC /* sal_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA8DB16D9298F00EF1BEC /* sal_impl.h */; }; @@ -245,7 +181,6 @@ 223CA92316DA10AB00EF1BEC /* lpconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74311F6CFB100621220 /* lpconfig.h */; }; 223CA92416DA10AB00EF1BEC /* offeranswer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74811F6CFB100621220 /* offeranswer.h */; }; 223CA92516DA10AB00EF1BEC /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75811F6CFB100621220 /* private.h */; }; - 223CA92616DA10AB00EF1BEC /* sal.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75B11F6CFB100621220 /* sal.h */; }; 223CA92716DA10AB00EF1BEC /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; }; 223CA92816DA10AB00EF1BEC /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B4F11F84E2D00373793 /* config.h */; }; 223CA92916DA10AB00EF1BEC /* gsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5011F84E2D00373793 /* gsm.h */; }; @@ -346,7 +281,6 @@ 225D646A1521BFA6008B2E81 /* lpconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74311F6CFB100621220 /* lpconfig.h */; }; 225D646B1521BFA6008B2E81 /* offeranswer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74811F6CFB100621220 /* offeranswer.h */; }; 225D646C1521BFA6008B2E81 /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75811F6CFB100621220 /* private.h */; }; - 225D646D1521BFA6008B2E81 /* sal.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75B11F6CFB100621220 /* sal.h */; }; 225D646F1521BFA6008B2E81 /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; }; 225D64701521BFA6008B2E81 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B4F11F84E2D00373793 /* config.h */; }; 225D64711521BFA6008B2E81 /* gsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5011F84E2D00373793 /* gsm.h */; }; @@ -356,11 +290,6 @@ 225D64751521BFA6008B2E81 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; 225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; 225D64811521BFA6008B2E81 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; - 225D64BC1521BFA6008B2E81 /* address.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA72F11F6CFB100621220 /* address.c */; }; - 225D64BD1521BFA6008B2E81 /* authentication.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA73011F6CFB100621220 /* authentication.c */; }; - 225D64BE1521BFA6008B2E81 /* callbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA73111F6CFB100621220 /* callbacks.c */; }; - 225D64BF1521BFA6008B2E81 /* chat.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA73211F6CFB100621220 /* chat.c */; }; - 225D64D31521BFA6008B2E81 /* filter-template.c in Sources */ = {isa = PBXBuildFile; fileRef = 2203127413A249F70049A2ED /* filter-template.c */; }; 225D64F21521BFA6008B2E81 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; 225D64F31521BFA6008B2E81 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; 225D64FC1521C009008B2E81 /* liblinphone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */; }; @@ -418,7 +347,6 @@ 225D65371521C009008B2E81 /* lpconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74311F6CFB100621220 /* lpconfig.h */; }; 225D65381521C009008B2E81 /* offeranswer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74811F6CFB100621220 /* offeranswer.h */; }; 225D65391521C009008B2E81 /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75811F6CFB100621220 /* private.h */; }; - 225D653A1521C009008B2E81 /* sal.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75B11F6CFB100621220 /* sal.h */; }; 225D653C1521C009008B2E81 /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; }; 225D653D1521C009008B2E81 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B4F11F84E2D00373793 /* config.h */; }; 225D653E1521C009008B2E81 /* gsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5011F84E2D00373793 /* gsm.h */; }; @@ -455,7 +383,7 @@ 225D65B91521C009008B2E81 /* ortp_srtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F23E145710540035B0D0 /* ortp_srtp.c */; }; 225D65BF1521C009008B2E81 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; 225D65C01521C009008B2E81 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; - 225D65CC1521C195008B2E81 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225D64F81521BFA6008B2E81 /* libmediastreamer.a */; }; + 225D65CC1521C195008B2E81 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225D64F81521BFA6008B2E81 /* libmediastreamer_base.a */; }; 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225D65C51521C009008B2E81 /* libortp.a */; }; 229A615313DEE8A500090183 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 229A615113DEE8A400090183 /* libx264.a */; }; 229A615413DEE8A500090183 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 229A615213DEE8A400090183 /* libmsx264.a */; }; @@ -467,16 +395,164 @@ 22A10B5911F84E2D00373793 /* proto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5311F84E2D00373793 /* proto.h */; }; 22A10B5A11F84E2D00373793 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; 22A10B5B11F84E2D00373793 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; - 22AF73BE1753E83700BE8398 /* msopus.c in Sources */ = {isa = PBXBuildFile; fileRef = 22AF73BD1753E83700BE8398 /* msopus.c */; }; 22AF73C01753F3E100BE8398 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73BF1753F3E100BE8398 /* libopus.a */; }; - 22D07CD016F3BC5F009F2C9E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 22D07CB416F3BC5F009F2C9E /* InfoPlist.strings */; }; - 22D07CD116F3BC5F009F2C9E /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22D07CB616F3BC5F009F2C9E /* MainWindow.xib */; }; - 22D07CD216F3BC5F009F2C9E /* mediastreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22D07CB816F3BC5F009F2C9E /* mediastreamViewController.xib */; }; - 22D07CD316F3BC5F009F2C9E /* mediastream-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 22D07CBA16F3BC5F009F2C9E /* mediastream-Info.plist */; }; - 22D07CD416F3BC5F009F2C9E /* mediastreamAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D07CBD16F3BC5F009F2C9E /* mediastreamAppDelegate.m */; }; - 22D07CD516F3BC5F009F2C9E /* mediastreamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D07CBF16F3BC5F009F2C9E /* mediastreamViewController.m */; }; - 22D07CD616F3BC5F009F2C9E /* mediastream.c in Sources */ = {isa = PBXBuildFile; fileRef = 22D07CC016F3BC5F009F2C9E /* mediastream.c */; }; - 22D07CE516F3BFCB009F2C9E /* speexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 22D07CE416F3BFCB009F2C9E /* speexec.c */; }; + 22C8D0441769F8FF00DAFB4E /* liblinphone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */; }; + 22C8D0451769F8FF00DAFB4E /* allfilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BE11F6CF7600621220 /* allfilters.h */; }; + 22C8D0461769F8FF00DAFB4E /* dsptools.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BF11F6CF7600621220 /* dsptools.h */; }; + 22C8D0471769F8FF00DAFB4E /* dtmfgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C011F6CF7600621220 /* dtmfgen.h */; }; + 22C8D0481769F8FF00DAFB4E /* ice.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C111F6CF7600621220 /* ice.h */; }; + 22C8D0491769F8FF00DAFB4E /* mediastream.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C411F6CF7600621220 /* mediastream.h */; }; + 22C8D04A1769F8FF00DAFB4E /* msaudiomixer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C511F6CF7600621220 /* msaudiomixer.h */; }; + 22C8D04B1769F8FF00DAFB4E /* mschanadapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C611F6CF7600621220 /* mschanadapter.h */; }; + 22C8D04C1769F8FF00DAFB4E /* mscommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C711F6CF7600621220 /* mscommon.h */; }; + 22C8D04D1769F8FF00DAFB4E /* msequalizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C811F6CF7600621220 /* msequalizer.h */; }; + 22C8D04E1769F8FF00DAFB4E /* mseventqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C911F6CF7600621220 /* mseventqueue.h */; }; + 22C8D04F1769F8FF00DAFB4E /* msextdisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CA11F6CF7600621220 /* msextdisplay.h */; }; + 22C8D0501769F8FF00DAFB4E /* msfileplayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CB11F6CF7600621220 /* msfileplayer.h */; }; + 22C8D0511769F8FF00DAFB4E /* msfilerec.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CC11F6CF7600621220 /* msfilerec.h */; }; + 22C8D0521769F8FF00DAFB4E /* msfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CD11F6CF7600621220 /* msfilter.h */; }; + 22C8D0531769F8FF00DAFB4E /* msinterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CE11F6CF7600621220 /* msinterfaces.h */; }; + 22C8D0541769F8FF00DAFB4E /* msitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CF11F6CF7600621220 /* msitc.h */; }; + 22C8D0551769F8FF00DAFB4E /* msqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D011F6CF7600621220 /* msqueue.h */; }; + 22C8D0561769F8FF00DAFB4E /* msrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D111F6CF7600621220 /* msrtp.h */; }; + 22C8D0571769F8FF00DAFB4E /* mssndcard.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D211F6CF7600621220 /* mssndcard.h */; }; + 22C8D0581769F8FF00DAFB4E /* mstee.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D311F6CF7600621220 /* mstee.h */; }; + 22C8D0591769F8FF00DAFB4E /* msticker.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D411F6CF7600621220 /* msticker.h */; }; + 22C8D05A1769F8FF00DAFB4E /* msv4l.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D511F6CF7600621220 /* msv4l.h */; }; + 22C8D05B1769F8FF00DAFB4E /* msvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D611F6CF7600621220 /* msvideo.h */; }; + 22C8D05C1769F8FF00DAFB4E /* msvideoout.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D711F6CF7600621220 /* msvideoout.h */; }; + 22C8D05D1769F8FF00DAFB4E /* msvolume.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D811F6CF7600621220 /* msvolume.h */; }; + 22C8D05E1769F8FF00DAFB4E /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; + 22C8D05F1769F8FF00DAFB4E /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; + 22C8D0601769F8FF00DAFB4E /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; + 22C8D0611769F8FF00DAFB4E /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; + 22C8D0621769F8FF00DAFB4E /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; + 22C8D0631769F8FF00DAFB4E /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; + 22C8D0641769F8FF00DAFB4E /* payloadtype.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AA11F6CF9F00621220 /* payloadtype.h */; }; + 22C8D0651769F8FF00DAFB4E /* port.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AB11F6CF9F00621220 /* port.h */; }; + 22C8D0661769F8FF00DAFB4E /* rtcp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AC11F6CF9F00621220 /* rtcp.h */; }; + 22C8D0671769F8FF00DAFB4E /* rtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AD11F6CF9F00621220 /* rtp.h */; }; + 22C8D0681769F8FF00DAFB4E /* rtpsession.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AE11F6CF9F00621220 /* rtpsession.h */; }; + 22C8D0691769F8FF00DAFB4E /* rtpsignaltable.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AF11F6CF9F00621220 /* rtpsignaltable.h */; }; + 22C8D06A1769F8FF00DAFB4E /* sessionset.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B011F6CF9F00621220 /* sessionset.h */; }; + 22C8D06B1769F8FF00DAFB4E /* srtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B111F6CF9F00621220 /* srtp.h */; }; + 22C8D06C1769F8FF00DAFB4E /* str_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B211F6CF9F00621220 /* str_utils.h */; }; + 22C8D06D1769F8FF00DAFB4E /* stun.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B311F6CF9F00621220 /* stun.h */; }; + 22C8D06E1769F8FF00DAFB4E /* stun_udp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B411F6CF9F00621220 /* stun_udp.h */; }; + 22C8D06F1769F8FF00DAFB4E /* telephonyevents.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B511F6CF9F00621220 /* telephonyevents.h */; }; + 22C8D0701769F8FF00DAFB4E /* jitterctl.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6BD11F6CF9F00621220 /* jitterctl.h */; }; + 22C8D0711769F8FF00DAFB4E /* ortp-config-win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6C111F6CF9F00621220 /* ortp-config-win32.h */; }; + 22C8D0721769F8FF00DAFB4E /* rtpsession_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6CB11F6CF9F00621220 /* rtpsession_priv.h */; }; + 22C8D0731769F8FF00DAFB4E /* rtptimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6CE11F6CF9F00621220 /* rtptimer.h */; }; + 22C8D0741769F8FF00DAFB4E /* scheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6D011F6CF9F00621220 /* scheduler.h */; }; + 22C8D0751769F8FF00DAFB4E /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6F311F6CF9F00621220 /* utils.h */; }; + 22C8D0761769F8FF00DAFB4E /* enum.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA73411F6CFB100621220 /* enum.h */; }; + 22C8D0771769F8FF00DAFB4E /* linphonecore.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74011F6CFB100621220 /* linphonecore.h */; }; + 22C8D0781769F8FF00DAFB4E /* lpconfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74311F6CFB100621220 /* lpconfig.h */; }; + 22C8D0791769F8FF00DAFB4E /* offeranswer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74811F6CFB100621220 /* offeranswer.h */; }; + 22C8D07A1769F8FF00DAFB4E /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75811F6CFB100621220 /* private.h */; }; + 22C8D07C1769F8FF00DAFB4E /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; }; + 22C8D07D1769F8FF00DAFB4E /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B4F11F84E2D00373793 /* config.h */; }; + 22C8D07E1769F8FF00DAFB4E /* gsm.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5011F84E2D00373793 /* gsm.h */; }; + 22C8D07F1769F8FF00DAFB4E /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5211F84E2D00373793 /* private.h */; }; + 22C8D0801769F8FF00DAFB4E /* proto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5311F84E2D00373793 /* proto.h */; }; + 22C8D0811769F8FF00DAFB4E /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; + 22C8D0821769F8FF00DAFB4E /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; + 22C8D0831769F8FF00DAFB4E /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; + 22C8D0841769F8FF00DAFB4E /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; + 22C8D0851769F8FF00DAFB4E /* basedescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EDC160065C200B92522 /* basedescs.h */; }; + 22C8D0861769F8FF00DAFB4E /* voipdescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EE1160066C700B92522 /* voipdescs.h */; }; + 22C8D0871769F8FF00DAFB4E /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA80B16D9268D00EF1BEC /* waveheader.h */; }; + 22C8D0881769F8FF00DAFB4E /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82116D9268D00EF1BEC /* _kiss_fft_guts.h */; }; + 22C8D0891769F8FF00DAFB4E /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82316D9268D00EF1BEC /* ffmpeg-priv.h */; }; + 22C8D08A1769F8FF00DAFB4E /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82416D9268D00EF1BEC /* g711common.h */; }; + 22C8D08B1769F8FF00DAFB4E /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82516D9268D00EF1BEC /* g722.h */; }; + 22C8D08C1769F8FF00DAFB4E /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82916D9268D00EF1BEC /* kiss_fft.h */; }; + 22C8D08D1769F8FF00DAFB4E /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82B16D9268D00EF1BEC /* kiss_fftr.h */; }; + 22C8D08E1769F8FF00DAFB4E /* opengles_display.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA82E16D9268D00EF1BEC /* opengles_display.h */; }; + 22C8D08F1769F8FF00DAFB4E /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA83016D9268D00EF1BEC /* shaders.h */; }; + 22C8D0901769F8FF00DAFB4E /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA83116D9268D00EF1BEC /* swscale.h */; }; + 22C8D0911769F8FF00DAFB4E /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA83216D9268D00EF1BEC /* vfw-missing.h */; }; + 22C8D0921769F8FF00DAFB4E /* layouts.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85516D9268D00EF1BEC /* layouts.h */; }; + 22C8D0931769F8FF00DAFB4E /* msvideo_neon.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85916D9268D00EF1BEC /* msvideo_neon.h */; }; + 22C8D0941769F8FF00DAFB4E /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85B16D9268D00EF1BEC /* nowebcam.h */; }; + 22C8D0951769F8FF00DAFB4E /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA85D16D9268D00EF1BEC /* private.h */; }; + 22C8D0961769F8FF00DAFB4E /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA86016D9268D00EF1BEC /* rfc2429.h */; }; + 22C8D0971769F8FF00DAFB4E /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 223CA86416D9268D00EF1BEC /* scaler.h */; }; + 22C8D0991769F8FF00DAFB4E /* filter-template.c in Sources */ = {isa = PBXBuildFile; fileRef = 2203127413A249F70049A2ED /* filter-template.c */; }; + 22C8D09A1769F8FF00DAFB4E /* yuv2rgb.fs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6A153584410025E54D /* yuv2rgb.fs */; }; + 22C8D09B1769F8FF00DAFB4E /* yuv2rgb.vs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6B153584410025E54D /* yuv2rgb.vs */; }; + 22C8D09C1769F8FF00DAFB4E /* alaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F016D9268D00EF1BEC /* alaw.c */; }; + 22C8D09D1769F8FF00DAFB4E /* aqsnd.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F216D9268D00EF1BEC /* aqsnd.c */; }; + 22C8D09E1769F8FF00DAFB4E /* audiomixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F416D9268D00EF1BEC /* audiomixer.c */; }; + 22C8D09F1769F8FF00DAFB4E /* chanadapt.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F516D9268D00EF1BEC /* chanadapt.c */; }; + 22C8D0A01769F8FF00DAFB4E /* dtmfgen.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F616D9268D00EF1BEC /* dtmfgen.c */; }; + 22C8D0A11769F8FF00DAFB4E /* equalizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F716D9268D00EF1BEC /* equalizer.c */; }; + 22C8D0A21769F8FF00DAFB4E /* genericplc.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7F916D9268D00EF1BEC /* genericplc.c */; }; + 22C8D0A31769F8FF00DAFB4E /* gsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FA16D9268D00EF1BEC /* gsm.c */; }; + 22C8D0A41769F8FF00DAFB4E /* l16.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FB16D9268D00EF1BEC /* l16.c */; }; + 22C8D0A51769F8FF00DAFB4E /* msconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FD16D9268D00EF1BEC /* msconf.c */; }; + 22C8D0A61769F8FF00DAFB4E /* msfileplayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FE16D9268D00EF1BEC /* msfileplayer.c */; }; + 22C8D0A71769F8FF00DAFB4E /* msfilerec.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA7FF16D9268D00EF1BEC /* msfilerec.c */; }; + 22C8D0A81769F8FF00DAFB4E /* msg722.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80016D9268D00EF1BEC /* msg722.c */; }; + 22C8D0A91769F8FF00DAFB4E /* msiounit.m in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80116D9268D00EF1BEC /* msiounit.m */; }; + 22C8D0AA1769F8FF00DAFB4E /* msresample.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80216D9268D00EF1BEC /* msresample.c */; }; + 22C8D0AB1769F8FF00DAFB4E /* msspeex.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80316D9268D00EF1BEC /* msspeex.c */; }; + 22C8D0AC1769F8FF00DAFB4E /* msvolume.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80416D9268D00EF1BEC /* msvolume.c */; }; + 22C8D0AD1769F8FF00DAFB4E /* tonedetector.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80916D9268D00EF1BEC /* tonedetector.c */; }; + 22C8D0AE1769F8FF00DAFB4E /* ulaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA80A16D9268D00EF1BEC /* ulaw.c */; }; + 22C8D0B71769F8FF00DAFB4E /* itc.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81B16D9268D00EF1BEC /* itc.c */; }; + 22C8D0B81769F8FF00DAFB4E /* join.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81C16D9268D00EF1BEC /* join.c */; }; + 22C8D0B91769F8FF00DAFB4E /* msrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81D16D9268D00EF1BEC /* msrtp.c */; }; + 22C8D0BA1769F8FF00DAFB4E /* tee.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81E16D9268D00EF1BEC /* tee.c */; }; + 22C8D0BB1769F8FF00DAFB4E /* void.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81F16D9268D00EF1BEC /* void.c */; }; + 22C8D0BC1769F8FF00DAFB4E /* dsptools.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82216D9268D00EF1BEC /* dsptools.c */; }; + 22C8D0BD1769F8FF00DAFB4E /* g722_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82616D9268D00EF1BEC /* g722_decode.c */; }; + 22C8D0BE1769F8FF00DAFB4E /* g722_encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82716D9268D00EF1BEC /* g722_encode.c */; }; + 22C8D0BF1769F8FF00DAFB4E /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82816D9268D00EF1BEC /* kiss_fft.c */; }; + 22C8D0C01769F8FF00DAFB4E /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82A16D9268D00EF1BEC /* kiss_fftr.c */; }; + 22C8D0C11769F8FF00DAFB4E /* opengles_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82D16D9268D00EF1BEC /* opengles_display.c */; }; + 22C8D0C21769F8FF00DAFB4E /* shaders.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA82F16D9268D00EF1BEC /* shaders.c */; }; + 22C8D0C31769F8FF00DAFB4E /* extdisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83516D9268D00EF1BEC /* extdisplay.c */; }; + 22C8D0C41769F8FF00DAFB4E /* h264dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83716D9268D00EF1BEC /* h264dec.c */; }; + 22C8D0C51769F8FF00DAFB4E /* ioscapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83816D9268D00EF1BEC /* ioscapture.m */; }; + 22C8D0C61769F8FF00DAFB4E /* iosdisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83916D9268D00EF1BEC /* iosdisplay.m */; }; + 22C8D0C71769F8FF00DAFB4E /* jpegwriter.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83A16D9268D00EF1BEC /* jpegwriter.c */; }; + 22C8D0C81769F8FF00DAFB4E /* mire.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA83B16D9268D00EF1BEC /* mire.c */; }; + 22C8D0C91769F8FF00DAFB4E /* nowebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84016D9268D00EF1BEC /* nowebcam.c */; }; + 22C8D0CA1769F8FF00DAFB4E /* pixconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84116D9268D00EF1BEC /* pixconv.c */; }; + 22C8D0CB1769F8FF00DAFB4E /* sizeconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84316D9268D00EF1BEC /* sizeconv.c */; }; + 22C8D0CC1769F8FF00DAFB4E /* videodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84516D9268D00EF1BEC /* videodec.c */; }; + 22C8D0CD1769F8FF00DAFB4E /* videoenc.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84616D9268D00EF1BEC /* videoenc.c */; }; + 22C8D0CE1769F8FF00DAFB4E /* vp8.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84816D9268D00EF1BEC /* vp8.c */; }; + 22C8D0CF1769F8FF00DAFB4E /* audioconference.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA84F16D9268D00EF1BEC /* audioconference.c */; }; + 22C8D0D01769F8FF00DAFB4E /* audiostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85016D9268D00EF1BEC /* audiostream.c */; }; + 22C8D0D11769F8FF00DAFB4E /* bitratecontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85116D9268D00EF1BEC /* bitratecontrol.c */; }; + 22C8D0D21769F8FF00DAFB4E /* bitratedriver.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85216D9268D00EF1BEC /* bitratedriver.c */; }; + 22C8D0D31769F8FF00DAFB4E /* ice.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85316D9268D00EF1BEC /* ice.c */; }; + 22C8D0D41769F8FF00DAFB4E /* layouts.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85416D9268D00EF1BEC /* layouts.c */; }; + 22C8D0D51769F8FF00DAFB4E /* mediastream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85616D9268D00EF1BEC /* mediastream.c */; }; + 22C8D0D61769F8FF00DAFB4E /* msvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85716D9268D00EF1BEC /* msvideo.c */; }; + 22C8D0D71769F8FF00DAFB4E /* msvideo_neon.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85816D9268D00EF1BEC /* msvideo_neon.c */; }; + 22C8D0D81769F8FF00DAFB4E /* msvoip.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85A16D9268D00EF1BEC /* msvoip.c */; }; + 22C8D0D91769F8FF00DAFB4E /* qosanalyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85E16D9268D00EF1BEC /* qosanalyzer.c */; }; + 22C8D0DA1769F8FF00DAFB4E /* qualityindicator.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA85F16D9268D00EF1BEC /* qualityindicator.c */; }; + 22C8D0DB1769F8FF00DAFB4E /* rfc3984.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86116D9268D00EF1BEC /* rfc3984.c */; }; + 22C8D0DC1769F8FF00DAFB4E /* ringstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86216D9268D00EF1BEC /* ringstream.c */; }; + 22C8D0DD1769F8FF00DAFB4E /* scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86316D9268D00EF1BEC /* scaler.c */; }; + 22C8D0DE1769F8FF00DAFB4E /* videostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA86616D9268D00EF1BEC /* videostream.c */; }; + 22C8D0DF1769F8FF00DAFB4E /* speexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 22D07CE416F3BFCB009F2C9E /* speexec.c */; }; + 22C8D0E01769F8FF00DAFB4E /* msopus.c in Sources */ = {isa = PBXBuildFile; fileRef = 22AF73BD1753E83700BE8398 /* msopus.c */; }; + 22C8D0E21769F8FF00DAFB4E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; + 22C8D0E31769F8FF00DAFB4E /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; + 22C8D0ED176A079600DAFB4E /* aac-eld.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0EC176A079600DAFB4E /* aac-eld.c */; }; + 22C8D0EF176A080100DAFB4E /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0EE176A080100DAFB4E /* event.c */; }; + 22C8D0F3176A082600DAFB4E /* sal_op_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0F0176A082600DAFB4E /* sal_op_events.c */; }; + 22C8D0F4176A082600DAFB4E /* sal_op_info.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0F1176A082600DAFB4E /* sal_op_info.c */; }; + 22C8D0F5176A082600DAFB4E /* sal_op_publish.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0F2176A082600DAFB4E /* sal_op_publish.c */; }; + 22C8D0F7176A08CA00DAFB4E /* info.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0F6176A08CA00DAFB4E /* info.c */; }; + 22C8D0F9176A08F700DAFB4E /* message_storage.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0F8176A08F700DAFB4E /* message_storage.c */; }; + 22C8D0FE176A093B00DAFB4E /* linphone_tunnel_stubs.c in Sources */ = {isa = PBXBuildFile; fileRef = 22C8D0FB176A093B00DAFB4E /* linphone_tunnel_stubs.c */; }; 22DD19C113A8D7FA0018ECD4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C013A8D7FA0018ECD4 /* UIKit.framework */; }; 22DD19C213A8D7FA0018ECD4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; 22DD19C413A8D7FA0018ECD4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */; }; @@ -506,6 +582,17 @@ ); script = "cd ${INPUT_FILE_DIR}\nxxd -i ${INPUT_FILE_NAME} | sed s/}\\;/,0x00}\\;/ > ${INPUT_FILE_PATH}.h"; }; + 22C8D0E41769F8FF00DAFB4E /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + filePatterns = "*.vs *.fs"; + fileType = pattern.proxy; + isEditable = 1; + outputFiles = ( + "${INPUT_FILE_PATH}.h", + ); + script = "cd ${INPUT_FILE_DIR}\nxxd -i ${INPUT_FILE_NAME} | sed s/}\\;/,0x00}\\;/ > ${INPUT_FILE_PATH}.h"; + }; /* End PBXBuildRule section */ /* Begin PBXContainerItemProxy section */ @@ -530,6 +617,20 @@ remoteGlobalIDString = 225D642D1521BFA6008B2E81; remoteInfo = libmediastreamer; }; + 22C8D0421769F8FF00DAFB4E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 225D64FA1521C009008B2E81; + remoteInfo = libortp; + }; + 22C8D0EA1769F95700DAFB4E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 22C8D0401769F8FF00DAFB4E; + remoteInfo = libmediastreamer_voip; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -665,7 +766,6 @@ 222CA75811F6CFB100621220 /* private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = private.h; sourceTree = ""; }; 222CA75911F6CFB100621220 /* proxy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = proxy.c; sourceTree = ""; }; 222CA75A11F6CFB100621220 /* sal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal.c; sourceTree = ""; }; - 222CA75B11F6CFB100621220 /* sal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sal.h; sourceTree = ""; }; 222CA76211F6CFB100621220 /* siplogin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = siplogin.c; sourceTree = ""; }; 222CA76311F6CFB100621220 /* sipsetup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sipsetup.c; sourceTree = ""; }; 222CA76411F6CFB100621220 /* sipsetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sipsetup.h; sourceTree = ""; }; @@ -774,7 +874,7 @@ 2258C44313A945520087A596 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; }; 2258C44413A945520087A596 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; }; 225D3559124B1FF60008581C /* linphonecall.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linphonecall.c; sourceTree = ""; }; - 225D64F81521BFA6008B2E81 /* libmediastreamer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmediastreamer.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 225D64F81521BFA6008B2E81 /* libmediastreamer_base.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmediastreamer_base.a; sourceTree = BUILT_PRODUCTS_DIR; }; 225D65C51521C009008B2E81 /* libortp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libortp.a; sourceTree = BUILT_PRODUCTS_DIR; }; 229A615113DEE8A400090183 /* libx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx264.a; path = "../liblinphone-sdk/apple-darwin/lib/libx264.a"; sourceTree = ""; }; 229A615213DEE8A400090183 /* libmsx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsx264.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsx264.a"; sourceTree = ""; }; @@ -789,16 +889,15 @@ 22A10B5511F84E2D00373793 /* unproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unproto.h; sourceTree = ""; }; 22AF73BD1753E83700BE8398 /* msopus.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msopus.c; sourceTree = ""; }; 22AF73BF1753F3E100BE8398 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = "../liblinphone-sdk/apple-darwin/lib/libopus.a"; sourceTree = ""; }; - 22D07CB516F3BC5F009F2C9E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 22D07CB716F3BC5F009F2C9E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = ""; }; - 22D07CB916F3BC5F009F2C9E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/mediastreamViewController.xib; sourceTree = ""; }; - 22D07CBA16F3BC5F009F2C9E /* mediastream-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "mediastream-Info.plist"; sourceTree = ""; }; - 22D07CBB16F3BC5F009F2C9E /* mediastream-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mediastream-Prefix.pch"; sourceTree = ""; }; - 22D07CBC16F3BC5F009F2C9E /* mediastreamAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamAppDelegate.h; sourceTree = ""; }; - 22D07CBD16F3BC5F009F2C9E /* mediastreamAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamAppDelegate.m; sourceTree = ""; }; - 22D07CBE16F3BC5F009F2C9E /* mediastreamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamViewController.h; sourceTree = ""; }; - 22D07CBF16F3BC5F009F2C9E /* mediastreamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamViewController.m; sourceTree = ""; }; - 22D07CC016F3BC5F009F2C9E /* mediastream.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = mediastream.c; sourceTree = ""; }; + 22C8D0E91769F8FF00DAFB4E /* libmediastreamer_voip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmediastreamer_voip.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 22C8D0EC176A079600DAFB4E /* aac-eld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "aac-eld.c"; sourceTree = ""; }; + 22C8D0EE176A080100DAFB4E /* event.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = event.c; sourceTree = ""; }; + 22C8D0F0176A082600DAFB4E /* sal_op_events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_events.c; sourceTree = ""; }; + 22C8D0F1176A082600DAFB4E /* sal_op_info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_info.c; sourceTree = ""; }; + 22C8D0F2176A082600DAFB4E /* sal_op_publish.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_publish.c; sourceTree = ""; }; + 22C8D0F6176A08CA00DAFB4E /* info.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = info.c; sourceTree = ""; }; + 22C8D0F8176A08F700DAFB4E /* message_storage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = message_storage.c; sourceTree = ""; }; + 22C8D0FB176A093B00DAFB4E /* linphone_tunnel_stubs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linphone_tunnel_stubs.c; sourceTree = ""; }; 22D07CE416F3BFCB009F2C9E /* speexec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speexec.c; sourceTree = ""; }; 22DD19BE13A8D7FA0018ECD4 /* mediastream.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = mediastream.app; sourceTree = BUILT_PRODUCTS_DIR; }; 22DD19C013A8D7FA0018ECD4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -853,13 +952,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 22C8D0E11769F8FF00DAFB4E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 22C8D0E21769F8FF00DAFB4E /* Foundation.framework in Frameworks */, + 22C8D0E31769F8FF00DAFB4E /* libSKP_SILK_SDK.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 22DD19BB13A8D7FA0018ECD4 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( 22AF73C01753F3E100BE8398 /* libopus.a in Frameworks */, 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */, - 225D65CC1521C195008B2E81 /* libmediastreamer.a in Frameworks */, + 225D65CC1521C195008B2E81 /* libmediastreamer_base.a in Frameworks */, 2211DB9F14765CED00DEE054 /* libmssilk.a in Frameworks */, 7066FC0A13E830B800EFC6DC /* libvpx.a in Frameworks */, 70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */, @@ -901,9 +1009,10 @@ isa = PBXGroup; children = ( 22DD19BE13A8D7FA0018ECD4 /* mediastream.app */, - 225D64F81521BFA6008B2E81 /* libmediastreamer.a */, + 225D64F81521BFA6008B2E81 /* libmediastreamer_base.a */, 225D65C51521C009008B2E81 /* libortp.a */, 223CA95316DA10AB00EF1BEC /* liblibortp copy.a */, + 22C8D0E91769F8FF00DAFB4E /* libmediastreamer_voip.a */, ); name = Products; sourceTree = ""; @@ -1149,6 +1258,10 @@ 222CA72D11F6CFB100621220 /* coreapi */ = { isa = PBXGroup; children = ( + 22C8D0FB176A093B00DAFB4E /* linphone_tunnel_stubs.c */, + 22C8D0F8176A08F700DAFB4E /* message_storage.c */, + 22C8D0F6176A08CA00DAFB4E /* info.c */, + 22C8D0EE176A080100DAFB4E /* event.c */, 223CA8D816D9298F00EF1BEC /* bellesip_sal */, 229ECDEC143AEBDA00D611B8 /* conference.c */, 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */, @@ -1175,7 +1288,6 @@ 222CA75811F6CFB100621220 /* private.h */, 222CA75911F6CFB100621220 /* proxy.c */, 222CA75A11F6CFB100621220 /* sal.c */, - 222CA75B11F6CFB100621220 /* sal.h */, 222CA76211F6CFB100621220 /* siplogin.c */, 222CA76311F6CFB100621220 /* sipsetup.c */, 222CA76411F6CFB100621220 /* sipsetup.h */, @@ -1196,8 +1308,8 @@ 223CA7EF16D9268D00EF1BEC /* audiofilters */ = { isa = PBXGroup; children = ( + 22C8D0EC176A079600DAFB4E /* aac-eld.c */, 22AF73BD1753E83700BE8398 /* msopus.c */, - 0406A7651721FF79009FD24F /* aac-eld.c */, 22D07CE416F3BFCB009F2C9E /* speexec.c */, 223CA7F016D9268D00EF1BEC /* alaw.c */, 223CA7F216D9268D00EF1BEC /* aqsnd.c */, @@ -1326,6 +1438,9 @@ 223CA8D816D9298F00EF1BEC /* bellesip_sal */ = { isa = PBXGroup; children = ( + 22C8D0F0176A082600DAFB4E /* sal_op_events.c */, + 22C8D0F1176A082600DAFB4E /* sal_op_info.c */, + 22C8D0F2176A082600DAFB4E /* sal_op_publish.c */, 223CA8D916D9298F00EF1BEC /* sal_address_impl.c */, 223CA8DA16D9298F00EF1BEC /* sal_impl.c */, 223CA8DB16D9298F00EF1BEC /* sal_impl.h */, @@ -1466,7 +1581,6 @@ 223CA92316DA10AB00EF1BEC /* lpconfig.h in Headers */, 223CA92416DA10AB00EF1BEC /* offeranswer.h in Headers */, 223CA92516DA10AB00EF1BEC /* private.h in Headers */, - 223CA92616DA10AB00EF1BEC /* sal.h in Headers */, 223CA92716DA10AB00EF1BEC /* sipsetup.h in Headers */, 223CA92816DA10AB00EF1BEC /* config.h in Headers */, 223CA92916DA10AB00EF1BEC /* gsm.h in Headers */, @@ -1538,7 +1652,6 @@ 225D646A1521BFA6008B2E81 /* lpconfig.h in Headers */, 225D646B1521BFA6008B2E81 /* offeranswer.h in Headers */, 225D646C1521BFA6008B2E81 /* private.h in Headers */, - 225D646D1521BFA6008B2E81 /* sal.h in Headers */, 225D646F1521BFA6008B2E81 /* sipsetup.h in Headers */, 225D64701521BFA6008B2E81 /* config.h in Headers */, 225D64711521BFA6008B2E81 /* gsm.h in Headers */, @@ -1629,7 +1742,6 @@ 225D65371521C009008B2E81 /* lpconfig.h in Headers */, 225D65381521C009008B2E81 /* offeranswer.h in Headers */, 225D65391521C009008B2E81 /* private.h in Headers */, - 225D653A1521C009008B2E81 /* sal.h in Headers */, 225D653C1521C009008B2E81 /* sipsetup.h in Headers */, 225D653D1521C009008B2E81 /* config.h in Headers */, 225D653E1521C009008B2E81 /* gsm.h in Headers */, @@ -1642,6 +1754,96 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 22C8D0431769F8FF00DAFB4E /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 22C8D0441769F8FF00DAFB4E /* liblinphone_Prefix.pch in Headers */, + 22C8D0451769F8FF00DAFB4E /* allfilters.h in Headers */, + 22C8D0461769F8FF00DAFB4E /* dsptools.h in Headers */, + 22C8D0471769F8FF00DAFB4E /* dtmfgen.h in Headers */, + 22C8D0481769F8FF00DAFB4E /* ice.h in Headers */, + 22C8D0491769F8FF00DAFB4E /* mediastream.h in Headers */, + 22C8D04A1769F8FF00DAFB4E /* msaudiomixer.h in Headers */, + 22C8D04B1769F8FF00DAFB4E /* mschanadapter.h in Headers */, + 22C8D04C1769F8FF00DAFB4E /* mscommon.h in Headers */, + 22C8D04D1769F8FF00DAFB4E /* msequalizer.h in Headers */, + 22C8D04E1769F8FF00DAFB4E /* mseventqueue.h in Headers */, + 22C8D04F1769F8FF00DAFB4E /* msextdisplay.h in Headers */, + 22C8D0501769F8FF00DAFB4E /* msfileplayer.h in Headers */, + 22C8D0511769F8FF00DAFB4E /* msfilerec.h in Headers */, + 22C8D0521769F8FF00DAFB4E /* msfilter.h in Headers */, + 22C8D0531769F8FF00DAFB4E /* msinterfaces.h in Headers */, + 22C8D0541769F8FF00DAFB4E /* msitc.h in Headers */, + 22C8D0551769F8FF00DAFB4E /* msqueue.h in Headers */, + 22C8D0561769F8FF00DAFB4E /* msrtp.h in Headers */, + 22C8D0571769F8FF00DAFB4E /* mssndcard.h in Headers */, + 22C8D0581769F8FF00DAFB4E /* mstee.h in Headers */, + 22C8D0591769F8FF00DAFB4E /* msticker.h in Headers */, + 22C8D05A1769F8FF00DAFB4E /* msv4l.h in Headers */, + 22C8D05B1769F8FF00DAFB4E /* msvideo.h in Headers */, + 22C8D05C1769F8FF00DAFB4E /* msvideoout.h in Headers */, + 22C8D05D1769F8FF00DAFB4E /* msvolume.h in Headers */, + 22C8D05E1769F8FF00DAFB4E /* mswebcam.h in Headers */, + 22C8D05F1769F8FF00DAFB4E /* rfc3984.h in Headers */, + 22C8D0601769F8FF00DAFB4E /* waveheader.h in Headers */, + 22C8D0611769F8FF00DAFB4E /* b64.h in Headers */, + 22C8D0621769F8FF00DAFB4E /* event.h in Headers */, + 22C8D0631769F8FF00DAFB4E /* ortp.h in Headers */, + 22C8D0641769F8FF00DAFB4E /* payloadtype.h in Headers */, + 22C8D0651769F8FF00DAFB4E /* port.h in Headers */, + 22C8D0661769F8FF00DAFB4E /* rtcp.h in Headers */, + 22C8D0671769F8FF00DAFB4E /* rtp.h in Headers */, + 22C8D0681769F8FF00DAFB4E /* rtpsession.h in Headers */, + 22C8D0691769F8FF00DAFB4E /* rtpsignaltable.h in Headers */, + 22C8D06A1769F8FF00DAFB4E /* sessionset.h in Headers */, + 22C8D06B1769F8FF00DAFB4E /* srtp.h in Headers */, + 22C8D06C1769F8FF00DAFB4E /* str_utils.h in Headers */, + 22C8D06D1769F8FF00DAFB4E /* stun.h in Headers */, + 22C8D06E1769F8FF00DAFB4E /* stun_udp.h in Headers */, + 22C8D06F1769F8FF00DAFB4E /* telephonyevents.h in Headers */, + 22C8D0701769F8FF00DAFB4E /* jitterctl.h in Headers */, + 22C8D0711769F8FF00DAFB4E /* ortp-config-win32.h in Headers */, + 22C8D0721769F8FF00DAFB4E /* rtpsession_priv.h in Headers */, + 22C8D0731769F8FF00DAFB4E /* rtptimer.h in Headers */, + 22C8D0741769F8FF00DAFB4E /* scheduler.h in Headers */, + 22C8D0751769F8FF00DAFB4E /* utils.h in Headers */, + 22C8D0761769F8FF00DAFB4E /* enum.h in Headers */, + 22C8D0771769F8FF00DAFB4E /* linphonecore.h in Headers */, + 22C8D0781769F8FF00DAFB4E /* lpconfig.h in Headers */, + 22C8D0791769F8FF00DAFB4E /* offeranswer.h in Headers */, + 22C8D07A1769F8FF00DAFB4E /* private.h in Headers */, + 22C8D07C1769F8FF00DAFB4E /* sipsetup.h in Headers */, + 22C8D07D1769F8FF00DAFB4E /* config.h in Headers */, + 22C8D07E1769F8FF00DAFB4E /* gsm.h in Headers */, + 22C8D07F1769F8FF00DAFB4E /* private.h in Headers */, + 22C8D0801769F8FF00DAFB4E /* proto.h in Headers */, + 22C8D0811769F8FF00DAFB4E /* toast.h in Headers */, + 22C8D0821769F8FF00DAFB4E /* unproto.h in Headers */, + 22C8D0831769F8FF00DAFB4E /* linphonecore_utils.h in Headers */, + 22C8D0841769F8FF00DAFB4E /* zrtp.h in Headers */, + 22C8D0851769F8FF00DAFB4E /* basedescs.h in Headers */, + 22C8D0861769F8FF00DAFB4E /* voipdescs.h in Headers */, + 22C8D0871769F8FF00DAFB4E /* waveheader.h in Headers */, + 22C8D0881769F8FF00DAFB4E /* _kiss_fft_guts.h in Headers */, + 22C8D0891769F8FF00DAFB4E /* ffmpeg-priv.h in Headers */, + 22C8D08A1769F8FF00DAFB4E /* g711common.h in Headers */, + 22C8D08B1769F8FF00DAFB4E /* g722.h in Headers */, + 22C8D08C1769F8FF00DAFB4E /* kiss_fft.h in Headers */, + 22C8D08D1769F8FF00DAFB4E /* kiss_fftr.h in Headers */, + 22C8D08E1769F8FF00DAFB4E /* opengles_display.h in Headers */, + 22C8D08F1769F8FF00DAFB4E /* shaders.h in Headers */, + 22C8D0901769F8FF00DAFB4E /* swscale.h in Headers */, + 22C8D0911769F8FF00DAFB4E /* vfw-missing.h in Headers */, + 22C8D0921769F8FF00DAFB4E /* layouts.h in Headers */, + 22C8D0931769F8FF00DAFB4E /* msvideo_neon.h in Headers */, + 22C8D0941769F8FF00DAFB4E /* nowebcam.h in Headers */, + 22C8D0951769F8FF00DAFB4E /* private.h in Headers */, + 22C8D0961769F8FF00DAFB4E /* rfc2429.h in Headers */, + 22C8D0971769F8FF00DAFB4E /* scaler.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; D2AAC07A0554694100DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1701,7 +1903,6 @@ 222CA77411F6CFB100621220 /* lpconfig.h in Headers */, 222CA77711F6CFB100621220 /* offeranswer.h in Headers */, 222CA77A11F6CFB100621220 /* private.h in Headers */, - 222CA77D11F6CFB100621220 /* sal.h in Headers */, 222CA78611F6CFB100621220 /* sipsetup.h in Headers */, 22A10B5611F84E2D00373793 /* config.h in Headers */, 22A10B5711F84E2D00373793 /* gsm.h in Headers */, @@ -1735,9 +1936,9 @@ productReference = 223CA95316DA10AB00EF1BEC /* liblibortp copy.a */; productType = "com.apple.product-type.library.static"; }; - 225D642D1521BFA6008B2E81 /* libmediastreamer */ = { + 225D642D1521BFA6008B2E81 /* libmediastreamer_base */ = { isa = PBXNativeTarget; - buildConfigurationList = 225D64F41521BFA6008B2E81 /* Build configuration list for PBXNativeTarget "libmediastreamer" */; + buildConfigurationList = 225D64F41521BFA6008B2E81 /* Build configuration list for PBXNativeTarget "libmediastreamer_base" */; buildPhases = ( 225D642E1521BFA6008B2E81 /* Headers */, 225D64821521BFA6008B2E81 /* Sources */, @@ -1749,9 +1950,9 @@ dependencies = ( 225D65C71521C09D008B2E81 /* PBXTargetDependency */, ); - name = libmediastreamer; + name = libmediastreamer_base; productName = liblinphone; - productReference = 225D64F81521BFA6008B2E81 /* libmediastreamer.a */; + productReference = 225D64F81521BFA6008B2E81 /* libmediastreamer_base.a */; productType = "com.apple.product-type.library.static"; }; 225D64FA1521C009008B2E81 /* libortp */ = { @@ -1771,6 +1972,25 @@ productReference = 225D65C51521C009008B2E81 /* libortp.a */; productType = "com.apple.product-type.library.static"; }; + 22C8D0401769F8FF00DAFB4E /* libmediastreamer_voip */ = { + isa = PBXNativeTarget; + buildConfigurationList = 22C8D0E51769F8FF00DAFB4E /* Build configuration list for PBXNativeTarget "libmediastreamer_voip" */; + buildPhases = ( + 22C8D0431769F8FF00DAFB4E /* Headers */, + 22C8D0981769F8FF00DAFB4E /* Sources */, + 22C8D0E11769F8FF00DAFB4E /* Frameworks */, + ); + buildRules = ( + 22C8D0E41769F8FF00DAFB4E /* PBXBuildRule */, + ); + dependencies = ( + 22C8D0411769F8FF00DAFB4E /* PBXTargetDependency */, + ); + name = libmediastreamer_voip; + productName = liblinphone; + productReference = 22C8D0E91769F8FF00DAFB4E /* libmediastreamer_voip.a */; + productType = "com.apple.product-type.library.static"; + }; 22DD19BD13A8D7FA0018ECD4 /* mediastream */ = { isa = PBXNativeTarget; buildConfigurationList = 22DD19DA13A8D7FA0018ECD4 /* Build configuration list for PBXNativeTarget "mediastream" */; @@ -1800,6 +2020,7 @@ buildRules = ( ); dependencies = ( + 22C8D0EB1769F95700DAFB4E /* PBXTargetDependency */, 225D65C91521C0D1008B2E81 /* PBXTargetDependency */, ); name = liblinphone; @@ -1833,9 +2054,10 @@ targets = ( D2AAC07D0554694100DB518D /* liblinphone */, 22DD19BD13A8D7FA0018ECD4 /* mediastream */, - 225D642D1521BFA6008B2E81 /* libmediastreamer */, + 225D642D1521BFA6008B2E81 /* libmediastreamer_base */, 225D64FA1521C009008B2E81 /* libortp */, 223CA8ED16DA10AB00EF1BEC /* libbellesip */, + 22C8D0401769F8FF00DAFB4E /* libmediastreamer_voip */, ); }; /* End PBXProject section */ @@ -1892,32 +2114,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 225D64BC1521BFA6008B2E81 /* address.c in Sources */, - 225D64BD1521BFA6008B2E81 /* authentication.c in Sources */, - 225D64BE1521BFA6008B2E81 /* callbacks.c in Sources */, - 225D64BF1521BFA6008B2E81 /* chat.c in Sources */, - 225D64D31521BFA6008B2E81 /* filter-template.c in Sources */, - 221DCB6D153584410025E54D /* yuv2rgb.fs in Sources */, - 221DCB6F153584410025E54D /* yuv2rgb.vs in Sources */, - 223CA86716D9268D00EF1BEC /* alaw.c in Sources */, - 223CA86916D9268D00EF1BEC /* aqsnd.c in Sources */, - 223CA86B16D9268D00EF1BEC /* audiomixer.c in Sources */, - 223CA86C16D9268D00EF1BEC /* chanadapt.c in Sources */, - 223CA86D16D9268D00EF1BEC /* dtmfgen.c in Sources */, - 223CA86E16D9268D00EF1BEC /* equalizer.c in Sources */, - 223CA87016D9268D00EF1BEC /* genericplc.c in Sources */, - 223CA87116D9268D00EF1BEC /* gsm.c in Sources */, - 223CA87216D9268D00EF1BEC /* l16.c in Sources */, - 223CA87416D9268D00EF1BEC /* msconf.c in Sources */, - 223CA87516D9268D00EF1BEC /* msfileplayer.c in Sources */, - 223CA87616D9268D00EF1BEC /* msfilerec.c in Sources */, - 223CA87716D9268D00EF1BEC /* msg722.c in Sources */, - 223CA87816D9268D00EF1BEC /* msiounit.m in Sources */, - 223CA87916D9268D00EF1BEC /* msresample.c in Sources */, - 223CA87A16D9268D00EF1BEC /* msspeex.c in Sources */, - 223CA87B16D9268D00EF1BEC /* msvolume.c in Sources */, - 223CA88016D9268D00EF1BEC /* tonedetector.c in Sources */, - 223CA88116D9268D00EF1BEC /* ulaw.c in Sources */, 223CA88816D9268D00EF1BEC /* eventqueue.c in Sources */, 223CA88916D9268D00EF1BEC /* mscommon.c in Sources */, 223CA88A16D9268D00EF1BEC /* msfilter.c in Sources */, @@ -1926,48 +2122,6 @@ 223CA88D16D9268D00EF1BEC /* msticker.c in Sources */, 223CA88E16D9268D00EF1BEC /* mswebcam.c in Sources */, 223CA88F16D9268D00EF1BEC /* mtu.c in Sources */, - 223CA89016D9268D00EF1BEC /* itc.c in Sources */, - 223CA89116D9268D00EF1BEC /* join.c in Sources */, - 223CA89216D9268D00EF1BEC /* msrtp.c in Sources */, - 223CA89316D9268D00EF1BEC /* tee.c in Sources */, - 223CA89416D9268D00EF1BEC /* void.c in Sources */, - 223CA89616D9268D00EF1BEC /* dsptools.c in Sources */, - 223CA89A16D9268D00EF1BEC /* g722_decode.c in Sources */, - 223CA89B16D9268D00EF1BEC /* g722_encode.c in Sources */, - 223CA89C16D9268D00EF1BEC /* kiss_fft.c in Sources */, - 223CA89E16D9268D00EF1BEC /* kiss_fftr.c in Sources */, - 223CA8A116D9268D00EF1BEC /* opengles_display.c in Sources */, - 223CA8A316D9268D00EF1BEC /* shaders.c in Sources */, - 223CA8A816D9268D00EF1BEC /* extdisplay.c in Sources */, - 223CA8AA16D9268D00EF1BEC /* h264dec.c in Sources */, - 223CA8AB16D9268D00EF1BEC /* ioscapture.m in Sources */, - 223CA8AC16D9268D00EF1BEC /* iosdisplay.m in Sources */, - 223CA8AD16D9268D00EF1BEC /* jpegwriter.c in Sources */, - 223CA8AE16D9268D00EF1BEC /* mire.c in Sources */, - 223CA8B316D9268D00EF1BEC /* nowebcam.c in Sources */, - 223CA8B416D9268D00EF1BEC /* pixconv.c in Sources */, - 223CA8B616D9268D00EF1BEC /* sizeconv.c in Sources */, - 223CA8B816D9268D00EF1BEC /* videodec.c in Sources */, - 223CA8B916D9268D00EF1BEC /* videoenc.c in Sources */, - 223CA8BB16D9268D00EF1BEC /* vp8.c in Sources */, - 223CA8C116D9268D00EF1BEC /* audioconference.c in Sources */, - 223CA8C216D9268D00EF1BEC /* audiostream.c in Sources */, - 223CA8C316D9268D00EF1BEC /* bitratecontrol.c in Sources */, - 223CA8C416D9268D00EF1BEC /* bitratedriver.c in Sources */, - 223CA8C516D9268D00EF1BEC /* ice.c in Sources */, - 223CA8C616D9268D00EF1BEC /* layouts.c in Sources */, - 223CA8C816D9268D00EF1BEC /* mediastream.c in Sources */, - 223CA8C916D9268D00EF1BEC /* msvideo.c in Sources */, - 223CA8CA16D9268D00EF1BEC /* msvideo_neon.c in Sources */, - 223CA8CC16D9268D00EF1BEC /* msvoip.c in Sources */, - 223CA8CF16D9268D00EF1BEC /* qosanalyzer.c in Sources */, - 223CA8D016D9268D00EF1BEC /* qualityindicator.c in Sources */, - 223CA8D216D9268D00EF1BEC /* rfc3984.c in Sources */, - 223CA8D316D9268D00EF1BEC /* ringstream.c in Sources */, - 223CA8D416D9268D00EF1BEC /* scaler.c in Sources */, - 223CA8D716D9268D00EF1BEC /* videostream.c in Sources */, - 22D07CE516F3BFCB009F2C9E /* speexec.c in Sources */, - 22AF73BE1753E83700BE8398 /* msopus.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2005,6 +2159,78 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 22C8D0981769F8FF00DAFB4E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22C8D0991769F8FF00DAFB4E /* filter-template.c in Sources */, + 22C8D09A1769F8FF00DAFB4E /* yuv2rgb.fs in Sources */, + 22C8D09B1769F8FF00DAFB4E /* yuv2rgb.vs in Sources */, + 22C8D09C1769F8FF00DAFB4E /* alaw.c in Sources */, + 22C8D09D1769F8FF00DAFB4E /* aqsnd.c in Sources */, + 22C8D09E1769F8FF00DAFB4E /* audiomixer.c in Sources */, + 22C8D09F1769F8FF00DAFB4E /* chanadapt.c in Sources */, + 22C8D0A01769F8FF00DAFB4E /* dtmfgen.c in Sources */, + 22C8D0A11769F8FF00DAFB4E /* equalizer.c in Sources */, + 22C8D0A21769F8FF00DAFB4E /* genericplc.c in Sources */, + 22C8D0A31769F8FF00DAFB4E /* gsm.c in Sources */, + 22C8D0A41769F8FF00DAFB4E /* l16.c in Sources */, + 22C8D0A51769F8FF00DAFB4E /* msconf.c in Sources */, + 22C8D0A61769F8FF00DAFB4E /* msfileplayer.c in Sources */, + 22C8D0A71769F8FF00DAFB4E /* msfilerec.c in Sources */, + 22C8D0A81769F8FF00DAFB4E /* msg722.c in Sources */, + 22C8D0A91769F8FF00DAFB4E /* msiounit.m in Sources */, + 22C8D0AA1769F8FF00DAFB4E /* msresample.c in Sources */, + 22C8D0AB1769F8FF00DAFB4E /* msspeex.c in Sources */, + 22C8D0AC1769F8FF00DAFB4E /* msvolume.c in Sources */, + 22C8D0AD1769F8FF00DAFB4E /* tonedetector.c in Sources */, + 22C8D0AE1769F8FF00DAFB4E /* ulaw.c in Sources */, + 22C8D0B71769F8FF00DAFB4E /* itc.c in Sources */, + 22C8D0B81769F8FF00DAFB4E /* join.c in Sources */, + 22C8D0B91769F8FF00DAFB4E /* msrtp.c in Sources */, + 22C8D0BA1769F8FF00DAFB4E /* tee.c in Sources */, + 22C8D0BB1769F8FF00DAFB4E /* void.c in Sources */, + 22C8D0BC1769F8FF00DAFB4E /* dsptools.c in Sources */, + 22C8D0BD1769F8FF00DAFB4E /* g722_decode.c in Sources */, + 22C8D0BE1769F8FF00DAFB4E /* g722_encode.c in Sources */, + 22C8D0BF1769F8FF00DAFB4E /* kiss_fft.c in Sources */, + 22C8D0C01769F8FF00DAFB4E /* kiss_fftr.c in Sources */, + 22C8D0C11769F8FF00DAFB4E /* opengles_display.c in Sources */, + 22C8D0C21769F8FF00DAFB4E /* shaders.c in Sources */, + 22C8D0C31769F8FF00DAFB4E /* extdisplay.c in Sources */, + 22C8D0C41769F8FF00DAFB4E /* h264dec.c in Sources */, + 22C8D0C51769F8FF00DAFB4E /* ioscapture.m in Sources */, + 22C8D0C61769F8FF00DAFB4E /* iosdisplay.m in Sources */, + 22C8D0C71769F8FF00DAFB4E /* jpegwriter.c in Sources */, + 22C8D0C81769F8FF00DAFB4E /* mire.c in Sources */, + 22C8D0C91769F8FF00DAFB4E /* nowebcam.c in Sources */, + 22C8D0CA1769F8FF00DAFB4E /* pixconv.c in Sources */, + 22C8D0CB1769F8FF00DAFB4E /* sizeconv.c in Sources */, + 22C8D0CC1769F8FF00DAFB4E /* videodec.c in Sources */, + 22C8D0CD1769F8FF00DAFB4E /* videoenc.c in Sources */, + 22C8D0CE1769F8FF00DAFB4E /* vp8.c in Sources */, + 22C8D0CF1769F8FF00DAFB4E /* audioconference.c in Sources */, + 22C8D0D01769F8FF00DAFB4E /* audiostream.c in Sources */, + 22C8D0D11769F8FF00DAFB4E /* bitratecontrol.c in Sources */, + 22C8D0D21769F8FF00DAFB4E /* bitratedriver.c in Sources */, + 22C8D0D31769F8FF00DAFB4E /* ice.c in Sources */, + 22C8D0D41769F8FF00DAFB4E /* layouts.c in Sources */, + 22C8D0D51769F8FF00DAFB4E /* mediastream.c in Sources */, + 22C8D0D61769F8FF00DAFB4E /* msvideo.c in Sources */, + 22C8D0D71769F8FF00DAFB4E /* msvideo_neon.c in Sources */, + 22C8D0D81769F8FF00DAFB4E /* msvoip.c in Sources */, + 22C8D0D91769F8FF00DAFB4E /* qosanalyzer.c in Sources */, + 22C8D0DA1769F8FF00DAFB4E /* qualityindicator.c in Sources */, + 22C8D0DB1769F8FF00DAFB4E /* rfc3984.c in Sources */, + 22C8D0DC1769F8FF00DAFB4E /* ringstream.c in Sources */, + 22C8D0DD1769F8FF00DAFB4E /* scaler.c in Sources */, + 22C8D0DE1769F8FF00DAFB4E /* videostream.c in Sources */, + 22C8D0DF1769F8FF00DAFB4E /* speexec.c in Sources */, + 22C8D0E01769F8FF00DAFB4E /* msopus.c in Sources */, + 22C8D0ED176A079600DAFB4E /* aac-eld.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 22DD19BA13A8D7FA0018ECD4 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2037,8 +2263,6 @@ 229ECDED143AEBDA00D611B8 /* conference.c in Sources */, 221DCB561529FE660025E54D /* linphonecall.c in Sources */, 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */, - 221DCB6C153584410025E54D /* yuv2rgb.fs in Sources */, - 221DCB6E153584410025E54D /* yuv2rgb.vs in Sources */, 223CA8E316D9298F00EF1BEC /* sal_address_impl.c in Sources */, 223CA8E416D9298F00EF1BEC /* sal_impl.c in Sources */, 223CA8E616D9298F00EF1BEC /* sal_op_call.c in Sources */, @@ -2048,6 +2272,13 @@ 223CA8EA16D9298F00EF1BEC /* sal_op_presence.c in Sources */, 223CA8EB16D9298F00EF1BEC /* sal_op_registration.c in Sources */, 223CA8EC16D9298F00EF1BEC /* sal_sdp.c in Sources */, + 22C8D0EF176A080100DAFB4E /* event.c in Sources */, + 22C8D0F3176A082600DAFB4E /* sal_op_events.c in Sources */, + 22C8D0F4176A082600DAFB4E /* sal_op_info.c in Sources */, + 22C8D0F5176A082600DAFB4E /* sal_op_publish.c in Sources */, + 22C8D0F7176A08CA00DAFB4E /* info.c in Sources */, + 22C8D0F9176A08F700DAFB4E /* message_storage.c in Sources */, + 22C8D0FE176A093B00DAFB4E /* linphone_tunnel_stubs.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2061,14 +2292,24 @@ }; 225D65C91521C0D1008B2E81 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 225D642D1521BFA6008B2E81 /* libmediastreamer */; + target = 225D642D1521BFA6008B2E81 /* libmediastreamer_base */; targetProxy = 225D65C81521C0D1008B2E81 /* PBXContainerItemProxy */; }; 225D65CB1521C181008B2E81 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 225D642D1521BFA6008B2E81 /* libmediastreamer */; + target = 225D642D1521BFA6008B2E81 /* libmediastreamer_base */; targetProxy = 225D65CA1521C181008B2E81 /* PBXContainerItemProxy */; }; + 22C8D0411769F8FF00DAFB4E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 225D64FA1521C009008B2E81 /* libortp */; + targetProxy = 22C8D0421769F8FF00DAFB4E /* PBXContainerItemProxy */; + }; + 22C8D0EB1769F95700DAFB4E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 22C8D0401769F8FF00DAFB4E /* libmediastreamer_voip */; + targetProxy = 22C8D0EA1769F95700DAFB4E /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -2103,6 +2344,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = NO; DSTROOT = /tmp/liblinphone.dst; GCC_DYNAMIC_NO_PIC = NO; @@ -2114,6 +2356,7 @@ GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( + linphone/include, linphone/mediastreamer2/build/iphone, linphone/mediastreamer2/include, linphone/oRTP/include, @@ -2139,6 +2382,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2147,6 +2391,7 @@ GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( + linphone/include, linphone/mediastreamer2/build/iphone, linphone/mediastreamer2/include, linphone/oRTP/include, @@ -2482,7 +2727,7 @@ "$(inherited)", "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", ); - PRODUCT_NAME = mediastreamer; + PRODUCT_NAME = mediastreamer_base; SKIP_INSTALL = YES; }; name = Debug; @@ -2538,7 +2783,7 @@ "$(inherited)", "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", ); - PRODUCT_NAME = mediastreamer; + PRODUCT_NAME = mediastreamer_base; SKIP_INSTALL = YES; }; name = Release; @@ -2594,7 +2839,7 @@ "$(inherited)", "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", ); - PRODUCT_NAME = mediastreamer; + PRODUCT_NAME = mediastreamer_base; SKIP_INSTALL = YES; }; name = DistributionAdhoc; @@ -2817,6 +3062,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; DSTROOT = /tmp/liblinphone.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2825,6 +3071,7 @@ GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( + linphone/include, linphone/mediastreamer2/build/iphone, linphone/mediastreamer2/include, linphone/oRTP/include, @@ -2895,6 +3142,177 @@ }; name = DistributionAdhoc; }; + 22C8D0E61769F8FF00DAFB4E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + DSTROOT = /tmp/liblinphone.dst; + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = liblinphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_BYTE_ORDER=_LITTLE_ENDIAN", + ORTP_INET6, + ENABLE_TRACE, + "LINPHONE_VERSION=\\\"debug\\\"", + "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "LOG_DOMAIN=\\\"Linphone\\\"", + "ORTP_MAJOR_VERSION=0", + "ORTP_MICRO_VERSION=0", + "ORTP_MINOR_VERSION=15", + "ORTP_VERSION=\\\"0.15.0\\\"", + "PACKAGE=\\\"ortp\\\"", + "POSIXTIMER_INTERVAL=10000", + IN_LINPHONE, + __MAC_AQ_ENABLED__, + HAVE_EXOSIP_GET_SOCKET, + MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + TARGET_OS_IPHONE, + MS2_FILTERS, + ); + GCC_THUMB_SUPPORT = NO; + GCC_UNROLL_LOOPS = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + HEADER_SEARCH_PATHS = ( + linphone/mediastreamer2/build/iphone, + linphone/mediastreamer2/include, + linphone/oRTP/include, + externals/gsm/, + externals/osip/include, + externals/exosip/include, + externals/speex/include, + externals/ffmpeg, + external/ffmpeg/swscale, + "../liblinphone-sdk/apple-darwin/include", + ); + INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", + ); + PRODUCT_NAME = mediastreamer_voip; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 22C8D0E71769F8FF00DAFB4E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + DSTROOT = /tmp/liblinphone.dst; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = liblinphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_BYTE_ORDER=_LITTLE_ENDIAN", + ORTP_INET6, + ENABLE_TRACE, + "LINPHONE_VERSION=\\\"debug\\\"", + "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "LOG_DOMAIN=\\\"Linphone\\\"", + "ORTP_MAJOR_VERSION=0", + "ORTP_MICRO_VERSION=0", + "ORTP_MINOR_VERSION=15", + "ORTP_VERSION=\\\"0.15.0\\\"", + "PACKAGE=\\\"ortp\\\"", + "POSIXTIMER_INTERVAL=10000", + IN_LINPHONE, + __MAC_AQ_ENABLED__, + HAVE_EXOSIP_GET_SOCKET, + MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + TARGET_OS_IPHONE, + MS2_FILTERS, + ); + GCC_THUMB_SUPPORT = NO; + GCC_UNROLL_LOOPS = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + HEADER_SEARCH_PATHS = ( + linphone/mediastreamer2/build/iphone, + linphone/mediastreamer2/include, + linphone/oRTP/include, + externals/gsm/, + externals/osip/include, + externals/exosip/include, + externals/speex/include, + externals/ffmpeg, + external/ffmpeg/swscale, + "../liblinphone-sdk/apple-darwin/include", + ); + INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", + ); + PRODUCT_NAME = mediastreamer_voip; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 22C8D0E81769F8FF00DAFB4E /* DistributionAdhoc */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + DSTROOT = /tmp/liblinphone.dst; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = liblinphone_Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "_BYTE_ORDER=_LITTLE_ENDIAN", + ORTP_INET6, + ENABLE_TRACE, + "LINPHONE_VERSION=\\\"debug\\\"", + "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "LOG_DOMAIN=\\\"Linphone\\\"", + "ORTP_MAJOR_VERSION=0", + "ORTP_MICRO_VERSION=0", + "ORTP_MINOR_VERSION=15", + "ORTP_VERSION=\\\"0.15.0\\\"", + "PACKAGE=\\\"ortp\\\"", + "POSIXTIMER_INTERVAL=10000", + IN_LINPHONE, + __MAC_AQ_ENABLED__, + HAVE_EXOSIP_GET_SOCKET, + MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + TARGET_OS_IPHONE, + MS2_FILTERS, + ); + GCC_THUMB_SUPPORT = NO; + GCC_UNROLL_LOOPS = NO; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; + HEADER_SEARCH_PATHS = ( + linphone/mediastreamer2/build/iphone, + linphone/mediastreamer2/include, + linphone/oRTP/include, + externals/gsm/, + externals/osip/include, + externals/exosip/include, + externals/speex/include, + externals/ffmpeg, + external/ffmpeg/swscale, + "../liblinphone-sdk/apple-darwin/include", + ); + INSTALL_PATH = /usr/local/lib; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../liblinphone-sdk/apple-darwin/lib\"", + ); + PRODUCT_NAME = mediastreamer_voip; + SKIP_INSTALL = YES; + }; + name = DistributionAdhoc; + }; 22DD19DB13A8D7FA0018ECD4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3025,7 +3443,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 225D64F41521BFA6008B2E81 /* Build configuration list for PBXNativeTarget "libmediastreamer" */ = { + 225D64F41521BFA6008B2E81 /* Build configuration list for PBXNativeTarget "libmediastreamer_base" */ = { isa = XCConfigurationList; buildConfigurations = ( 225D64F51521BFA6008B2E81 /* Debug */, @@ -3045,6 +3463,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 22C8D0E51769F8FF00DAFB4E /* Build configuration list for PBXNativeTarget "libmediastreamer_voip" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 22C8D0E61769F8FF00DAFB4E /* Debug */, + 22C8D0E71769F8FF00DAFB4E /* Release */, + 22C8D0E81769F8FF00DAFB4E /* DistributionAdhoc */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 22DD19DA13A8D7FA0018ECD4 /* Build configuration list for PBXNativeTarget "mediastream" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/submodules/linphone b/submodules/linphone index 6e3c6551a..f55699af8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6e3c6551a9cac6d231910420386e9666a0a30c0b +Subproject commit f55699af8e9a6a0c595fbbc1adac612f96b48fc9