From 23a54227aad7ac0bfd7ff57e42601b9f2a710389 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 27 Feb 2013 14:51:03 +0100 Subject: [PATCH 001/218] first belle-sip version --- .gitmodules | 8 +- Classes/ChatRoomViewController.m | 6 +- Classes/LinphoneCoreSettingsStore.m | 8 +- linphone.xcodeproj/project.pbxproj | 46 +- submodules/belle-sip | 1 + submodules/build/builder-iphone-os.mk | 62 +- submodules/build/builders.d/belle-sip.mk | 43 + submodules/build/builders.d/ffmpeg.mk | 2 +- submodules/build/builders.d/libantlr3c.mk | 43 + submodules/build/builders.d/libvpx.mk | 2 +- submodules/build/builders.d/msamr.mk | 4 +- submodules/build/builders.d/msbcg729.mk | 4 +- submodules/build/builders.d/mssilk.mk | 4 +- submodules/build/builders.d/msx264.mk | 4 +- submodules/build/builders.d/opencore-amr.mk | 2 +- submodules/build/iphone-config.site | 2 +- submodules/externals/antlr3 | 1 + submodules/externals/libantlr3c | 1 + submodules/libantlr3c | 1 + .../liblinphone.xcodeproj/project.pbxproj | 1331 +++++++++++------ submodules/linphone | 2 +- 21 files changed, 1008 insertions(+), 569 deletions(-) create mode 160000 submodules/belle-sip create mode 100644 submodules/build/builders.d/belle-sip.mk create mode 100644 submodules/build/builders.d/libantlr3c.mk create mode 160000 submodules/externals/antlr3 create mode 160000 submodules/externals/libantlr3c create mode 160000 submodules/libantlr3c diff --git a/.gitmodules b/.gitmodules index 48fa6c484..b1fed58b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "submodules/linphone"] path = submodules/linphone - url = git://git.linphone.org/linphone.git + url = git://git.linphone.org/linphone-private.git [submodule "submodules/externals/osip"] path = submodules/externals/osip url = git://git.linphone.org/osip.git @@ -49,3 +49,9 @@ [submodule "submodules/bcg729"] path = submodules/bcg729 url = git://git.linphone.org/bcg729.git +[submodule "submodules/belle-sip"] + path = submodules/belle-sip + url = gitosis@git.linphone.org:belle-sip +[submodule "submodules/externals/antlr3"] + path = submodules/externals/antlr3 + url = gitosis@git.linphone.org:antlr3 diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index b096f4acd..04f7e0b9b 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -308,8 +308,10 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta [chat setState:[NSNumber numberWithInt:state]]; [chat update]; [thiz.tableController updateChatEntry:chat]; - linphone_chat_message_set_user_data(msg, NULL); - [chat release]; // no longuer need to keep reference + if (state != LinphoneChatMessageStateInProgress) { + linphone_chat_message_set_user_data(msg, NULL); + [chat release]; // no longuer need to keep reference + } } diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 6cff4b33e..4b9c3afe4 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -82,17 +82,17 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); if (addr){ const char *proxy=linphone_proxy_config_get_addr(cfg); LinphoneAddress *proxy_addr=linphone_address_new(proxy); - const char *port=linphone_address_get_port(proxy_addr); + int port=linphone_address_get_port_int(proxy_addr); [self setString: linphone_address_get_username(addr) forKey:@"username_preference"]; [self setString: linphone_address_get_domain(addr) forKey:@"domain_preference"]; [self setInteger: linphone_proxy_config_get_expires(cfg) forKey:@"expire_preference"]; [self setString: linphone_proxy_config_get_dial_prefix(cfg) forKey:@"prefix_preference"]; if (strcmp(linphone_address_get_domain(addr),linphone_address_get_domain(proxy_addr))!=0 - || port!=NULL){ + || port>0){ char tmp[256]={0}; - if (port!=NULL) { - snprintf(tmp,sizeof(tmp)-1,"%s:%s",linphone_address_get_domain(proxy_addr),port); + if (port>0) { + snprintf(tmp,sizeof(tmp)-1,"%s:%i",linphone_address_get_domain(proxy_addr),port); }else snprintf(tmp,sizeof(tmp)-1,"%s",linphone_address_get_domain(proxy_addr)); [self setString: tmp forKey:@"proxy_preference"]; } diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 47d44ea1f..efbe68d5a 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -12,10 +12,7 @@ 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; }; - 220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; }; 220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; - 220FAD3610765B400068D98F /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2D10765B400068D98F /* libosip2.a */; }; - 220FAD3710765B400068D98F /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2E10765B400068D98F /* libosipparser2.a */; }; 220FAD3810765B400068D98F /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; }; 220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; }; 2214783D1386A2030020F8B8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; }; @@ -37,6 +34,10 @@ 2234C8EE15EE744200E18E83 /* chat_message_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */; }; 2234C8EF15EE744200E18E83 /* chat_message_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */; }; 2237D4091084D7A9001383EE /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* ring.wav */; }; + 223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E416D9255800EF1BEC /* libantlr3c.a */; }; + 223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E516D9255800EF1BEC /* libbellesip.a */; }; + 223CA7E816D9256E00EF1BEC /* libantlr3c.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E416D9255800EF1BEC /* libantlr3c.a */; }; + 223CA7E916D9257200EF1BEC /* libbellesip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E516D9255800EF1BEC /* libbellesip.a */; }; 22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; }; 22405F001601C19200B92522 /* ImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageViewController.m */; }; 22405F011601C19200B92522 /* ImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageViewController.m */; }; @@ -87,17 +88,12 @@ 22D8F15D147548E2008C97DB /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; }; 22D8F15E147548E2008C97DB /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; }; 22D8F15F147548E2008C97DB /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; }; - 22D8F163147548E2008C97DB /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; }; - 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; }; 22D8F165147548E2008C97DB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 22D8F166147548E2008C97DB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 22D8F167147548E2008C97DB /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 22D8F168147548E2008C97DB /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; 22D8F169147548E2008C97DB /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; }; - 22D8F16A147548E2008C97DB /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; }; 22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; - 22D8F16C147548E2008C97DB /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2D10765B400068D98F /* libosip2.a */; }; - 22D8F16D147548E2008C97DB /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2E10765B400068D98F /* libosipparser2.a */; }; 22D8F16E147548E2008C97DB /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; }; 22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; }; 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; }; @@ -117,8 +113,6 @@ 22E0A822111C44E100B04932 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* AboutViewController.m */; }; 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */; }; 22E0A824111C44E100B04932 /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81F111C44E100B04932 /* ConsoleViewController.m */; }; - 22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; }; - 22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; }; 22F2508E107141E100AC9B3F /* DialerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* DialerViewController.m */; }; 22F254811073D99800AC9B3F /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 22F254801073D99800AC9B3F /* ringback.wav */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; @@ -1458,11 +1452,8 @@ 220FACE9107654FC0068D98F /* speex_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_resampler.h; sourceTree = ""; }; 220FACEA107654FC0068D98F /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = ""; }; 220FACEB107654FC0068D98F /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = ""; }; - 220FAD2810765B400068D98F /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; 220FAD2910765B400068D98F /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; 220FAD2C10765B400068D98F /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; - 220FAD2D10765B400068D98F /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = ""; }; - 220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = ""; }; 220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; 220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 2211DB911475562600DEE054 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; @@ -1486,6 +1477,8 @@ 2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_not_delivered.png; path = Resources/chat_message_not_delivered.png; sourceTree = ""; }; 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_inprogress.png; path = Resources/chat_message_inprogress.png; sourceTree = ""; }; 2237D4081084D7A9001383EE /* ring.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ring.wav; path = Resources/ring.wav; sourceTree = ""; }; + 223CA7E416D9255800EF1BEC /* libantlr3c.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libantlr3c.a; path = "liblinphone-sdk/apple-darwin/lib/libantlr3c.a"; sourceTree = ""; }; + 223CA7E516D9255800EF1BEC /* libbellesip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbellesip.a; path = "liblinphone-sdk/apple-darwin/lib/libbellesip.a"; sourceTree = ""; }; 22405EE916006F0700B92522 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = ""; }; 22405EEA16006F0700B92522 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = ""; }; 22405EED1600B4E400B92522 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; }; @@ -1603,8 +1596,6 @@ 22E0A81E111C44E100B04932 /* ConsoleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConsoleViewController.xib; sourceTree = ""; }; 22E0A81F111C44E100B04932 /* ConsoleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ConsoleViewController.m; sourceTree = ""; }; 22E0A820111C44E100B04932 /* ConsoleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsoleViewController.h; sourceTree = ""; }; - 22E5B0AD133B5EA20044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5B0AE133B5EA20044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 22F2508B107141E100AC9B3F /* DialerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DialerViewController.h; sourceTree = ""; }; 22F2508C107141E100AC9B3F /* DialerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DialerViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = Resources/ringback.wav; sourceTree = ""; }; @@ -2325,6 +2316,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */, + 223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */, D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */, D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, @@ -2351,9 +2344,7 @@ 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */, 22276E8313C73D3100210156 /* libavcodec.a in Frameworks */, 22276E8413C73D3100210156 /* libavutil.a in Frameworks */, - 22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */, 226CDADF14E2D0B800513B67 /* libbcg729.a in Frameworks */, - 220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */, 220FAD3210765B400068D98F /* libgsm.a in Frameworks */, 223148E41178A08200637D6A /* libilbc.a in Frameworks */, F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */, @@ -2364,15 +2355,12 @@ 226183B0147259670037138E /* libmssilk.a in Frameworks */, 22AA8AFE13D7125600B30535 /* libmsx264.a in Frameworks */, 22A10F3B11F8960300373793 /* libortp.a in Frameworks */, - 220FAD3610765B400068D98F /* libosip2.a in Frameworks */, - 220FAD3710765B400068D98F /* libosipparser2.a in Frameworks */, 226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */, 226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */, 226CDAE014E2D0B800513B67 /* libmsbcg729.a in Frameworks */, 220FAD3810765B400068D98F /* libspeex.a in Frameworks */, 220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */, 226183AE1472527D0037138E /* libsrtp.a in Frameworks */, - 22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */, 226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */, 22276E8513C73D3100210156 /* libswscale.a in Frameworks */, 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */, @@ -2405,8 +2393,6 @@ 22D8F166147548E2008C97DB /* UIKit.framework in Frameworks */, 22D8F178147548E2008C97DB /* libresolv.dylib in Frameworks */, D34BD61515C13B7B0070C209 /* libsqlite3.dylib in Frameworks */, - 22D8F164147548E2008C97DB /* libcrypto.a in Frameworks */, - 22D8F16A147548E2008C97DB /* libeXosip2.a in Frameworks */, 22D8F174147548E2008C97DB /* libilbc.a in Frameworks */, 22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */, D34BD61815C13D0B0070C209 /* liblinphone.a in Frameworks */, @@ -2417,14 +2403,13 @@ 22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */, 22D8F17A147548E2008C97DB /* libopencore-amrnb.a in Frameworks */, 22D8F177147548E2008C97DB /* libortp.a in Frameworks */, - 22D8F16C147548E2008C97DB /* libosip2.a in Frameworks */, - 22D8F16D147548E2008C97DB /* libosipparser2.a in Frameworks */, 22D8F17E147548E2008C97DB /* libSKP_SILK_SDK.a in Frameworks */, 22D8F17F147548E2008C97DB /* libsrtp.a in Frameworks */, 22D8F16E147548E2008C97DB /* libspeex.a in Frameworks */, 22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */, - 22D8F163147548E2008C97DB /* libssl.a in Frameworks */, 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */, + 223CA7E816D9256E00EF1BEC /* libantlr3c.a in Frameworks */, + 223CA7E916D9257200EF1BEC /* libbellesip.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2885,12 +2870,12 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 223CA7E416D9255800EF1BEC /* libantlr3c.a */, + 223CA7E516D9255800EF1BEC /* libbellesip.a */, 2258633C11410BAC00C5A737 /* README */, 22276E8013C73D3100210156 /* libavcodec.a */, 22276E8113C73D3100210156 /* libavutil.a */, 226CDADD14E2D0B800513B67 /* libbcg729.a */, - 22E5B0AE133B5EA20044EA25 /* libcrypto.a */, - 220FAD2810765B400068D98F /* libeXosip2.a */, 220FAD2910765B400068D98F /* libgsm.a */, 223148E31178A08200637D6A /* libilbc.a */, 2211DB911475562600DEE054 /* liblinphone.a */, @@ -2904,13 +2889,10 @@ 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */, 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */, 220FAD2C10765B400068D98F /* libortp.a */, - 220FAD2D10765B400068D98F /* libosip2.a */, - 220FAD2E10765B400068D98F /* libosipparser2.a */, 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */, 220FAD2F10765B400068D98F /* libspeex.a */, 220FAD3010765B400068D98F /* libspeexdsp.a */, 226183AB1472527D0037138E /* libsrtp.a */, - 22E5B0AD133B5EA20044EA25 /* libssl.a */, 22276E8213C73D3100210156 /* libswscale.a */, 7066FC0B13E830E400EFC6DC /* libvpx.a */, 22AA8AFB13D7125500B30535 /* libx264.a */, @@ -5673,7 +5655,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -5681,7 +5663,7 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/submodules/belle-sip b/submodules/belle-sip new file mode 160000 index 000000000..d5d4a0243 --- /dev/null +++ b/submodules/belle-sip @@ -0,0 +1 @@ +Subproject commit d5d4a0243a48f9207b4c478051dc74d35eeaadb0 diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index d481f90a5..7a0314dc1 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -30,13 +30,15 @@ linphone_configure_controls= \ --enable-gtk_ui=no \ --enable-console_ui=no \ --enable-ssl-hmac=no \ - --enable-ssl=yes \ + --enable-ssl=no \ --disable-theora \ --disable-sdl \ --disable-x11 \ + --enable-bellesip \ --with-gsm=$(prefix) \ --disable-tests \ - --with-srtp=$(prefix) + --with-srtp=$(prefix) \ + --with-antlr=$(prefix) ifeq ($(enable_zrtp),yes) linphone_configure_controls+= --enable-zrtp @@ -109,17 +111,17 @@ veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-libantlr build-belle-sip build-srtp build-zrtpcpp build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install -clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 +clean-linphone: clean-libantlr clean-belle-sip clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx +veryclean-linphone: veryclean-libantlrc3 veryclean-belle-sip veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk +clean-makefile-linphone: clean-makefile-libantlr clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile @@ -146,54 +148,6 @@ clean-makefile-liblinphone: clean-liblinphone: cd $(LINPHONE_BUILD_DIR) && make clean -#osip2 - -$(BUILDER_SRC_DIR)/$(osip_dir)/configure: - cd $(BUILDER_SRC_DIR)/$(osip_dir) && ./autogen.sh - -$(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(osip_dir)/configure - mkdir -p $(BUILDER_BUILD_DIR)/$(osip_dir) - cd $(BUILDER_BUILD_DIR)/$(osip_dir)/ \ - && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(osip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} - -build-osip2: $(BUILDER_BUILD_DIR)/$(osip_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(osip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install - -clean-osip2: - cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make clean - -veryclean-osip2: -# -cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean - -cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure - -clean-makefile-osip2: - cd $(BUILDER_BUILD_DIR)/$(osip_dir) && rm -f Makefile -#eXosip - -$(BUILDER_SRC_DIR)/$(eXosip_dir)/configure: - cd $(BUILDER_SRC_DIR)/$(eXosip_dir) && ./autogen.sh - -$(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure - mkdir -p $(BUILDER_BUILD_DIR)/$(eXosip_dir) - cd $(BUILDER_BUILD_DIR)/$(eXosip_dir)/\ - && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} CFLAGS="-I$(prefix)/include -L$(prefix)/lib -lcrypto" --enable-openssl --disable-tools - -build-eXosip2: $(BUILDER_BUILD_DIR)/$(eXosip_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) \ - && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - make DEFS="-DHAVE_CONFIG_H -include $(BUILDER_SRC_DIR)/$(eXosip_dir)/include/eXosip2/eXosip_transport_hook.h" && make install - -clean-eXosip2: - cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make clean - -veryclean-eXosip2: -# -cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean - -rm -f $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure - -clean-makefile-eXosip2: - cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && rm -f Makefile #speex diff --git a/submodules/build/builders.d/belle-sip.mk b/submodules/build/builders.d/belle-sip.mk new file mode 100644 index 000000000..6b95dec3f --- /dev/null +++ b/submodules/build/builders.d/belle-sip.mk @@ -0,0 +1,43 @@ +############################################################################ +# belle-sip.mk +# Copyright (C) 2013 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +belle-sip_dir?=belle-sip +$(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure: + cd $(BUILDER_SRC_DIR)/$(belle-sip_dir) && ./autogen.sh + +$(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure + mkdir -p $(BUILDER_BUILD_DIR)/$(belle-sip_dir) + cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/ \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --disable-tls + +build-belle-sip: $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile + cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + +clean-belle-sip: + cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && make clean + +veryclean-belle-sip: + -cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && make distclean + rm -f $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure + +clean-makefile-belle-sip: + cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && rm -f Makefile diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk index 04f363f4f..c47fd5fe4 100644 --- a/submodules/build/builders.d/ffmpeg.mk +++ b/submodules/build/builders.d/ffmpeg.mk @@ -34,7 +34,7 @@ $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak: $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/ && $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/configure --prefix=$(prefix) $(ffmpeg_configure_options) build-ffmpeg: $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak - cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-ffmpeg: cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make clean diff --git a/submodules/build/builders.d/libantlr3c.mk b/submodules/build/builders.d/libantlr3c.mk new file mode 100644 index 000000000..da1cf08f6 --- /dev/null +++ b/submodules/build/builders.d/libantlr3c.mk @@ -0,0 +1,43 @@ +############################################################################ +# libantlr.mk +# Copyright (C) 2013 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +libantlr_dir?=externals/antlr3/runtime/C +$(BUILDER_SRC_DIR)/$(libantlr_dir)/configure: + cd $(BUILDER_SRC_DIR)/$(libantlr_dir) && ./autogen.sh + +$(BUILDER_BUILD_DIR)/$(libantlr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(libantlr_dir)/configure + mkdir -p $(BUILDER_BUILD_DIR)/$(libantlr_dir) + cd $(BUILDER_BUILD_DIR)/$(libantlr_dir)/ \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(libantlr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} + +build-libantlr: $(BUILDER_BUILD_DIR)/$(libantlr_dir)/Makefile + cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + +clean-libantlr: + cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && make clean + +veryclean-libantlr: + -cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && make distclean + rm -f $(BUILDER_SRC_DIR)/$(libantlr_dir)/configure + +clean-makefile-libantlr: + cd $(BUILDER_BUILD_DIR)/$(libantlr_dir) && rm -f Makefile diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 8cf0564ec..a0a164e78 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -27,7 +27,7 @@ $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/p && SYSROOT_PATH=$$SYSROOT_PATH SDK_BIN_PATH=$$SDK_BIN_PATH $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) $(libvpx_configure_options) build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk - cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-libvpx: cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make clean diff --git a/submodules/build/builders.d/msamr.mk b/submodules/build/builders.d/msamr.mk index 03db5fd88..ed38e4997 100644 --- a/submodules/build/builders.d/msamr.mk +++ b/submodules/build/builders.d/msamr.mk @@ -26,11 +26,11 @@ $(BUILDER_SRC_DIR)/$(msamr_dir)/configure: $(BUILDER_BUILD_DIR)/$(msamr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msamr_dir)/configure mkdir -p $(BUILDER_BUILD_DIR)/$(msamr_dir) cd $(BUILDER_BUILD_DIR)/$(msamr_dir)/ \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(BUILDER_SRC_DIR)/$(msamr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} build-msamr: build-opencore-amr $(BUILDER_BUILD_DIR)/$(msamr_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-msamr: clean-opencore-amr cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make clean diff --git a/submodules/build/builders.d/msbcg729.mk b/submodules/build/builders.d/msbcg729.mk index 727be6148..98b1f3bbb 100644 --- a/submodules/build/builders.d/msbcg729.mk +++ b/submodules/build/builders.d/msbcg729.mk @@ -30,7 +30,7 @@ $(BUILDER_BUILD_DIR)/$(msbcg729_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msbcg729_dir @echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(msbcg729_dir) \033[0m" mkdir -p $(BUILDER_BUILD_DIR)/$(msbcg729_dir) cd $(BUILDER_BUILD_DIR)/$(msbcg729_dir)/ \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(BUILDER_SRC_DIR)/$(msbcg729_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ --enable-static @@ -39,7 +39,7 @@ ifeq ($(enable_bcg729),yes) build-msbcg729: $(BUILDER_BUILD_DIR)/$(msbcg729_dir)/Makefile @echo -e "\033[01;32m building bcg729 \033[0m" cd $(BUILDER_BUILD_DIR)/$(msbcg729_dir) \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig \ CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ make -j1 && make install diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk index bffd7de26..dcf8978c7 100644 --- a/submodules/build/builders.d/mssilk.mk +++ b/submodules/build/builders.d/mssilk.mk @@ -30,7 +30,7 @@ $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/co echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir) cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ --enable-static @@ -39,7 +39,7 @@ ifeq ($(enable_silk),yes) build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile echo -e "\033[01;32m building silk \033[0m" cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig \ CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ make -j1 && make install diff --git a/submodules/build/builders.d/msx264.mk b/submodules/build/builders.d/msx264.mk index aaf1e5e00..06c3a4ba3 100644 --- a/submodules/build/builders.d/msx264.mk +++ b/submodules/build/builders.d/msx264.mk @@ -26,11 +26,11 @@ $(BUILDER_SRC_DIR)/$(msx264_dir)/configure: $(BUILDER_BUILD_DIR)/$(msx264_dir)/Makefile: $(BUILDER_SRC_DIR)/$(msx264_dir)/configure mkdir -p $(BUILDER_BUILD_DIR)/$(msx264_dir) cd $(BUILDER_BUILD_DIR)/$(msx264_dir)/ \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(BUILDER_SRC_DIR)/$(msx264_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} build-msx264: build-x264 $(BUILDER_BUILD_DIR)/$(msx264_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(msx264_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(msx264_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-msx264: clean-x264 cd $(BUILDER_BUILD_DIR)/$(msx264_dir) && make clean diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk index dcd2347e9..362cbeafa 100644 --- a/submodules/build/builders.d/opencore-amr.mk +++ b/submodules/build/builders.d/opencore-amr.mk @@ -35,7 +35,7 @@ $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${opencore-amr-configure-option} build-opencore-amr: $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index ea15aad82..61b1105b5 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -39,7 +39,7 @@ fi for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; echo "Selecting SDK path = ${SYSROOT_PATH}" -COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS" +COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions" CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" OBJC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS" diff --git a/submodules/externals/antlr3 b/submodules/externals/antlr3 new file mode 160000 index 000000000..5ed4fec73 --- /dev/null +++ b/submodules/externals/antlr3 @@ -0,0 +1 @@ +Subproject commit 5ed4fec737f88c69da3192871fb2553bffe46bfa diff --git a/submodules/externals/libantlr3c b/submodules/externals/libantlr3c new file mode 160000 index 000000000..eb738fb40 --- /dev/null +++ b/submodules/externals/libantlr3c @@ -0,0 +1 @@ +Subproject commit eb738fb406d2b75e7e94457da800c38d8bfc3c71 diff --git a/submodules/libantlr3c b/submodules/libantlr3c new file mode 160000 index 000000000..eb738fb40 --- /dev/null +++ b/submodules/libantlr3c @@ -0,0 +1 @@ +Subproject commit eb738fb406d2b75e7e94457da800c38d8bfc3c71 diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 5b7ff9953..9e9444f17 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -16,20 +16,15 @@ 220ED1A313A903BF00AC21E0 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A213A903BF00AC21E0 /* libgsm.a */; }; 220ED1A713A9040700AC21E0 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A613A9040700AC21E0 /* AudioToolbox.framework */; }; 220ED1A913A9041800AC21E0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A813A9041800AC21E0 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Required, ); }; }; - 220ED1AC13A9062600AC21E0 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; }; 2211DB9F14765CED00DEE054 /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB9E14765CEC00DEE054 /* libmssilk.a */; }; 2211DBA1147660BB00DEE054 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; - 221DCB4D1529E2EB0025E54D /* msiounit.m in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60511F6CF7600621220 /* msiounit.m */; }; 221DCB561529FE660025E54D /* linphonecall.c in Sources */ = {isa = PBXBuildFile; fileRef = 225D3559124B1FF60008581C /* linphonecall.c */; }; 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */ = {isa = PBXBuildFile; fileRef = 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */; }; - 221DCB6815347EF80025E54D /* opengles_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6715347EF80025E54D /* opengles_display.c */; }; - 221DCB6915347EF80025E54D /* opengles_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6715347EF80025E54D /* opengles_display.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 */; }; - 221F58E413AF44B300D603C9 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; }; 222CA63211F6CF7600621220 /* allfilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BE11F6CF7600621220 /* allfilters.h */; }; 222CA63311F6CF7600621220 /* dsptools.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BF11F6CF7600621220 /* dsptools.h */; }; 222CA63411F6CF7600621220 /* dtmfgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C011F6CF7600621220 /* dtmfgen.h */; }; @@ -58,13 +53,6 @@ 222CA64B11F6CF7600621220 /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; 222CA64C11F6CF7600621220 /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; 222CA64D11F6CF7600621220 /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; - 222CA64E11F6CF7600621220 /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */; }; - 222CA65E11F6CF7600621220 /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */; }; - 222CA65F11F6CF7600621220 /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EF11F6CF7600621220 /* g711common.h */; }; - 222CA66511F6CF7600621220 /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F511F6CF7600621220 /* kiss_fft.h */; }; - 222CA66711F6CF7600621220 /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F711F6CF7600621220 /* kiss_fftr.h */; }; - 222CA68811F6CF7600621220 /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA61B11F6CF7600621220 /* rfc2429.h */; }; - 222CA69111F6CF7600621220 /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA62411F6CF7600621220 /* vfw-missing.h */; }; 222CA6F411F6CF9F00621220 /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; 222CA6F511F6CF9F00621220 /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; 222CA6F611F6CF9F00621220 /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; @@ -105,20 +93,201 @@ 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 */; }; - 222CA77E11F6CFB100621220 /* sal_eXosip2.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75C11F6CFB100621220 /* sal_eXosip2.c */; }; - 222CA77F11F6CFB100621220 /* sal_eXosip2.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75D11F6CFB100621220 /* sal_eXosip2.h */; }; - 222CA78011F6CFB100621220 /* sal_eXosip2_presence.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75E11F6CFB100621220 /* sal_eXosip2_presence.c */; }; - 222CA78111F6CFB100621220 /* sal_eXosip2_sdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75F11F6CFB100621220 /* sal_eXosip2_sdp.c */; }; 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 */; }; + 223CA88A16D9268D00EF1BEC /* msfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81416D9268D00EF1BEC /* msfilter.c */; }; + 223CA88B16D9268D00EF1BEC /* msqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81516D9268D00EF1BEC /* msqueue.c */; }; + 223CA88C16D9268D00EF1BEC /* mssndcard.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81616D9268D00EF1BEC /* mssndcard.c */; }; + 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 */; }; + 223CA8E616D9298F00EF1BEC /* sal_op_call.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8DC16D9298F00EF1BEC /* sal_op_call.c */; }; + 223CA8E716D9298F00EF1BEC /* sal_op_call_transfer.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8DD16D9298F00EF1BEC /* sal_op_call_transfer.c */; }; + 223CA8E816D9298F00EF1BEC /* sal_op_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8DE16D9298F00EF1BEC /* sal_op_impl.c */; }; + 223CA8E916D9298F00EF1BEC /* sal_op_message.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8DF16D9298F00EF1BEC /* sal_op_message.c */; }; + 223CA8EA16D9298F00EF1BEC /* sal_op_presence.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8E016D9298F00EF1BEC /* sal_op_presence.c */; }; + 223CA8EB16D9298F00EF1BEC /* sal_op_registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8E116D9298F00EF1BEC /* sal_op_registration.c */; }; + 223CA8EC16D9298F00EF1BEC /* sal_sdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA8E216D9298F00EF1BEC /* sal_sdp.c */; }; + 223CA8EF16DA10AB00EF1BEC /* liblinphone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */; }; + 223CA8F016DA10AB00EF1BEC /* allfilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BE11F6CF7600621220 /* allfilters.h */; }; + 223CA8F116DA10AB00EF1BEC /* dsptools.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BF11F6CF7600621220 /* dsptools.h */; }; + 223CA8F216DA10AB00EF1BEC /* dtmfgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C011F6CF7600621220 /* dtmfgen.h */; }; + 223CA8F316DA10AB00EF1BEC /* ice.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C111F6CF7600621220 /* ice.h */; }; + 223CA8F416DA10AB00EF1BEC /* mediastream.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C411F6CF7600621220 /* mediastream.h */; }; + 223CA8F516DA10AB00EF1BEC /* msaudiomixer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C511F6CF7600621220 /* msaudiomixer.h */; }; + 223CA8F616DA10AB00EF1BEC /* mschanadapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C611F6CF7600621220 /* mschanadapter.h */; }; + 223CA8F716DA10AB00EF1BEC /* mscommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C711F6CF7600621220 /* mscommon.h */; }; + 223CA8F816DA10AB00EF1BEC /* msequalizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C811F6CF7600621220 /* msequalizer.h */; }; + 223CA8F916DA10AB00EF1BEC /* mseventqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C911F6CF7600621220 /* mseventqueue.h */; }; + 223CA8FA16DA10AB00EF1BEC /* msextdisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CA11F6CF7600621220 /* msextdisplay.h */; }; + 223CA8FB16DA10AB00EF1BEC /* msfileplayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CB11F6CF7600621220 /* msfileplayer.h */; }; + 223CA8FC16DA10AB00EF1BEC /* msfilerec.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CC11F6CF7600621220 /* msfilerec.h */; }; + 223CA8FD16DA10AB00EF1BEC /* msfilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CD11F6CF7600621220 /* msfilter.h */; }; + 223CA8FE16DA10AB00EF1BEC /* msinterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CE11F6CF7600621220 /* msinterfaces.h */; }; + 223CA8FF16DA10AB00EF1BEC /* msitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5CF11F6CF7600621220 /* msitc.h */; }; + 223CA90016DA10AB00EF1BEC /* msqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D011F6CF7600621220 /* msqueue.h */; }; + 223CA90116DA10AB00EF1BEC /* msrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D111F6CF7600621220 /* msrtp.h */; }; + 223CA90216DA10AB00EF1BEC /* mssndcard.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D211F6CF7600621220 /* mssndcard.h */; }; + 223CA90316DA10AB00EF1BEC /* mstee.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D311F6CF7600621220 /* mstee.h */; }; + 223CA90416DA10AB00EF1BEC /* msticker.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D411F6CF7600621220 /* msticker.h */; }; + 223CA90516DA10AB00EF1BEC /* msv4l.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D511F6CF7600621220 /* msv4l.h */; }; + 223CA90616DA10AB00EF1BEC /* msvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D611F6CF7600621220 /* msvideo.h */; }; + 223CA90716DA10AB00EF1BEC /* msvideoout.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D711F6CF7600621220 /* msvideoout.h */; }; + 223CA90816DA10AB00EF1BEC /* msvolume.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D811F6CF7600621220 /* msvolume.h */; }; + 223CA90916DA10AB00EF1BEC /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; + 223CA90A16DA10AB00EF1BEC /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; + 223CA90B16DA10AB00EF1BEC /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; + 223CA90C16DA10AB00EF1BEC /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; + 223CA90D16DA10AB00EF1BEC /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; + 223CA90E16DA10AB00EF1BEC /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; + 223CA90F16DA10AB00EF1BEC /* payloadtype.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AA11F6CF9F00621220 /* payloadtype.h */; }; + 223CA91016DA10AB00EF1BEC /* port.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AB11F6CF9F00621220 /* port.h */; }; + 223CA91116DA10AB00EF1BEC /* rtcp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AC11F6CF9F00621220 /* rtcp.h */; }; + 223CA91216DA10AB00EF1BEC /* rtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AD11F6CF9F00621220 /* rtp.h */; }; + 223CA91316DA10AB00EF1BEC /* rtpsession.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AE11F6CF9F00621220 /* rtpsession.h */; }; + 223CA91416DA10AB00EF1BEC /* rtpsignaltable.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6AF11F6CF9F00621220 /* rtpsignaltable.h */; }; + 223CA91516DA10AB00EF1BEC /* sessionset.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B011F6CF9F00621220 /* sessionset.h */; }; + 223CA91616DA10AB00EF1BEC /* srtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B111F6CF9F00621220 /* srtp.h */; }; + 223CA91716DA10AB00EF1BEC /* str_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B211F6CF9F00621220 /* str_utils.h */; }; + 223CA91816DA10AB00EF1BEC /* stun.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B311F6CF9F00621220 /* stun.h */; }; + 223CA91916DA10AB00EF1BEC /* stun_udp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B411F6CF9F00621220 /* stun_udp.h */; }; + 223CA91A16DA10AB00EF1BEC /* telephonyevents.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6B511F6CF9F00621220 /* telephonyevents.h */; }; + 223CA91B16DA10AB00EF1BEC /* jitterctl.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6BD11F6CF9F00621220 /* jitterctl.h */; }; + 223CA91C16DA10AB00EF1BEC /* ortp-config-win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6C111F6CF9F00621220 /* ortp-config-win32.h */; }; + 223CA91D16DA10AB00EF1BEC /* rtpsession_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6CB11F6CF9F00621220 /* rtpsession_priv.h */; }; + 223CA91E16DA10AB00EF1BEC /* rtptimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6CE11F6CF9F00621220 /* rtptimer.h */; }; + 223CA91F16DA10AB00EF1BEC /* scheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6D011F6CF9F00621220 /* scheduler.h */; }; + 223CA92016DA10AB00EF1BEC /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6F311F6CF9F00621220 /* utils.h */; }; + 223CA92116DA10AB00EF1BEC /* enum.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA73411F6CFB100621220 /* enum.h */; }; + 223CA92216DA10AB00EF1BEC /* linphonecore.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA74011F6CFB100621220 /* linphonecore.h */; }; + 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 */; }; + 223CA92A16DA10AB00EF1BEC /* private.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5211F84E2D00373793 /* private.h */; }; + 223CA92B16DA10AB00EF1BEC /* proto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5311F84E2D00373793 /* proto.h */; }; + 223CA92C16DA10AB00EF1BEC /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; + 223CA92D16DA10AB00EF1BEC /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; + 223CA92E16DA10AB00EF1BEC /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; + 223CA92F16DA10AB00EF1BEC /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; + 223CA93116DA10AB00EF1BEC /* avprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6B811F6CF9F00621220 /* avprofile.c */; }; + 223CA93216DA10AB00EF1BEC /* b64.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6B911F6CF9F00621220 /* b64.c */; }; + 223CA93316DA10AB00EF1BEC /* event.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6BB11F6CF9F00621220 /* event.c */; }; + 223CA93416DA10AB00EF1BEC /* jitterctl.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6BC11F6CF9F00621220 /* jitterctl.c */; }; + 223CA93516DA10AB00EF1BEC /* ortp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C211F6CF9F00621220 /* ortp.c */; }; + 223CA93616DA10AB00EF1BEC /* payloadtype.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C311F6CF9F00621220 /* payloadtype.c */; }; + 223CA93716DA10AB00EF1BEC /* port.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C411F6CF9F00621220 /* port.c */; }; + 223CA93816DA10AB00EF1BEC /* posixtimer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C511F6CF9F00621220 /* posixtimer.c */; }; + 223CA93916DA10AB00EF1BEC /* rtcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C611F6CF9F00621220 /* rtcp.c */; }; + 223CA93A16DA10AB00EF1BEC /* rtcpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C711F6CF9F00621220 /* rtcpparse.c */; }; + 223CA93B16DA10AB00EF1BEC /* rtpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C811F6CF9F00621220 /* rtpparse.c */; }; + 223CA93C16DA10AB00EF1BEC /* rtpsession.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6C911F6CF9F00621220 /* rtpsession.c */; }; + 223CA93D16DA10AB00EF1BEC /* rtpsession_inet.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6CA11F6CF9F00621220 /* rtpsession_inet.c */; }; + 223CA93E16DA10AB00EF1BEC /* rtpsignaltable.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6CC11F6CF9F00621220 /* rtpsignaltable.c */; }; + 223CA93F16DA10AB00EF1BEC /* rtptimer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6CD11F6CF9F00621220 /* rtptimer.c */; }; + 223CA94016DA10AB00EF1BEC /* scheduler.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6CF11F6CF9F00621220 /* scheduler.c */; }; + 223CA94116DA10AB00EF1BEC /* sessionset.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D111F6CF9F00621220 /* sessionset.c */; }; + 223CA94216DA10AB00EF1BEC /* str_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D311F6CF9F00621220 /* str_utils.c */; }; + 223CA94316DA10AB00EF1BEC /* stun.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D411F6CF9F00621220 /* stun.c */; }; + 223CA94416DA10AB00EF1BEC /* stun_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D511F6CF9F00621220 /* stun_udp.c */; }; + 223CA94516DA10AB00EF1BEC /* telephonyevents.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6D711F6CF9F00621220 /* telephonyevents.c */; }; + 223CA94616DA10AB00EF1BEC /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6F211F6CF9F00621220 /* utils.c */; }; + 223CA94716DA10AB00EF1BEC /* zrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 7014533D13FA841E00A01D86 /* zrtp.c */; }; + 223CA94816DA10AB00EF1BEC /* netsim.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F23D145710540035B0D0 /* netsim.c */; }; + 223CA94916DA10AB00EF1BEC /* ortp_srtp.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F23E145710540035B0D0 /* ortp_srtp.c */; }; + 223CA94A16DA10AB00EF1BEC /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE31600671D00B92522 /* logging.c */; }; + 223CA94B16DA10AB00EF1BEC /* rtpprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE41600671D00B92522 /* rtpprofile.c */; }; + 223CA94D16DA10AB00EF1BEC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; + 223CA94E16DA10AB00EF1BEC /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; 22405EDD160065C200B92522 /* basedescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EDC160065C200B92522 /* basedescs.h */; }; - 22405EE01600668800B92522 /* msvoip.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EDF1600668800B92522 /* msvoip.c */; }; 22405EE2160066C700B92522 /* voipdescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EE1160066C700B92522 /* voipdescs.h */; }; 22405EE51600671D00B92522 /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE31600671D00B92522 /* logging.c */; }; 22405EE61600671D00B92522 /* rtpprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE41600671D00B92522 /* rtpprofile.c */; }; - 22405EE81600675C00B92522 /* genericplc.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE71600675C00B92522 /* genericplc.c */; }; - 2258C44113A9377B0087A596 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; }; 2258C44513A945520087A596 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44213A945520087A596 /* libswscale.a */; }; 2258C44613A945520087A596 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44313A945520087A596 /* libavutil.a */; }; 2258C44713A945520087A596 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44413A945520087A596 /* libavcodec.a */; }; @@ -151,13 +320,6 @@ 225D64491521BFA6008B2E81 /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; 225D644A1521BFA6008B2E81 /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; 225D644B1521BFA6008B2E81 /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; - 225D644C1521BFA6008B2E81 /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */; }; - 225D644D1521BFA6008B2E81 /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */; }; - 225D644E1521BFA6008B2E81 /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EF11F6CF7600621220 /* g711common.h */; }; - 225D644F1521BFA6008B2E81 /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F511F6CF7600621220 /* kiss_fft.h */; }; - 225D64501521BFA6008B2E81 /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F711F6CF7600621220 /* kiss_fftr.h */; }; - 225D64511521BFA6008B2E81 /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA61B11F6CF7600621220 /* rfc2429.h */; }; - 225D64521521BFA6008B2E81 /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA62411F6CF7600621220 /* vfw-missing.h */; }; 225D64531521BFA6008B2E81 /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; 225D64541521BFA6008B2E81 /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; 225D64551521BFA6008B2E81 /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; @@ -185,7 +347,6 @@ 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 */; }; - 225D646E1521BFA6008B2E81 /* sal_eXosip2.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75D11F6CFB100621220 /* sal_eXosip2.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 */; }; @@ -194,79 +355,12 @@ 225D64741521BFA6008B2E81 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; 225D64751521BFA6008B2E81 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; 225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; - 225D64781521BFA6008B2E81 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; }; - 225D64791521BFA6008B2E81 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; }; - 225D647B1521BFA6008B2E81 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; }; - 225D647C1521BFA6008B2E81 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; }; - 225D647D1521BFA6008B2E81 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; }; 225D64811521BFA6008B2E81 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; - 225D64831521BFA6008B2E81 /* alaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5DF11F6CF7600621220 /* alaw.c */; }; - 225D64841521BFA6008B2E81 /* audiomixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E311F6CF7600621220 /* audiomixer.c */; }; - 225D64851521BFA6008B2E81 /* audiostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E411F6CF7600621220 /* audiostream.c */; }; - 225D64861521BFA6008B2E81 /* chanadapt.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E511F6CF7600621220 /* chanadapt.c */; }; - 225D64871521BFA6008B2E81 /* dsptools.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E711F6CF7600621220 /* dsptools.c */; }; - 225D64881521BFA6008B2E81 /* dtmfgen.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E811F6CF7600621220 /* dtmfgen.c */; }; - 225D64891521BFA6008B2E81 /* equalizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5EB11F6CF7600621220 /* equalizer.c */; }; - 225D648A1521BFA6008B2E81 /* eventqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5EC11F6CF7600621220 /* eventqueue.c */; }; - 225D648B1521BFA6008B2E81 /* extdisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5ED11F6CF7600621220 /* extdisplay.c */; }; - 225D648C1521BFA6008B2E81 /* gsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F011F6CF7600621220 /* gsm.c */; }; - 225D648D1521BFA6008B2E81 /* ice.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F211F6CF7600621220 /* ice.c */; }; - 225D648E1521BFA6008B2E81 /* itc.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F311F6CF7600621220 /* itc.c */; }; - 225D648F1521BFA6008B2E81 /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F411F6CF7600621220 /* kiss_fft.c */; }; - 225D64901521BFA6008B2E81 /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F611F6CF7600621220 /* kiss_fftr.c */; }; - 225D64911521BFA6008B2E81 /* mire.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5FB11F6CF7600621220 /* mire.c */; }; - 225D64921521BFA6008B2E81 /* mscommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5FD11F6CF7600621220 /* mscommon.c */; }; - 225D64931521BFA6008B2E81 /* msconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5FE11F6CF7600621220 /* msconf.c */; }; - 225D64941521BFA6008B2E81 /* msfileplayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60011F6CF7600621220 /* msfileplayer.c */; }; - 225D64951521BFA6008B2E81 /* msfilerec.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60211F6CF7600621220 /* msfilerec.c */; }; - 225D64961521BFA6008B2E81 /* msfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60411F6CF7600621220 /* msfilter.c */; }; - 225D64981521BFA6008B2E81 /* msjoin.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60611F6CF7600621220 /* msjoin.c */; }; - 225D64991521BFA6008B2E81 /* msqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60711F6CF7600621220 /* msqueue.c */; }; - 225D649A1521BFA6008B2E81 /* msresample.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60811F6CF7600621220 /* msresample.c */; }; - 225D649B1521BFA6008B2E81 /* msrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60911F6CF7600621220 /* msrtp.c */; }; - 225D649C1521BFA6008B2E81 /* mssndcard.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60A11F6CF7600621220 /* mssndcard.c */; }; - 225D649D1521BFA6008B2E81 /* msspeex.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60B11F6CF7600621220 /* msspeex.c */; }; - 225D649E1521BFA6008B2E81 /* msticker.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60C11F6CF7600621220 /* msticker.c */; }; - 225D649F1521BFA6008B2E81 /* msvolume.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61111F6CF7600621220 /* msvolume.c */; }; - 225D64A01521BFA6008B2E81 /* mtu.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61311F6CF7600621220 /* mtu.c */; }; - 225D64A11521BFA6008B2E81 /* rfc3984.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61C11F6CF7600621220 /* rfc3984.c */; }; - 225D64A21521BFA6008B2E81 /* speexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61F11F6CF7600621220 /* speexec.c */; }; - 225D64A31521BFA6008B2E81 /* tee.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA62111F6CF7600621220 /* tee.c */; }; - 225D64A41521BFA6008B2E81 /* ulaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA62311F6CF7600621220 /* ulaw.c */; }; - 225D64A51521BFA6008B2E81 /* void.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA62911F6CF7600621220 /* void.c */; }; 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 */; }; - 225D64CE1521BFA6008B2E81 /* mswebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 22A10EE711F8920F00373793 /* mswebcam.c */; }; - 225D64D11521BFA6008B2E81 /* ioscapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D15AB3139F505400C7713A /* ioscapture.m */; }; - 225D64D21521BFA6008B2E81 /* iosdisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 2203127113A247B40049A2ED /* iosdisplay.m */; }; 225D64D31521BFA6008B2E81 /* filter-template.c in Sources */ = {isa = PBXBuildFile; fileRef = 2203127413A249F70049A2ED /* filter-template.c */; }; - 225D64D41521BFA6008B2E81 /* nowebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 220ED1AB13A9062500AC21E0 /* nowebcam.c */; }; - 225D64D51521BFA6008B2E81 /* videostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 2258C44813A946890087A596 /* videostream.c */; }; - 225D64D61521BFA6008B2E81 /* videoenc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2258C44913A946890087A596 /* videoenc.c */; }; - 225D64D71521BFA6008B2E81 /* videodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 2258C44A13A946890087A596 /* videodec.c */; }; - 225D64D81521BFA6008B2E81 /* msvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F589B13AB4FC500D603C9 /* msvideo.c */; }; - 225D64D91521BFA6008B2E81 /* pixconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A113AB6F8000D603C9 /* pixconv.c */; }; - 225D64DA1521BFA6008B2E81 /* tonedetector.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A513AB716300D603C9 /* tonedetector.c */; }; - 225D64DB1521BFA6008B2E81 /* jpegwriter.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A613AB716300D603C9 /* jpegwriter.c */; }; - 225D64DC1521BFA6008B2E81 /* h264dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A713AB716300D603C9 /* h264dec.c */; }; - 225D64DD1521BFA6008B2E81 /* sizeconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58AB13AB71A400D603C9 /* sizeconv.c */; }; - 225D64DE1521BFA6008B2E81 /* scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58AD13ABA42800D603C9 /* scaler.c */; }; - 225D64DF1521BFA6008B2E81 /* qualityindicator.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */; }; - 225D64E01521BFA6008B2E81 /* bitratecontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */; }; - 225D64E11521BFA6008B2E81 /* g722_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614913DDFE3500090183 /* g722_decode.c */; }; - 225D64E21521BFA6008B2E81 /* g722_encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614A13DDFE3500090183 /* g722_encode.c */; }; - 225D64E31521BFA6008B2E81 /* msg722.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614C13DDFE3500090183 /* msg722.c */; }; - 225D64E41521BFA6008B2E81 /* vp8.c in Sources */ = {isa = PBXBuildFile; fileRef = 7066FC0613E82A3600EFC6DC /* vp8.c */; }; - 225D64E61521BFA6008B2E81 /* shaders.c in Sources */ = {isa = PBXBuildFile; fileRef = 7014533713FA7AEA00A01D86 /* shaders.c */; }; - 225D64E81521BFA6008B2E81 /* msvideo_neon.c in Sources */ = {isa = PBXBuildFile; fileRef = 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */; }; - 225D64E91521BFA6008B2E81 /* conference.c in Sources */ = {isa = PBXBuildFile; fileRef = 229ECDEC143AEBDA00D611B8 /* conference.c */; }; - 225D64EA1521BFA6008B2E81 /* audioconference.c in Sources */ = {isa = PBXBuildFile; fileRef = 229ECDEE143AEC2400D611B8 /* audioconference.c */; }; - 225D64ED1521BFA6008B2E81 /* bitratedriver.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F25E14583B580035B0D0 /* bitratedriver.c */; }; - 225D64EE1521BFA6008B2E81 /* qosanalyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F25F14583B580035B0D0 /* qosanalyzer.c */; }; - 225D64EF1521BFA6008B2E81 /* aqsnd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22512698145F13CE0041FBF2 /* aqsnd.c */; }; - 225D64F01521BFA6008B2E81 /* l16.c in Sources */ = {isa = PBXBuildFile; fileRef = 2211DB9B1476539600DEE054 /* l16.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 */; }; @@ -298,13 +392,6 @@ 225D65161521C009008B2E81 /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; 225D65171521C009008B2E81 /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; 225D65181521C009008B2E81 /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; - 225D65191521C009008B2E81 /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */; }; - 225D651A1521C009008B2E81 /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */; }; - 225D651B1521C009008B2E81 /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EF11F6CF7600621220 /* g711common.h */; }; - 225D651C1521C009008B2E81 /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F511F6CF7600621220 /* kiss_fft.h */; }; - 225D651D1521C009008B2E81 /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F711F6CF7600621220 /* kiss_fftr.h */; }; - 225D651E1521C009008B2E81 /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA61B11F6CF7600621220 /* rfc2429.h */; }; - 225D651F1521C009008B2E81 /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA62411F6CF7600621220 /* vfw-missing.h */; }; 225D65201521C009008B2E81 /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; 225D65211521C009008B2E81 /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; 225D65221521C009008B2E81 /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; @@ -332,7 +419,6 @@ 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 */; }; - 225D653B1521C009008B2E81 /* sal_eXosip2.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75D11F6CFB100621220 /* sal_eXosip2.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 */; }; @@ -341,11 +427,6 @@ 225D65411521C009008B2E81 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; 225D65421521C009008B2E81 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; 225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; - 225D65451521C009008B2E81 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; }; - 225D65461521C009008B2E81 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; }; - 225D65481521C009008B2E81 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; }; - 225D65491521C009008B2E81 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; }; - 225D654A1521C009008B2E81 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; }; 225D654E1521C009008B2E81 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; 225D65731521C009008B2E81 /* avprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6B811F6CF9F00621220 /* avprofile.c */; }; 225D65741521C009008B2E81 /* b64.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6B911F6CF9F00621220 /* b64.c */; }; @@ -376,7 +457,6 @@ 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 */; }; 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225D65C51521C009008B2E81 /* libortp.a */; }; - 229A614F13DDFE3500090183 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; }; 229A615313DEE8A500090183 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 229A615113DEE8A400090183 /* libx264.a */; }; 229A615413DEE8A500090183 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 229A615213DEE8A400090183 /* libmsx264.a */; }; 229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; @@ -387,7 +467,6 @@ 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 */; }; - 22B5106913B060E100CD87DA /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */; }; 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 */; }; @@ -401,7 +480,6 @@ 7066FC0A13E830B800EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0913E830B800EFC6DC /* libvpx.a */; }; 70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */; }; 70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F013E147CE002BA2C0 /* QuartzCore.framework */; }; - 70E542FA13E14816002BA2C0 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; }; AA747D9F0F9514B9006C5449 /* liblinphone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */; }; AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; /* End PBXBuildFile section */ @@ -445,7 +523,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2203127113A247B40049A2ED /* iosdisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iosdisplay.m; sourceTree = ""; }; 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; 220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 220ED19813A8F87700AC21E0 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; @@ -456,25 +533,13 @@ 220ED1A413A903E100AC21E0 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 220ED1A613A9040700AC21E0 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 220ED1A813A9041800AC21E0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; - 220ED1AA13A9062500AC21E0 /* nowebcam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nowebcam.h; sourceTree = ""; }; - 220ED1AB13A9062500AC21E0 /* nowebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nowebcam.c; sourceTree = ""; }; - 2211DB9B1476539600DEE054 /* l16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l16.c; sourceTree = ""; }; 2211DB9E14765CEC00DEE054 /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "../liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = ""; }; - 221DCB6715347EF80025E54D /* opengles_display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opengles_display.c; sourceTree = ""; }; 221DCB6A153584410025E54D /* yuv2rgb.fs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = yuv2rgb.fs; sourceTree = ""; }; 221DCB6B153584410025E54D /* yuv2rgb.vs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = yuv2rgb.vs; sourceTree = ""; }; 221F589913AB4EEE00D603C9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - 221F589B13AB4FC500D603C9 /* msvideo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo.c; sourceTree = ""; }; 221F589D13AB503F00D603C9 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 221F589F13AB50F800D603C9 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; - 221F58A113AB6F8000D603C9 /* pixconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pixconv.c; sourceTree = ""; }; - 221F58A513AB716300D603C9 /* tonedetector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonedetector.c; sourceTree = ""; }; - 221F58A613AB716300D603C9 /* jpegwriter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpegwriter.c; sourceTree = ""; }; - 221F58A713AB716300D603C9 /* h264dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = h264dec.c; sourceTree = ""; }; - 221F58AB13AB71A400D603C9 /* sizeconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sizeconv.c; sourceTree = ""; }; - 221F58AD13ABA42800D603C9 /* scaler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scaler.c; sourceTree = ""; }; - 221F58E313AF44B300D603C9 /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scaler.h; sourceTree = ""; }; 222CA5B911F6CF7600621220 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; 222CA5BA11F6CF7600621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 222CA5BB11F6CF7600621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; @@ -510,50 +575,8 @@ 222CA5DA11F6CF7600621220 /* rfc3984.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfc3984.h; sourceTree = ""; }; 222CA5DB11F6CF7600621220 /* waveheader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = waveheader.h; sourceTree = ""; }; 222CA5DD11F6CF7600621220 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; - 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _kiss_fft_guts.h; sourceTree = ""; }; - 222CA5DF11F6CF7600621220 /* alaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alaw.c; sourceTree = ""; }; - 222CA5E311F6CF7600621220 /* audiomixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiomixer.c; sourceTree = ""; }; - 222CA5E411F6CF7600621220 /* audiostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiostream.c; sourceTree = ""; }; - 222CA5E511F6CF7600621220 /* chanadapt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chanadapt.c; sourceTree = ""; }; - 222CA5E711F6CF7600621220 /* dsptools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsptools.c; sourceTree = ""; }; - 222CA5E811F6CF7600621220 /* dtmfgen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dtmfgen.c; sourceTree = ""; }; - 222CA5EB11F6CF7600621220 /* equalizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = equalizer.c; sourceTree = ""; }; - 222CA5EC11F6CF7600621220 /* eventqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventqueue.c; sourceTree = ""; }; - 222CA5ED11F6CF7600621220 /* extdisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = extdisplay.c; sourceTree = ""; }; - 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ffmpeg-priv.h"; sourceTree = ""; }; - 222CA5EF11F6CF7600621220 /* g711common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g711common.h; sourceTree = ""; }; - 222CA5F011F6CF7600621220 /* gsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gsm.c; sourceTree = ""; }; - 222CA5F211F6CF7600621220 /* ice.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ice.c; sourceTree = ""; }; - 222CA5F311F6CF7600621220 /* itc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = itc.c; sourceTree = ""; }; - 222CA5F411F6CF7600621220 /* kiss_fft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fft.c; sourceTree = ""; }; - 222CA5F511F6CF7600621220 /* kiss_fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fft.h; sourceTree = ""; }; - 222CA5F611F6CF7600621220 /* kiss_fftr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fftr.c; sourceTree = ""; }; - 222CA5F711F6CF7600621220 /* kiss_fftr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fftr.h; sourceTree = ""; }; 222CA5F911F6CF7600621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 222CA5FA11F6CF7600621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; - 222CA5FB11F6CF7600621220 /* mire.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mire.c; sourceTree = ""; }; - 222CA5FD11F6CF7600621220 /* mscommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mscommon.c; sourceTree = ""; }; - 222CA5FE11F6CF7600621220 /* msconf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msconf.c; sourceTree = ""; }; - 222CA60011F6CF7600621220 /* msfileplayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfileplayer.c; sourceTree = ""; }; - 222CA60211F6CF7600621220 /* msfilerec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilerec.c; sourceTree = ""; }; - 222CA60411F6CF7600621220 /* msfilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilter.c; sourceTree = ""; }; - 222CA60511F6CF7600621220 /* msiounit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = msiounit.m; sourceTree = ""; }; - 222CA60611F6CF7600621220 /* msjoin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msjoin.c; sourceTree = ""; }; - 222CA60711F6CF7600621220 /* msqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msqueue.c; sourceTree = ""; }; - 222CA60811F6CF7600621220 /* msresample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msresample.c; sourceTree = ""; }; - 222CA60911F6CF7600621220 /* msrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msrtp.c; sourceTree = ""; }; - 222CA60A11F6CF7600621220 /* mssndcard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mssndcard.c; sourceTree = ""; }; - 222CA60B11F6CF7600621220 /* msspeex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msspeex.c; sourceTree = ""; }; - 222CA60C11F6CF7600621220 /* msticker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msticker.c; sourceTree = ""; }; - 222CA61111F6CF7600621220 /* msvolume.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvolume.c; sourceTree = ""; }; - 222CA61311F6CF7600621220 /* mtu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mtu.c; sourceTree = ""; }; - 222CA61B11F6CF7600621220 /* rfc2429.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfc2429.h; sourceTree = ""; }; - 222CA61C11F6CF7600621220 /* rfc3984.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rfc3984.c; sourceTree = ""; }; - 222CA61F11F6CF7600621220 /* speexec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speexec.c; sourceTree = ""; }; - 222CA62111F6CF7600621220 /* tee.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tee.c; sourceTree = ""; }; - 222CA62311F6CF7600621220 /* ulaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ulaw.c; sourceTree = ""; }; - 222CA62411F6CF7600621220 /* vfw-missing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "vfw-missing.h"; sourceTree = ""; }; - 222CA62911F6CF7600621220 /* void.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = void.c; sourceTree = ""; }; 222CA6A011F6CF9E00621220 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; 222CA6A111F6CF9E00621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 222CA6A211F6CF9F00621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; @@ -633,42 +656,120 @@ 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 = ""; }; - 222CA75C11F6CFB100621220 /* sal_eXosip2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2.c; sourceTree = ""; }; - 222CA75D11F6CFB100621220 /* sal_eXosip2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sal_eXosip2.h; sourceTree = ""; }; - 222CA75E11F6CFB100621220 /* sal_eXosip2_presence.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2_presence.c; sourceTree = ""; }; - 222CA75F11F6CFB100621220 /* sal_eXosip2_sdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2_sdp.c; 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 = ""; }; - 22313679143DED490035C1F4 /* msandroidvideo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = msandroidvideo.cpp; sourceTree = ""; }; + 223CA7F016D9268D00EF1BEC /* alaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alaw.c; sourceTree = ""; }; + 223CA7F216D9268D00EF1BEC /* aqsnd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aqsnd.c; sourceTree = ""; }; + 223CA7F416D9268D00EF1BEC /* audiomixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiomixer.c; sourceTree = ""; }; + 223CA7F516D9268D00EF1BEC /* chanadapt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chanadapt.c; sourceTree = ""; }; + 223CA7F616D9268D00EF1BEC /* dtmfgen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dtmfgen.c; sourceTree = ""; }; + 223CA7F716D9268D00EF1BEC /* equalizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = equalizer.c; sourceTree = ""; }; + 223CA7F916D9268D00EF1BEC /* genericplc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genericplc.c; sourceTree = ""; }; + 223CA7FA16D9268D00EF1BEC /* gsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gsm.c; sourceTree = ""; }; + 223CA7FB16D9268D00EF1BEC /* l16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l16.c; sourceTree = ""; }; + 223CA7FD16D9268D00EF1BEC /* msconf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msconf.c; sourceTree = ""; }; + 223CA7FE16D9268D00EF1BEC /* msfileplayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfileplayer.c; sourceTree = ""; }; + 223CA7FF16D9268D00EF1BEC /* msfilerec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilerec.c; sourceTree = ""; }; + 223CA80016D9268D00EF1BEC /* msg722.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msg722.c; sourceTree = ""; }; + 223CA80116D9268D00EF1BEC /* msiounit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = msiounit.m; sourceTree = ""; }; + 223CA80216D9268D00EF1BEC /* msresample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msresample.c; sourceTree = ""; }; + 223CA80316D9268D00EF1BEC /* msspeex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msspeex.c; sourceTree = ""; }; + 223CA80416D9268D00EF1BEC /* msvolume.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvolume.c; sourceTree = ""; }; + 223CA80916D9268D00EF1BEC /* tonedetector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonedetector.c; sourceTree = ""; }; + 223CA80A16D9268D00EF1BEC /* ulaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ulaw.c; sourceTree = ""; }; + 223CA80B16D9268D00EF1BEC /* waveheader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = waveheader.h; sourceTree = ""; }; + 223CA81216D9268D00EF1BEC /* eventqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventqueue.c; sourceTree = ""; }; + 223CA81316D9268D00EF1BEC /* mscommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mscommon.c; sourceTree = ""; }; + 223CA81416D9268D00EF1BEC /* msfilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilter.c; sourceTree = ""; }; + 223CA81516D9268D00EF1BEC /* msqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msqueue.c; sourceTree = ""; }; + 223CA81616D9268D00EF1BEC /* mssndcard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mssndcard.c; sourceTree = ""; }; + 223CA81716D9268D00EF1BEC /* msticker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msticker.c; sourceTree = ""; }; + 223CA81816D9268D00EF1BEC /* mswebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mswebcam.c; sourceTree = ""; }; + 223CA81916D9268D00EF1BEC /* mtu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mtu.c; sourceTree = ""; }; + 223CA81B16D9268D00EF1BEC /* itc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = itc.c; sourceTree = ""; }; + 223CA81C16D9268D00EF1BEC /* join.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = join.c; sourceTree = ""; }; + 223CA81D16D9268D00EF1BEC /* msrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msrtp.c; sourceTree = ""; }; + 223CA81E16D9268D00EF1BEC /* tee.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tee.c; sourceTree = ""; }; + 223CA81F16D9268D00EF1BEC /* void.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = void.c; sourceTree = ""; }; + 223CA82116D9268D00EF1BEC /* _kiss_fft_guts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _kiss_fft_guts.h; sourceTree = ""; }; + 223CA82216D9268D00EF1BEC /* dsptools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsptools.c; sourceTree = ""; }; + 223CA82316D9268D00EF1BEC /* ffmpeg-priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ffmpeg-priv.h"; sourceTree = ""; }; + 223CA82416D9268D00EF1BEC /* g711common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g711common.h; sourceTree = ""; }; + 223CA82516D9268D00EF1BEC /* g722.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g722.h; sourceTree = ""; }; + 223CA82616D9268D00EF1BEC /* g722_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_decode.c; sourceTree = ""; }; + 223CA82716D9268D00EF1BEC /* g722_encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_encode.c; sourceTree = ""; }; + 223CA82816D9268D00EF1BEC /* kiss_fft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fft.c; sourceTree = ""; }; + 223CA82916D9268D00EF1BEC /* kiss_fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fft.h; sourceTree = ""; }; + 223CA82A16D9268D00EF1BEC /* kiss_fftr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fftr.c; sourceTree = ""; }; + 223CA82B16D9268D00EF1BEC /* kiss_fftr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fftr.h; sourceTree = ""; }; + 223CA82D16D9268D00EF1BEC /* opengles_display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opengles_display.c; sourceTree = ""; }; + 223CA82E16D9268D00EF1BEC /* opengles_display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opengles_display.h; sourceTree = ""; }; + 223CA82F16D9268D00EF1BEC /* shaders.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shaders.c; sourceTree = ""; }; + 223CA83016D9268D00EF1BEC /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shaders.h; sourceTree = ""; }; + 223CA83116D9268D00EF1BEC /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = ""; }; + 223CA83216D9268D00EF1BEC /* vfw-missing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "vfw-missing.h"; sourceTree = ""; }; + 223CA83516D9268D00EF1BEC /* extdisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = extdisplay.c; sourceTree = ""; }; + 223CA83716D9268D00EF1BEC /* h264dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = h264dec.c; sourceTree = ""; }; + 223CA83816D9268D00EF1BEC /* ioscapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioscapture.m; sourceTree = ""; }; + 223CA83916D9268D00EF1BEC /* iosdisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iosdisplay.m; sourceTree = ""; }; + 223CA83A16D9268D00EF1BEC /* jpegwriter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpegwriter.c; sourceTree = ""; }; + 223CA83B16D9268D00EF1BEC /* mire.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mire.c; sourceTree = ""; }; + 223CA84016D9268D00EF1BEC /* nowebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nowebcam.c; sourceTree = ""; }; + 223CA84116D9268D00EF1BEC /* pixconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pixconv.c; sourceTree = ""; }; + 223CA84316D9268D00EF1BEC /* sizeconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sizeconv.c; sourceTree = ""; }; + 223CA84516D9268D00EF1BEC /* videodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videodec.c; sourceTree = ""; }; + 223CA84616D9268D00EF1BEC /* videoenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videoenc.c; sourceTree = ""; }; + 223CA84816D9268D00EF1BEC /* vp8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vp8.c; sourceTree = ""; }; + 223CA84F16D9268D00EF1BEC /* audioconference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audioconference.c; sourceTree = ""; }; + 223CA85016D9268D00EF1BEC /* audiostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiostream.c; sourceTree = ""; }; + 223CA85116D9268D00EF1BEC /* bitratecontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratecontrol.c; sourceTree = ""; }; + 223CA85216D9268D00EF1BEC /* bitratedriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratedriver.c; sourceTree = ""; }; + 223CA85316D9268D00EF1BEC /* ice.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ice.c; sourceTree = ""; }; + 223CA85416D9268D00EF1BEC /* layouts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = layouts.c; sourceTree = ""; }; + 223CA85516D9268D00EF1BEC /* layouts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layouts.h; sourceTree = ""; }; + 223CA85616D9268D00EF1BEC /* mediastream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mediastream.c; sourceTree = ""; }; + 223CA85716D9268D00EF1BEC /* msvideo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo.c; sourceTree = ""; }; + 223CA85816D9268D00EF1BEC /* msvideo_neon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo_neon.c; sourceTree = ""; }; + 223CA85916D9268D00EF1BEC /* msvideo_neon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msvideo_neon.h; sourceTree = ""; }; + 223CA85A16D9268D00EF1BEC /* msvoip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvoip.c; sourceTree = ""; }; + 223CA85B16D9268D00EF1BEC /* nowebcam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nowebcam.h; sourceTree = ""; }; + 223CA85C16D9268D00EF1BEC /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = nowebcamCIF.jpg; sourceTree = ""; }; + 223CA85D16D9268D00EF1BEC /* private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = private.h; sourceTree = ""; }; + 223CA85E16D9268D00EF1BEC /* qosanalyzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qosanalyzer.c; sourceTree = ""; }; + 223CA85F16D9268D00EF1BEC /* qualityindicator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qualityindicator.c; sourceTree = ""; }; + 223CA86016D9268D00EF1BEC /* rfc2429.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfc2429.h; sourceTree = ""; }; + 223CA86116D9268D00EF1BEC /* rfc3984.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rfc3984.c; sourceTree = ""; }; + 223CA86216D9268D00EF1BEC /* ringstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ringstream.c; sourceTree = ""; }; + 223CA86316D9268D00EF1BEC /* scaler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scaler.c; sourceTree = ""; }; + 223CA86416D9268D00EF1BEC /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scaler.h; sourceTree = ""; }; + 223CA86616D9268D00EF1BEC /* videostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videostream.c; sourceTree = ""; }; + 223CA8D916D9298F00EF1BEC /* sal_address_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_address_impl.c; sourceTree = ""; }; + 223CA8DA16D9298F00EF1BEC /* sal_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_impl.c; sourceTree = ""; }; + 223CA8DB16D9298F00EF1BEC /* sal_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sal_impl.h; sourceTree = ""; }; + 223CA8DC16D9298F00EF1BEC /* sal_op_call.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_call.c; sourceTree = ""; }; + 223CA8DD16D9298F00EF1BEC /* sal_op_call_transfer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_call_transfer.c; sourceTree = ""; }; + 223CA8DE16D9298F00EF1BEC /* sal_op_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_impl.c; sourceTree = ""; }; + 223CA8DF16D9298F00EF1BEC /* sal_op_message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_message.c; sourceTree = ""; }; + 223CA8E016D9298F00EF1BEC /* sal_op_presence.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_presence.c; sourceTree = ""; }; + 223CA8E116D9298F00EF1BEC /* sal_op_registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_op_registration.c; sourceTree = ""; }; + 223CA8E216D9298F00EF1BEC /* sal_sdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_sdp.c; sourceTree = ""; }; + 223CA95316DA10AB00EF1BEC /* liblibortp copy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "liblibortp copy.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 22405EDC160065C200B92522 /* basedescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = basedescs.h; path = build/iphone/basedescs.h; sourceTree = ""; }; - 22405EDF1600668800B92522 /* msvoip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvoip.c; sourceTree = ""; }; 22405EE1160066C700B92522 /* voipdescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = voipdescs.h; path = build/iphone/voipdescs.h; sourceTree = ""; }; 22405EE31600671D00B92522 /* logging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = logging.c; sourceTree = ""; }; 22405EE41600671D00B92522 /* rtpprofile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtpprofile.c; sourceTree = ""; }; - 22405EE71600675C00B92522 /* genericplc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genericplc.c; sourceTree = ""; }; - 22512698145F13CE0041FBF2 /* aqsnd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aqsnd.c; sourceTree = ""; }; 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ec-calibrator.c"; path = "linphone/coreapi/ec-calibrator.c"; sourceTree = SOURCE_ROOT; }; - 2258C44013A9377B0087A596 /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = ""; }; 2258C44213A945520087A596 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; 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 = ""; }; - 2258C44813A946890087A596 /* videostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videostream.c; sourceTree = ""; }; - 2258C44913A946890087A596 /* videoenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videoenc.c; sourceTree = ""; }; - 2258C44A13A946890087A596 /* videodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videodec.c; 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; }; 225D65C51521C009008B2E81 /* libortp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libortp.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 229A614913DDFE3500090183 /* g722_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_decode.c; sourceTree = ""; }; - 229A614A13DDFE3500090183 /* g722_encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_encode.c; sourceTree = ""; }; - 229A614B13DDFE3500090183 /* g722.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g722.h; sourceTree = ""; }; - 229A614C13DDFE3500090183 /* msg722.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msg722.c; sourceTree = ""; }; 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 = ""; }; 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphonecore_utils.h; sourceTree = ""; }; - 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo_neon.c; sourceTree = ""; }; 229ECDEC143AEBDA00D611B8 /* conference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = conference.c; sourceTree = ""; }; - 229ECDEE143AEC2400D611B8 /* audioconference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audioconference.c; sourceTree = ""; }; 22A10B4F11F84E2D00373793 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; 22A10B5011F84E2D00373793 /* gsm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gsm.h; sourceTree = ""; }; 22A10B5111F84E2D00373793 /* gsm.h.orig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gsm.h.orig; sourceTree = ""; }; @@ -676,10 +777,6 @@ 22A10B5311F84E2D00373793 /* proto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proto.h; sourceTree = ""; }; 22A10B5411F84E2D00373793 /* toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toast.h; sourceTree = ""; }; 22A10B5511F84E2D00373793 /* unproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unproto.h; sourceTree = ""; }; - 22A10EE711F8920F00373793 /* mswebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mswebcam.c; path = linphone/mediastreamer2/src/mswebcam.c; sourceTree = SOURCE_ROOT; }; - 22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = src/nowebcamCIF.jpg; sourceTree = ""; }; - 22D15AB3139F505400C7713A /* ioscapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioscapture.m; sourceTree = ""; }; - 22D15AB5139F579D00C7713A /* qtcapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = qtcapture.m; 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; }; 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -693,26 +790,28 @@ 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamAppDelegate.m; sourceTree = ""; }; 22DD21AC13A8E3310018ECD4 /* mediastreamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamViewController.h; sourceTree = ""; }; 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamViewController.m; sourceTree = ""; }; - 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qualityindicator.c; sourceTree = ""; }; - 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratecontrol.c; sourceTree = ""; }; - 7014533713FA7AEA00A01D86 /* shaders.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shaders.c; sourceTree = ""; }; 7014533B13FA7ECA00A01D86 /* zrtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zrtp.h; sourceTree = ""; }; 7014533D13FA841E00A01D86 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = ""; }; - 7066FC0613E82A3600EFC6DC /* vp8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vp8.c; sourceTree = ""; }; 7066FC0913E830B800EFC6DC /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "../liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = ""; }; 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 70E542F013E147CE002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 70E542F613E14816002BA2C0 /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shaders.h; sourceTree = ""; }; AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = liblinphone_Prefix.pch; sourceTree = SOURCE_ROOT; }; AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* liblinphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblinphone.a; sourceTree = BUILT_PRODUCTS_DIR; }; F4D9F23D145710540035B0D0 /* netsim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = netsim.c; sourceTree = ""; }; F4D9F23E145710540035B0D0 /* ortp_srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ortp_srtp.c; sourceTree = ""; }; - F4D9F25E14583B580035B0D0 /* bitratedriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratedriver.c; sourceTree = ""; }; - F4D9F25F14583B580035B0D0 /* qosanalyzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qosanalyzer.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 223CA94C16DA10AB00EF1BEC /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 223CA94D16DA10AB00EF1BEC /* Foundation.framework in Frameworks */, + 223CA94E16DA10AB00EF1BEC /* libSKP_SILK_SDK.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 225D64F11521BFA6008B2E81 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -780,6 +879,7 @@ 22DD19BE13A8D7FA0018ECD4 /* mediastream.app */, 225D64F81521BFA6008B2E81 /* libmediastreamer.a */, 225D65C51521C009008B2E81 /* libortp.a */, + 223CA95316DA10AB00EF1BEC /* liblibortp copy.a */, ); name = Products; sourceTree = ""; @@ -854,7 +954,6 @@ children = ( 22405EE1160066C700B92522 /* voipdescs.h */, 22405EDC160065C200B92522 /* basedescs.h */, - 22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */, 22DD19E013A8D82C0018ECD4 /* tests */, 222CA5B811F6CF7600621220 /* include */, 222CA5DC11F6CF7600621220 /* src */, @@ -923,89 +1022,17 @@ 222CA5DC11F6CF7600621220 /* src */ = { isa = PBXGroup; children = ( + 223CA7EF16D9268D00EF1BEC /* audiofilters */, + 223CA81116D9268D00EF1BEC /* base */, + 223CA81A16D9268D00EF1BEC /* otherfilters */, + 223CA82016D9268D00EF1BEC /* utils */, + 223CA83316D9268D00EF1BEC /* videofilters */, + 223CA84E16D9268D00EF1BEC /* voip */, 222CA5DD11F6CF7600621220 /* .gitignore */, - 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */, - 222CA5DF11F6CF7600621220 /* alaw.c */, - 22512698145F13CE0041FBF2 /* aqsnd.c */, - 229ECDEE143AEC2400D611B8 /* audioconference.c */, - 222CA5E311F6CF7600621220 /* audiomixer.c */, - 222CA5E411F6CF7600621220 /* audiostream.c */, - 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */, - F4D9F25E14583B580035B0D0 /* bitratedriver.c */, - 222CA5E511F6CF7600621220 /* chanadapt.c */, - 222CA5E711F6CF7600621220 /* dsptools.c */, - 222CA5E811F6CF7600621220 /* dtmfgen.c */, 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */, - 222CA5EB11F6CF7600621220 /* equalizer.c */, - 222CA5EC11F6CF7600621220 /* eventqueue.c */, - 222CA5ED11F6CF7600621220 /* extdisplay.c */, - 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */, 2203127413A249F70049A2ED /* filter-template.c */, - 222CA5EF11F6CF7600621220 /* g711common.h */, - 229A614B13DDFE3500090183 /* g722.h */, - 229A614913DDFE3500090183 /* g722_decode.c */, - 229A614A13DDFE3500090183 /* g722_encode.c */, - 22405EE71600675C00B92522 /* genericplc.c */, - 222CA5F011F6CF7600621220 /* gsm.c */, - 221F58A713AB716300D603C9 /* h264dec.c */, - 222CA5F211F6CF7600621220 /* ice.c */, - 22D15AB3139F505400C7713A /* ioscapture.m */, - 2203127113A247B40049A2ED /* iosdisplay.m */, - 222CA5F311F6CF7600621220 /* itc.c */, - 221F58A613AB716300D603C9 /* jpegwriter.c */, - 222CA5F411F6CF7600621220 /* kiss_fft.c */, - 222CA5F511F6CF7600621220 /* kiss_fft.h */, - 222CA5F611F6CF7600621220 /* kiss_fftr.c */, - 222CA5F711F6CF7600621220 /* kiss_fftr.h */, - 2211DB9B1476539600DEE054 /* l16.c */, 222CA5F911F6CF7600621220 /* Makefile.am */, 222CA5FA11F6CF7600621220 /* Makefile.in */, - 222CA5FB11F6CF7600621220 /* mire.c */, - 22313679143DED490035C1F4 /* msandroidvideo.cpp */, - 222CA5FD11F6CF7600621220 /* mscommon.c */, - 222CA5FE11F6CF7600621220 /* msconf.c */, - 222CA60011F6CF7600621220 /* msfileplayer.c */, - 222CA60211F6CF7600621220 /* msfilerec.c */, - 222CA60411F6CF7600621220 /* msfilter.c */, - 229A614C13DDFE3500090183 /* msg722.c */, - 222CA60511F6CF7600621220 /* msiounit.m */, - 222CA60611F6CF7600621220 /* msjoin.c */, - 222CA60711F6CF7600621220 /* msqueue.c */, - 222CA60811F6CF7600621220 /* msresample.c */, - 222CA60911F6CF7600621220 /* msrtp.c */, - 222CA60A11F6CF7600621220 /* mssndcard.c */, - 222CA60B11F6CF7600621220 /* msspeex.c */, - 222CA60C11F6CF7600621220 /* msticker.c */, - 221F589B13AB4FC500D603C9 /* msvideo.c */, - 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */, - 22405EDF1600668800B92522 /* msvoip.c */, - 222CA61111F6CF7600621220 /* msvolume.c */, - 222CA61311F6CF7600621220 /* mtu.c */, - 220ED1AB13A9062500AC21E0 /* nowebcam.c */, - 220ED1AA13A9062500AC21E0 /* nowebcam.h */, - 221DCB6715347EF80025E54D /* opengles_display.c */, - 221F58A113AB6F8000D603C9 /* pixconv.c */, - F4D9F25F14583B580035B0D0 /* qosanalyzer.c */, - 22D15AB5139F579D00C7713A /* qtcapture.m */, - 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */, - 222CA61B11F6CF7600621220 /* rfc2429.h */, - 222CA61C11F6CF7600621220 /* rfc3984.c */, - 221F58AD13ABA42800D603C9 /* scaler.c */, - 221F58E313AF44B300D603C9 /* scaler.h */, - 7014533713FA7AEA00A01D86 /* shaders.c */, - 70E542F613E14816002BA2C0 /* shaders.h */, - 221F58AB13AB71A400D603C9 /* sizeconv.c */, - 222CA61F11F6CF7600621220 /* speexec.c */, - 2258C44013A9377B0087A596 /* swscale.h */, - 222CA62111F6CF7600621220 /* tee.c */, - 221F58A513AB716300D603C9 /* tonedetector.c */, - 222CA62311F6CF7600621220 /* ulaw.c */, - 222CA62411F6CF7600621220 /* vfw-missing.h */, - 2258C44A13A946890087A596 /* videodec.c */, - 2258C44913A946890087A596 /* videoenc.c */, - 2258C44813A946890087A596 /* videostream.c */, - 222CA62911F6CF7600621220 /* void.c */, - 7066FC0613E82A3600EFC6DC /* vp8.c */, 221DCB6A153584410025E54D /* yuv2rgb.fs */, 221DCB6B153584410025E54D /* yuv2rgb.vs */, ); @@ -1097,10 +1124,10 @@ 222CA72D11F6CFB100621220 /* coreapi */ = { isa = PBXGroup; children = ( + 223CA8D816D9298F00EF1BEC /* bellesip_sal */, 229ECDEC143AEBDA00D611B8 /* conference.c */, 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */, 225D3559124B1FF60008581C /* linphonecall.c */, - 22A10EE711F8920F00373793 /* mswebcam.c */, 222CA72E11F6CFB100621220 /* .gitignore */, 222CA72F11F6CFB100621220 /* address.c */, 222CA73011F6CFB100621220 /* authentication.c */, @@ -1124,10 +1151,6 @@ 222CA75911F6CFB100621220 /* proxy.c */, 222CA75A11F6CFB100621220 /* sal.c */, 222CA75B11F6CFB100621220 /* sal.h */, - 222CA75C11F6CFB100621220 /* sal_eXosip2.c */, - 222CA75D11F6CFB100621220 /* sal_eXosip2.h */, - 222CA75E11F6CFB100621220 /* sal_eXosip2_presence.c */, - 222CA75F11F6CFB100621220 /* sal_eXosip2_sdp.c */, 222CA76211F6CFB100621220 /* siplogin.c */, 222CA76311F6CFB100621220 /* sipsetup.c */, 222CA76411F6CFB100621220 /* sipsetup.h */, @@ -1145,6 +1168,150 @@ path = help; sourceTree = ""; }; + 223CA7EF16D9268D00EF1BEC /* audiofilters */ = { + isa = PBXGroup; + children = ( + 223CA7F016D9268D00EF1BEC /* alaw.c */, + 223CA7F216D9268D00EF1BEC /* aqsnd.c */, + 223CA7F416D9268D00EF1BEC /* audiomixer.c */, + 223CA7F516D9268D00EF1BEC /* chanadapt.c */, + 223CA7F616D9268D00EF1BEC /* dtmfgen.c */, + 223CA7F716D9268D00EF1BEC /* equalizer.c */, + 223CA7F916D9268D00EF1BEC /* genericplc.c */, + 223CA7FA16D9268D00EF1BEC /* gsm.c */, + 223CA7FB16D9268D00EF1BEC /* l16.c */, + 223CA7FD16D9268D00EF1BEC /* msconf.c */, + 223CA7FE16D9268D00EF1BEC /* msfileplayer.c */, + 223CA7FF16D9268D00EF1BEC /* msfilerec.c */, + 223CA80016D9268D00EF1BEC /* msg722.c */, + 223CA80116D9268D00EF1BEC /* msiounit.m */, + 223CA80216D9268D00EF1BEC /* msresample.c */, + 223CA80316D9268D00EF1BEC /* msspeex.c */, + 223CA80416D9268D00EF1BEC /* msvolume.c */, + 223CA80916D9268D00EF1BEC /* tonedetector.c */, + 223CA80A16D9268D00EF1BEC /* ulaw.c */, + 223CA80B16D9268D00EF1BEC /* waveheader.h */, + ); + path = audiofilters; + sourceTree = ""; + }; + 223CA81116D9268D00EF1BEC /* base */ = { + isa = PBXGroup; + children = ( + 223CA81216D9268D00EF1BEC /* eventqueue.c */, + 223CA81316D9268D00EF1BEC /* mscommon.c */, + 223CA81416D9268D00EF1BEC /* msfilter.c */, + 223CA81516D9268D00EF1BEC /* msqueue.c */, + 223CA81616D9268D00EF1BEC /* mssndcard.c */, + 223CA81716D9268D00EF1BEC /* msticker.c */, + 223CA81816D9268D00EF1BEC /* mswebcam.c */, + 223CA81916D9268D00EF1BEC /* mtu.c */, + ); + path = base; + sourceTree = ""; + }; + 223CA81A16D9268D00EF1BEC /* otherfilters */ = { + isa = PBXGroup; + children = ( + 223CA81B16D9268D00EF1BEC /* itc.c */, + 223CA81C16D9268D00EF1BEC /* join.c */, + 223CA81D16D9268D00EF1BEC /* msrtp.c */, + 223CA81E16D9268D00EF1BEC /* tee.c */, + 223CA81F16D9268D00EF1BEC /* void.c */, + ); + path = otherfilters; + sourceTree = ""; + }; + 223CA82016D9268D00EF1BEC /* utils */ = { + isa = PBXGroup; + children = ( + 223CA82116D9268D00EF1BEC /* _kiss_fft_guts.h */, + 223CA82216D9268D00EF1BEC /* dsptools.c */, + 223CA82316D9268D00EF1BEC /* ffmpeg-priv.h */, + 223CA82416D9268D00EF1BEC /* g711common.h */, + 223CA82516D9268D00EF1BEC /* g722.h */, + 223CA82616D9268D00EF1BEC /* g722_decode.c */, + 223CA82716D9268D00EF1BEC /* g722_encode.c */, + 223CA82816D9268D00EF1BEC /* kiss_fft.c */, + 223CA82916D9268D00EF1BEC /* kiss_fft.h */, + 223CA82A16D9268D00EF1BEC /* kiss_fftr.c */, + 223CA82B16D9268D00EF1BEC /* kiss_fftr.h */, + 223CA82D16D9268D00EF1BEC /* opengles_display.c */, + 223CA82E16D9268D00EF1BEC /* opengles_display.h */, + 223CA82F16D9268D00EF1BEC /* shaders.c */, + 223CA83016D9268D00EF1BEC /* shaders.h */, + 223CA83116D9268D00EF1BEC /* swscale.h */, + 223CA83216D9268D00EF1BEC /* vfw-missing.h */, + ); + path = utils; + sourceTree = ""; + }; + 223CA83316D9268D00EF1BEC /* videofilters */ = { + isa = PBXGroup; + children = ( + 223CA83516D9268D00EF1BEC /* extdisplay.c */, + 223CA83716D9268D00EF1BEC /* h264dec.c */, + 223CA83816D9268D00EF1BEC /* ioscapture.m */, + 223CA83916D9268D00EF1BEC /* iosdisplay.m */, + 223CA83A16D9268D00EF1BEC /* jpegwriter.c */, + 223CA83B16D9268D00EF1BEC /* mire.c */, + 223CA84016D9268D00EF1BEC /* nowebcam.c */, + 223CA84116D9268D00EF1BEC /* pixconv.c */, + 223CA84316D9268D00EF1BEC /* sizeconv.c */, + 223CA84516D9268D00EF1BEC /* videodec.c */, + 223CA84616D9268D00EF1BEC /* videoenc.c */, + 223CA84816D9268D00EF1BEC /* vp8.c */, + ); + path = videofilters; + sourceTree = ""; + }; + 223CA84E16D9268D00EF1BEC /* voip */ = { + isa = PBXGroup; + children = ( + 223CA84F16D9268D00EF1BEC /* audioconference.c */, + 223CA85016D9268D00EF1BEC /* audiostream.c */, + 223CA85116D9268D00EF1BEC /* bitratecontrol.c */, + 223CA85216D9268D00EF1BEC /* bitratedriver.c */, + 223CA85316D9268D00EF1BEC /* ice.c */, + 223CA85416D9268D00EF1BEC /* layouts.c */, + 223CA85516D9268D00EF1BEC /* layouts.h */, + 223CA85616D9268D00EF1BEC /* mediastream.c */, + 223CA85716D9268D00EF1BEC /* msvideo.c */, + 223CA85816D9268D00EF1BEC /* msvideo_neon.c */, + 223CA85916D9268D00EF1BEC /* msvideo_neon.h */, + 223CA85A16D9268D00EF1BEC /* msvoip.c */, + 223CA85B16D9268D00EF1BEC /* nowebcam.h */, + 223CA85C16D9268D00EF1BEC /* nowebcamCIF.jpg */, + 223CA85D16D9268D00EF1BEC /* private.h */, + 223CA85E16D9268D00EF1BEC /* qosanalyzer.c */, + 223CA85F16D9268D00EF1BEC /* qualityindicator.c */, + 223CA86016D9268D00EF1BEC /* rfc2429.h */, + 223CA86116D9268D00EF1BEC /* rfc3984.c */, + 223CA86216D9268D00EF1BEC /* ringstream.c */, + 223CA86316D9268D00EF1BEC /* scaler.c */, + 223CA86416D9268D00EF1BEC /* scaler.h */, + 223CA86616D9268D00EF1BEC /* videostream.c */, + ); + path = voip; + sourceTree = ""; + }; + 223CA8D816D9298F00EF1BEC /* bellesip_sal */ = { + isa = PBXGroup; + children = ( + 223CA8D916D9298F00EF1BEC /* sal_address_impl.c */, + 223CA8DA16D9298F00EF1BEC /* sal_impl.c */, + 223CA8DB16D9298F00EF1BEC /* sal_impl.h */, + 223CA8DC16D9298F00EF1BEC /* sal_op_call.c */, + 223CA8DD16D9298F00EF1BEC /* sal_op_call_transfer.c */, + 223CA8DE16D9298F00EF1BEC /* sal_op_impl.c */, + 223CA8DF16D9298F00EF1BEC /* sal_op_message.c */, + 223CA8E016D9298F00EF1BEC /* sal_op_presence.c */, + 223CA8E116D9298F00EF1BEC /* sal_op_registration.c */, + 223CA8E216D9298F00EF1BEC /* sal_sdp.c */, + ); + path = bellesip_sal; + sourceTree = ""; + }; 22A10B4C11F84DE300373793 /* externals */ = { isa = PBXGroup; children = ( @@ -1212,6 +1379,78 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 223CA8EE16DA10AB00EF1BEC /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 223CA8EF16DA10AB00EF1BEC /* liblinphone_Prefix.pch in Headers */, + 223CA8F016DA10AB00EF1BEC /* allfilters.h in Headers */, + 223CA8F116DA10AB00EF1BEC /* dsptools.h in Headers */, + 223CA8F216DA10AB00EF1BEC /* dtmfgen.h in Headers */, + 223CA8F316DA10AB00EF1BEC /* ice.h in Headers */, + 223CA8F416DA10AB00EF1BEC /* mediastream.h in Headers */, + 223CA8F516DA10AB00EF1BEC /* msaudiomixer.h in Headers */, + 223CA8F616DA10AB00EF1BEC /* mschanadapter.h in Headers */, + 223CA8F716DA10AB00EF1BEC /* mscommon.h in Headers */, + 223CA8F816DA10AB00EF1BEC /* msequalizer.h in Headers */, + 223CA8F916DA10AB00EF1BEC /* mseventqueue.h in Headers */, + 223CA8FA16DA10AB00EF1BEC /* msextdisplay.h in Headers */, + 223CA8FB16DA10AB00EF1BEC /* msfileplayer.h in Headers */, + 223CA8FC16DA10AB00EF1BEC /* msfilerec.h in Headers */, + 223CA8FD16DA10AB00EF1BEC /* msfilter.h in Headers */, + 223CA8FE16DA10AB00EF1BEC /* msinterfaces.h in Headers */, + 223CA8FF16DA10AB00EF1BEC /* msitc.h in Headers */, + 223CA90016DA10AB00EF1BEC /* msqueue.h in Headers */, + 223CA90116DA10AB00EF1BEC /* msrtp.h in Headers */, + 223CA90216DA10AB00EF1BEC /* mssndcard.h in Headers */, + 223CA90316DA10AB00EF1BEC /* mstee.h in Headers */, + 223CA90416DA10AB00EF1BEC /* msticker.h in Headers */, + 223CA90516DA10AB00EF1BEC /* msv4l.h in Headers */, + 223CA90616DA10AB00EF1BEC /* msvideo.h in Headers */, + 223CA90716DA10AB00EF1BEC /* msvideoout.h in Headers */, + 223CA90816DA10AB00EF1BEC /* msvolume.h in Headers */, + 223CA90916DA10AB00EF1BEC /* mswebcam.h in Headers */, + 223CA90A16DA10AB00EF1BEC /* rfc3984.h in Headers */, + 223CA90B16DA10AB00EF1BEC /* waveheader.h in Headers */, + 223CA90C16DA10AB00EF1BEC /* b64.h in Headers */, + 223CA90D16DA10AB00EF1BEC /* event.h in Headers */, + 223CA90E16DA10AB00EF1BEC /* ortp.h in Headers */, + 223CA90F16DA10AB00EF1BEC /* payloadtype.h in Headers */, + 223CA91016DA10AB00EF1BEC /* port.h in Headers */, + 223CA91116DA10AB00EF1BEC /* rtcp.h in Headers */, + 223CA91216DA10AB00EF1BEC /* rtp.h in Headers */, + 223CA91316DA10AB00EF1BEC /* rtpsession.h in Headers */, + 223CA91416DA10AB00EF1BEC /* rtpsignaltable.h in Headers */, + 223CA91516DA10AB00EF1BEC /* sessionset.h in Headers */, + 223CA91616DA10AB00EF1BEC /* srtp.h in Headers */, + 223CA91716DA10AB00EF1BEC /* str_utils.h in Headers */, + 223CA91816DA10AB00EF1BEC /* stun.h in Headers */, + 223CA91916DA10AB00EF1BEC /* stun_udp.h in Headers */, + 223CA91A16DA10AB00EF1BEC /* telephonyevents.h in Headers */, + 223CA91B16DA10AB00EF1BEC /* jitterctl.h in Headers */, + 223CA91C16DA10AB00EF1BEC /* ortp-config-win32.h in Headers */, + 223CA91D16DA10AB00EF1BEC /* rtpsession_priv.h in Headers */, + 223CA91E16DA10AB00EF1BEC /* rtptimer.h in Headers */, + 223CA91F16DA10AB00EF1BEC /* scheduler.h in Headers */, + 223CA92016DA10AB00EF1BEC /* utils.h in Headers */, + 223CA92116DA10AB00EF1BEC /* enum.h in Headers */, + 223CA92216DA10AB00EF1BEC /* linphonecore.h in Headers */, + 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 */, + 223CA92A16DA10AB00EF1BEC /* private.h in Headers */, + 223CA92B16DA10AB00EF1BEC /* proto.h in Headers */, + 223CA92C16DA10AB00EF1BEC /* toast.h in Headers */, + 223CA92D16DA10AB00EF1BEC /* unproto.h in Headers */, + 223CA92E16DA10AB00EF1BEC /* linphonecore_utils.h in Headers */, + 223CA92F16DA10AB00EF1BEC /* zrtp.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 225D642E1521BFA6008B2E81 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1245,13 +1484,6 @@ 225D64491521BFA6008B2E81 /* mswebcam.h in Headers */, 225D644A1521BFA6008B2E81 /* rfc3984.h in Headers */, 225D644B1521BFA6008B2E81 /* waveheader.h in Headers */, - 225D644C1521BFA6008B2E81 /* _kiss_fft_guts.h in Headers */, - 225D644D1521BFA6008B2E81 /* ffmpeg-priv.h in Headers */, - 225D644E1521BFA6008B2E81 /* g711common.h in Headers */, - 225D644F1521BFA6008B2E81 /* kiss_fft.h in Headers */, - 225D64501521BFA6008B2E81 /* kiss_fftr.h in Headers */, - 225D64511521BFA6008B2E81 /* rfc2429.h in Headers */, - 225D64521521BFA6008B2E81 /* vfw-missing.h in Headers */, 225D64531521BFA6008B2E81 /* b64.h in Headers */, 225D64541521BFA6008B2E81 /* event.h in Headers */, 225D64551521BFA6008B2E81 /* ortp.h in Headers */, @@ -1279,7 +1511,6 @@ 225D646B1521BFA6008B2E81 /* offeranswer.h in Headers */, 225D646C1521BFA6008B2E81 /* private.h in Headers */, 225D646D1521BFA6008B2E81 /* sal.h in Headers */, - 225D646E1521BFA6008B2E81 /* sal_eXosip2.h in Headers */, 225D646F1521BFA6008B2E81 /* sipsetup.h in Headers */, 225D64701521BFA6008B2E81 /* config.h in Headers */, 225D64711521BFA6008B2E81 /* gsm.h in Headers */, @@ -1288,14 +1519,26 @@ 225D64741521BFA6008B2E81 /* toast.h in Headers */, 225D64751521BFA6008B2E81 /* unproto.h in Headers */, 225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */, - 225D64781521BFA6008B2E81 /* nowebcam.h in Headers */, - 225D64791521BFA6008B2E81 /* swscale.h in Headers */, - 225D647B1521BFA6008B2E81 /* scaler.h in Headers */, - 225D647C1521BFA6008B2E81 /* g722.h in Headers */, - 225D647D1521BFA6008B2E81 /* shaders.h in Headers */, 225D64811521BFA6008B2E81 /* zrtp.h in Headers */, 22405EDD160065C200B92522 /* basedescs.h in Headers */, 22405EE2160066C700B92522 /* voipdescs.h in Headers */, + 223CA88216D9268D00EF1BEC /* waveheader.h in Headers */, + 223CA89516D9268D00EF1BEC /* _kiss_fft_guts.h in Headers */, + 223CA89716D9268D00EF1BEC /* ffmpeg-priv.h in Headers */, + 223CA89816D9268D00EF1BEC /* g711common.h in Headers */, + 223CA89916D9268D00EF1BEC /* g722.h in Headers */, + 223CA89D16D9268D00EF1BEC /* kiss_fft.h in Headers */, + 223CA89F16D9268D00EF1BEC /* kiss_fftr.h in Headers */, + 223CA8A216D9268D00EF1BEC /* opengles_display.h in Headers */, + 223CA8A416D9268D00EF1BEC /* shaders.h in Headers */, + 223CA8A516D9268D00EF1BEC /* swscale.h in Headers */, + 223CA8A616D9268D00EF1BEC /* vfw-missing.h in Headers */, + 223CA8C716D9268D00EF1BEC /* layouts.h in Headers */, + 223CA8CB16D9268D00EF1BEC /* msvideo_neon.h in Headers */, + 223CA8CD16D9268D00EF1BEC /* nowebcam.h in Headers */, + 223CA8CE16D9268D00EF1BEC /* private.h in Headers */, + 223CA8D116D9268D00EF1BEC /* rfc2429.h in Headers */, + 223CA8D516D9268D00EF1BEC /* scaler.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1332,13 +1575,6 @@ 225D65161521C009008B2E81 /* mswebcam.h in Headers */, 225D65171521C009008B2E81 /* rfc3984.h in Headers */, 225D65181521C009008B2E81 /* waveheader.h in Headers */, - 225D65191521C009008B2E81 /* _kiss_fft_guts.h in Headers */, - 225D651A1521C009008B2E81 /* ffmpeg-priv.h in Headers */, - 225D651B1521C009008B2E81 /* g711common.h in Headers */, - 225D651C1521C009008B2E81 /* kiss_fft.h in Headers */, - 225D651D1521C009008B2E81 /* kiss_fftr.h in Headers */, - 225D651E1521C009008B2E81 /* rfc2429.h in Headers */, - 225D651F1521C009008B2E81 /* vfw-missing.h in Headers */, 225D65201521C009008B2E81 /* b64.h in Headers */, 225D65211521C009008B2E81 /* event.h in Headers */, 225D65221521C009008B2E81 /* ortp.h in Headers */, @@ -1366,7 +1602,6 @@ 225D65381521C009008B2E81 /* offeranswer.h in Headers */, 225D65391521C009008B2E81 /* private.h in Headers */, 225D653A1521C009008B2E81 /* sal.h in Headers */, - 225D653B1521C009008B2E81 /* sal_eXosip2.h in Headers */, 225D653C1521C009008B2E81 /* sipsetup.h in Headers */, 225D653D1521C009008B2E81 /* config.h in Headers */, 225D653E1521C009008B2E81 /* gsm.h in Headers */, @@ -1375,11 +1610,6 @@ 225D65411521C009008B2E81 /* toast.h in Headers */, 225D65421521C009008B2E81 /* unproto.h in Headers */, 225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */, - 225D65451521C009008B2E81 /* nowebcam.h in Headers */, - 225D65461521C009008B2E81 /* swscale.h in Headers */, - 225D65481521C009008B2E81 /* scaler.h in Headers */, - 225D65491521C009008B2E81 /* g722.h in Headers */, - 225D654A1521C009008B2E81 /* shaders.h in Headers */, 225D654E1521C009008B2E81 /* zrtp.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1417,13 +1647,6 @@ 222CA64B11F6CF7600621220 /* mswebcam.h in Headers */, 222CA64C11F6CF7600621220 /* rfc3984.h in Headers */, 222CA64D11F6CF7600621220 /* waveheader.h in Headers */, - 222CA64E11F6CF7600621220 /* _kiss_fft_guts.h in Headers */, - 222CA65E11F6CF7600621220 /* ffmpeg-priv.h in Headers */, - 222CA65F11F6CF7600621220 /* g711common.h in Headers */, - 222CA66511F6CF7600621220 /* kiss_fft.h in Headers */, - 222CA66711F6CF7600621220 /* kiss_fftr.h in Headers */, - 222CA68811F6CF7600621220 /* rfc2429.h in Headers */, - 222CA69111F6CF7600621220 /* vfw-missing.h in Headers */, 222CA6F411F6CF9F00621220 /* b64.h in Headers */, 222CA6F511F6CF9F00621220 /* event.h in Headers */, 222CA6F611F6CF9F00621220 /* ortp.h in Headers */, @@ -1451,7 +1674,6 @@ 222CA77711F6CFB100621220 /* offeranswer.h in Headers */, 222CA77A11F6CFB100621220 /* private.h in Headers */, 222CA77D11F6CFB100621220 /* sal.h in Headers */, - 222CA77F11F6CFB100621220 /* sal_eXosip2.h in Headers */, 222CA78611F6CFB100621220 /* sipsetup.h in Headers */, 22A10B5611F84E2D00373793 /* config.h in Headers */, 22A10B5711F84E2D00373793 /* gsm.h in Headers */, @@ -1460,18 +1682,31 @@ 22A10B5A11F84E2D00373793 /* toast.h in Headers */, 22A10B5B11F84E2D00373793 /* unproto.h in Headers */, 229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */, - 220ED1AC13A9062600AC21E0 /* nowebcam.h in Headers */, - 2258C44113A9377B0087A596 /* swscale.h in Headers */, - 221F58E413AF44B300D603C9 /* scaler.h in Headers */, - 229A614F13DDFE3500090183 /* g722.h in Headers */, - 70E542FA13E14816002BA2C0 /* shaders.h in Headers */, 7014533C13FA7ECA00A01D86 /* zrtp.h in Headers */, + 223CA8E516D9298F00EF1BEC /* sal_impl.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 223CA8ED16DA10AB00EF1BEC /* libbellesip */ = { + isa = PBXNativeTarget; + buildConfigurationList = 223CA94F16DA10AB00EF1BEC /* Build configuration list for PBXNativeTarget "libbellesip" */; + buildPhases = ( + 223CA8EE16DA10AB00EF1BEC /* Headers */, + 223CA93016DA10AB00EF1BEC /* Sources */, + 223CA94C16DA10AB00EF1BEC /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = libbellesip; + productName = liblinphone; + productReference = 223CA95316DA10AB00EF1BEC /* liblibortp copy.a */; + productType = "com.apple.product-type.library.static"; + }; 225D642D1521BFA6008B2E81 /* libmediastreamer */ = { isa = PBXNativeTarget; buildConfigurationList = 225D64F41521BFA6008B2E81 /* Build configuration list for PBXNativeTarget "libmediastreamer" */; @@ -1572,6 +1807,7 @@ 22DD19BD13A8D7FA0018ECD4 /* mediastream */, 225D642D1521BFA6008B2E81 /* libmediastreamer */, 225D64FA1521C009008B2E81 /* libortp */, + 223CA8ED16DA10AB00EF1BEC /* libbellesip */, ); }; /* End PBXProject section */ @@ -1584,90 +1820,124 @@ 22DD21AE13A8E3310018ECD4 /* InfoPlist.strings in Resources */, 22DD21AF13A8E3310018ECD4 /* MainWindow.xib in Resources */, 22DD21B013A8E3310018ECD4 /* mediastreamViewController.xib in Resources */, - 22B5106913B060E100CD87DA /* nowebcamCIF.jpg in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 223CA93016DA10AB00EF1BEC /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 223CA93116DA10AB00EF1BEC /* avprofile.c in Sources */, + 223CA93216DA10AB00EF1BEC /* b64.c in Sources */, + 223CA93316DA10AB00EF1BEC /* event.c in Sources */, + 223CA93416DA10AB00EF1BEC /* jitterctl.c in Sources */, + 223CA93516DA10AB00EF1BEC /* ortp.c in Sources */, + 223CA93616DA10AB00EF1BEC /* payloadtype.c in Sources */, + 223CA93716DA10AB00EF1BEC /* port.c in Sources */, + 223CA93816DA10AB00EF1BEC /* posixtimer.c in Sources */, + 223CA93916DA10AB00EF1BEC /* rtcp.c in Sources */, + 223CA93A16DA10AB00EF1BEC /* rtcpparse.c in Sources */, + 223CA93B16DA10AB00EF1BEC /* rtpparse.c in Sources */, + 223CA93C16DA10AB00EF1BEC /* rtpsession.c in Sources */, + 223CA93D16DA10AB00EF1BEC /* rtpsession_inet.c in Sources */, + 223CA93E16DA10AB00EF1BEC /* rtpsignaltable.c in Sources */, + 223CA93F16DA10AB00EF1BEC /* rtptimer.c in Sources */, + 223CA94016DA10AB00EF1BEC /* scheduler.c in Sources */, + 223CA94116DA10AB00EF1BEC /* sessionset.c in Sources */, + 223CA94216DA10AB00EF1BEC /* str_utils.c in Sources */, + 223CA94316DA10AB00EF1BEC /* stun.c in Sources */, + 223CA94416DA10AB00EF1BEC /* stun_udp.c in Sources */, + 223CA94516DA10AB00EF1BEC /* telephonyevents.c in Sources */, + 223CA94616DA10AB00EF1BEC /* utils.c in Sources */, + 223CA94716DA10AB00EF1BEC /* zrtp.c in Sources */, + 223CA94816DA10AB00EF1BEC /* netsim.c in Sources */, + 223CA94916DA10AB00EF1BEC /* ortp_srtp.c in Sources */, + 223CA94A16DA10AB00EF1BEC /* logging.c in Sources */, + 223CA94B16DA10AB00EF1BEC /* rtpprofile.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 225D64821521BFA6008B2E81 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 225D64831521BFA6008B2E81 /* alaw.c in Sources */, - 225D64841521BFA6008B2E81 /* audiomixer.c in Sources */, - 225D64851521BFA6008B2E81 /* audiostream.c in Sources */, - 225D64861521BFA6008B2E81 /* chanadapt.c in Sources */, - 225D64871521BFA6008B2E81 /* dsptools.c in Sources */, - 225D64881521BFA6008B2E81 /* dtmfgen.c in Sources */, - 225D64891521BFA6008B2E81 /* equalizer.c in Sources */, - 225D648A1521BFA6008B2E81 /* eventqueue.c in Sources */, - 225D648B1521BFA6008B2E81 /* extdisplay.c in Sources */, - 225D648C1521BFA6008B2E81 /* gsm.c in Sources */, - 225D648D1521BFA6008B2E81 /* ice.c in Sources */, - 225D648E1521BFA6008B2E81 /* itc.c in Sources */, - 225D648F1521BFA6008B2E81 /* kiss_fft.c in Sources */, - 225D64901521BFA6008B2E81 /* kiss_fftr.c in Sources */, - 225D64911521BFA6008B2E81 /* mire.c in Sources */, - 225D64921521BFA6008B2E81 /* mscommon.c in Sources */, - 225D64931521BFA6008B2E81 /* msconf.c in Sources */, - 225D64941521BFA6008B2E81 /* msfileplayer.c in Sources */, - 225D64951521BFA6008B2E81 /* msfilerec.c in Sources */, - 225D64961521BFA6008B2E81 /* msfilter.c in Sources */, - 225D64981521BFA6008B2E81 /* msjoin.c in Sources */, - 225D64991521BFA6008B2E81 /* msqueue.c in Sources */, - 225D649A1521BFA6008B2E81 /* msresample.c in Sources */, - 225D649B1521BFA6008B2E81 /* msrtp.c in Sources */, - 225D649C1521BFA6008B2E81 /* mssndcard.c in Sources */, - 225D649D1521BFA6008B2E81 /* msspeex.c in Sources */, - 225D649E1521BFA6008B2E81 /* msticker.c in Sources */, - 225D649F1521BFA6008B2E81 /* msvolume.c in Sources */, - 225D64A01521BFA6008B2E81 /* mtu.c in Sources */, - 225D64A11521BFA6008B2E81 /* rfc3984.c in Sources */, - 225D64A21521BFA6008B2E81 /* speexec.c in Sources */, - 225D64A31521BFA6008B2E81 /* tee.c in Sources */, - 225D64A41521BFA6008B2E81 /* ulaw.c in Sources */, - 225D64A51521BFA6008B2E81 /* void.c in Sources */, 225D64BC1521BFA6008B2E81 /* address.c in Sources */, 225D64BD1521BFA6008B2E81 /* authentication.c in Sources */, 225D64BE1521BFA6008B2E81 /* callbacks.c in Sources */, 225D64BF1521BFA6008B2E81 /* chat.c in Sources */, - 225D64CE1521BFA6008B2E81 /* mswebcam.c in Sources */, - 225D64D11521BFA6008B2E81 /* ioscapture.m in Sources */, - 225D64D21521BFA6008B2E81 /* iosdisplay.m in Sources */, 225D64D31521BFA6008B2E81 /* filter-template.c in Sources */, - 225D64D41521BFA6008B2E81 /* nowebcam.c in Sources */, - 225D64D51521BFA6008B2E81 /* videostream.c in Sources */, - 225D64D61521BFA6008B2E81 /* videoenc.c in Sources */, - 225D64D71521BFA6008B2E81 /* videodec.c in Sources */, - 225D64D81521BFA6008B2E81 /* msvideo.c in Sources */, - 225D64D91521BFA6008B2E81 /* pixconv.c in Sources */, - 225D64DA1521BFA6008B2E81 /* tonedetector.c in Sources */, - 225D64DB1521BFA6008B2E81 /* jpegwriter.c in Sources */, - 225D64DC1521BFA6008B2E81 /* h264dec.c in Sources */, - 225D64DD1521BFA6008B2E81 /* sizeconv.c in Sources */, - 225D64DE1521BFA6008B2E81 /* scaler.c in Sources */, - 225D64DF1521BFA6008B2E81 /* qualityindicator.c in Sources */, - 225D64E01521BFA6008B2E81 /* bitratecontrol.c in Sources */, - 225D64E11521BFA6008B2E81 /* g722_decode.c in Sources */, - 225D64E21521BFA6008B2E81 /* g722_encode.c in Sources */, - 225D64E31521BFA6008B2E81 /* msg722.c in Sources */, - 225D64E41521BFA6008B2E81 /* vp8.c in Sources */, - 225D64E61521BFA6008B2E81 /* shaders.c in Sources */, - 225D64E81521BFA6008B2E81 /* msvideo_neon.c in Sources */, - 225D64E91521BFA6008B2E81 /* conference.c in Sources */, - 225D64EA1521BFA6008B2E81 /* audioconference.c in Sources */, - 225D64ED1521BFA6008B2E81 /* bitratedriver.c in Sources */, - 225D64EE1521BFA6008B2E81 /* qosanalyzer.c in Sources */, - 225D64EF1521BFA6008B2E81 /* aqsnd.c in Sources */, - 225D64F01521BFA6008B2E81 /* l16.c in Sources */, - 221DCB4D1529E2EB0025E54D /* msiounit.m in Sources */, - 221DCB6915347EF80025E54D /* opengles_display.c in Sources */, 221DCB6D153584410025E54D /* yuv2rgb.fs in Sources */, 221DCB6F153584410025E54D /* yuv2rgb.vs in Sources */, - 22405EE01600668800B92522 /* msvoip.c in Sources */, - 22405EE81600675C00B92522 /* genericplc.c 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 */, + 223CA88B16D9268D00EF1BEC /* msqueue.c in Sources */, + 223CA88C16D9268D00EF1BEC /* mssndcard.c in Sources */, + 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 */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1732,17 +2002,22 @@ 222CA77911F6CFB100621220 /* presence.c in Sources */, 222CA77B11F6CFB100621220 /* proxy.c in Sources */, 222CA77C11F6CFB100621220 /* sal.c in Sources */, - 222CA77E11F6CFB100621220 /* sal_eXosip2.c in Sources */, - 222CA78011F6CFB100621220 /* sal_eXosip2_presence.c in Sources */, - 222CA78111F6CFB100621220 /* sal_eXosip2_sdp.c in Sources */, 222CA78411F6CFB100621220 /* siplogin.c in Sources */, 222CA78511F6CFB100621220 /* sipsetup.c in Sources */, 229ECDED143AEBDA00D611B8 /* conference.c in Sources */, 221DCB561529FE660025E54D /* linphonecall.c in Sources */, 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */, - 221DCB6815347EF80025E54D /* opengles_display.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 */, + 223CA8E716D9298F00EF1BEC /* sal_op_call_transfer.c in Sources */, + 223CA8E816D9298F00EF1BEC /* sal_op_impl.c in Sources */, + 223CA8E916D9298F00EF1BEC /* sal_op_message.c in Sources */, + 223CA8EA16D9298F00EF1BEC /* sal_op_presence.c in Sources */, + 223CA8EB16D9298F00EF1BEC /* sal_op_registration.c in Sources */, + 223CA8EC16D9298F00EF1BEC /* sal_sdp.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1805,27 +2080,6 @@ 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__, - MS2_INTERNAL, - VIDEO_ENABLED, - HAVE_LIBAVCODEC_AVCODEC_H, - HAVE_LIBSWSCALE_SWSCALE_H, - TARGET_OS_IPHONE, - ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; @@ -1859,27 +2113,6 @@ 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__, - MS2_INTERNAL, - VIDEO_ENABLED, - HAVE_LIBAVCODEC_AVCODEC_H, - HAVE_LIBSWSCALE_SWSCALE_H, - TARGET_OS_IPHONE, - ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; @@ -1916,18 +2149,23 @@ ORTP_INET6, ENABLE_TRACE, "LINPHONE_VERSION=\\\"debug\\\"", - "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "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, - __MACIOUNIT_ENABLED__, - HAVE_EXOSIP_GET_SOCKET, + __MAC_AQ_ENABLED__, MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + "TARGET_OS_IPHONE=1", + USE_BELLESIP, + "PACKAGE_NAME=\\\"Linphone\\\"", + "POSIXTIMER_INTERVAL=10000", ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -1956,18 +2194,23 @@ ORTP_INET6, ENABLE_TRACE, "LINPHONE_VERSION=\\\"debug\\\"", - "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "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, - __MACIOUNIT_ENABLED__, - HAVE_EXOSIP_GET_SOCKET, + __MAC_AQ_ENABLED__, MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + "TARGET_OS_IPHONE=1", + USE_BELLESIP, + "PACKAGE_NAME=\\\"Linphone\\\"", + "POSIXTIMER_INTERVAL=10000", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1987,6 +2230,174 @@ }; name = Release; }; + 223CA95016DA10AB00EF1BEC /* 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 = ( + IPV6_PKTINFO, + "_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__, + MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + TARGET_OS_IPHONE, + ); + 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 = "libortp copy"; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 223CA95116DA10AB00EF1BEC /* 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 = ( + IPV6_PKTINFO, + "_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__, + MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + TARGET_OS_IPHONE, + ); + 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 = "libortp copy"; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 223CA95216DA10AB00EF1BEC /* 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 = ( + IPV6_PKTINFO, + "_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__, + MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + TARGET_OS_IPHONE, + ); + 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 = "libortp copy"; + SKIP_INSTALL = YES; + }; + name = DistributionAdhoc; + }; 225D64F51521BFA6008B2E81 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2336,18 +2747,23 @@ ORTP_INET6, ENABLE_TRACE, "LINPHONE_VERSION=\\\"debug\\\"", - "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "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, - __MACIOUNIT_ENABLED__, - HAVE_EXOSIP_GET_SOCKET, + __MAC_AQ_ENABLED__, MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + "TARGET_OS_IPHONE=1", + USE_BELLESIP, + "PACKAGE_NAME=\\\"Linphone\\\"", + "POSIXTIMER_INTERVAL=10000", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -2375,27 +2791,6 @@ 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__, - MS2_INTERNAL, - VIDEO_ENABLED, - HAVE_LIBAVCODEC_AVCODEC_H, - HAVE_LIBSWSCALE_SWSCALE_H, - TARGET_OS_IPHONE, - ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; @@ -2590,6 +2985,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 223CA94F16DA10AB00EF1BEC /* Build configuration list for PBXNativeTarget "libbellesip" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 223CA95016DA10AB00EF1BEC /* Debug */, + 223CA95116DA10AB00EF1BEC /* Release */, + 223CA95216DA10AB00EF1BEC /* DistributionAdhoc */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 225D64F41521BFA6008B2E81 /* Build configuration list for PBXNativeTarget "libmediastreamer" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/submodules/linphone b/submodules/linphone index a8f757be7..0b06ac3fb 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a8f757be70c4a1af8477c038aae155bef7b474b7 +Subproject commit 0b06ac3fb57e7e4453c6ee3be79663011f4bd3b0 From 293e9818c292689d72f80d5714e3e0484db0a12f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 27 Feb 2013 14:54:06 +0100 Subject: [PATCH 002/218] remove unwanted submodules --- submodules/externals/exosip | 1 - submodules/externals/libantlr3c | 1 - submodules/externals/osip | 1 - 3 files changed, 3 deletions(-) delete mode 160000 submodules/externals/exosip delete mode 160000 submodules/externals/libantlr3c delete mode 160000 submodules/externals/osip diff --git a/submodules/externals/exosip b/submodules/externals/exosip deleted file mode 160000 index ea5d69281..000000000 --- a/submodules/externals/exosip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ea5d692816953ac506464a53238f2103cda8cfee diff --git a/submodules/externals/libantlr3c b/submodules/externals/libantlr3c deleted file mode 160000 index eb738fb40..000000000 --- a/submodules/externals/libantlr3c +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eb738fb406d2b75e7e94457da800c38d8bfc3c71 diff --git a/submodules/externals/osip b/submodules/externals/osip deleted file mode 160000 index 7e98a3379..000000000 --- a/submodules/externals/osip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e98a3379280307811ed4ad67a95fbf73ba5bbb6 From 734426924399cf2d3ad099339ccfd7bbbd84fe96 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 27 Feb 2013 18:37:58 +0100 Subject: [PATCH 003/218] update bellesip with a fix force closed socket server --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index d5d4a0243..d6ed4ddf1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit d5d4a0243a48f9207b4c478051dc74d35eeaadb0 +Subproject commit d6ed4ddf1e12c3105b51fee0a895a76f96c8a5ec From b01f675674e0bb7da2ec5610d72cf09844a242eb Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 8 Mar 2013 15:47:57 +0100 Subject: [PATCH 004/218] enable push with belle-sip --- submodules/belle-sip | 2 +- submodules/build/builder-iphone-os.mk | 3 ++- submodules/linphone | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index d6ed4ddf1..079445bf2 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit d6ed4ddf1e12c3105b51fee0a895a76f96c8a5ec +Subproject commit 079445bf2072a6e3336dc3f00900753b0738052c diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 7a0314dc1..2ca2f3b62 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -38,7 +38,8 @@ linphone_configure_controls= \ --with-gsm=$(prefix) \ --disable-tests \ --with-srtp=$(prefix) \ - --with-antlr=$(prefix) + --with-antlr=$(prefix) \ + --disable-msg-storage ifeq ($(enable_zrtp),yes) linphone_configure_controls+= --enable-zrtp diff --git a/submodules/linphone b/submodules/linphone index 0b06ac3fb..e4eb9965a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0b06ac3fb57e7e4453c6ee3be79663011f4bd3b0 +Subproject commit e4eb9965ad99bb7aac1ea1ed4ac817c4392d5135 From abf079739f743fa0c2bab88a51215ecaf25a4d7d Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 15 Mar 2013 15:17:20 +0100 Subject: [PATCH 005/218] update both belle-sip & linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 079445bf2..c84fb68cd 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 079445bf2072a6e3336dc3f00900753b0738052c +Subproject commit c84fb68cd38c21510f59820471d4356e2538ed5f diff --git a/submodules/linphone b/submodules/linphone index e4eb9965a..4ee33b245 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e4eb9965ad99bb7aac1ea1ed4ac817c4392d5135 +Subproject commit 4ee33b2459883210b6ea53aded805483ec3c50a8 From 221d2dd073705cec008f5acf40617d1c9d7a032f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 15 Mar 2013 21:46:36 +0100 Subject: [PATCH 006/218] fix liblinphone.xcodeproj --- .../liblinphone.xcodeproj/project.pbxproj | 986 +++++++++--------- 1 file changed, 471 insertions(+), 515 deletions(-) diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 5b7ff9953..6ded720c2 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -16,20 +16,15 @@ 220ED1A313A903BF00AC21E0 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A213A903BF00AC21E0 /* libgsm.a */; }; 220ED1A713A9040700AC21E0 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A613A9040700AC21E0 /* AudioToolbox.framework */; }; 220ED1A913A9041800AC21E0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED1A813A9041800AC21E0 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Required, ); }; }; - 220ED1AC13A9062600AC21E0 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; }; 2211DB9F14765CED00DEE054 /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB9E14765CEC00DEE054 /* libmssilk.a */; }; 2211DBA1147660BB00DEE054 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */; }; - 221DCB4D1529E2EB0025E54D /* msiounit.m in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60511F6CF7600621220 /* msiounit.m */; }; 221DCB561529FE660025E54D /* linphonecall.c in Sources */ = {isa = PBXBuildFile; fileRef = 225D3559124B1FF60008581C /* linphonecall.c */; }; 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */ = {isa = PBXBuildFile; fileRef = 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */; }; - 221DCB6815347EF80025E54D /* opengles_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6715347EF80025E54D /* opengles_display.c */; }; - 221DCB6915347EF80025E54D /* opengles_display.c in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6715347EF80025E54D /* opengles_display.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 */; }; - 221F58E413AF44B300D603C9 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; }; 222CA63211F6CF7600621220 /* allfilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BE11F6CF7600621220 /* allfilters.h */; }; 222CA63311F6CF7600621220 /* dsptools.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BF11F6CF7600621220 /* dsptools.h */; }; 222CA63411F6CF7600621220 /* dtmfgen.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5C011F6CF7600621220 /* dtmfgen.h */; }; @@ -58,13 +53,6 @@ 222CA64B11F6CF7600621220 /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; 222CA64C11F6CF7600621220 /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; 222CA64D11F6CF7600621220 /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; - 222CA64E11F6CF7600621220 /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */; }; - 222CA65E11F6CF7600621220 /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */; }; - 222CA65F11F6CF7600621220 /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EF11F6CF7600621220 /* g711common.h */; }; - 222CA66511F6CF7600621220 /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F511F6CF7600621220 /* kiss_fft.h */; }; - 222CA66711F6CF7600621220 /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F711F6CF7600621220 /* kiss_fftr.h */; }; - 222CA68811F6CF7600621220 /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA61B11F6CF7600621220 /* rfc2429.h */; }; - 222CA69111F6CF7600621220 /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA62411F6CF7600621220 /* vfw-missing.h */; }; 222CA6F411F6CF9F00621220 /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; 222CA6F511F6CF9F00621220 /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; 222CA6F611F6CF9F00621220 /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; @@ -105,20 +93,97 @@ 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 */; }; - 222CA77E11F6CFB100621220 /* sal_eXosip2.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75C11F6CFB100621220 /* sal_eXosip2.c */; }; - 222CA77F11F6CFB100621220 /* sal_eXosip2.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75D11F6CFB100621220 /* sal_eXosip2.h */; }; - 222CA78011F6CFB100621220 /* sal_eXosip2_presence.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75E11F6CFB100621220 /* sal_eXosip2_presence.c */; }; - 222CA78111F6CFB100621220 /* sal_eXosip2_sdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA75F11F6CFB100621220 /* sal_eXosip2_sdp.c */; }; 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 */; }; + 223CA88A16D9268D00EF1BEC /* msfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81416D9268D00EF1BEC /* msfilter.c */; }; + 223CA88B16D9268D00EF1BEC /* msqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81516D9268D00EF1BEC /* msqueue.c */; }; + 223CA88C16D9268D00EF1BEC /* mssndcard.c in Sources */ = {isa = PBXBuildFile; fileRef = 223CA81616D9268D00EF1BEC /* mssndcard.c */; }; + 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 */; }; 22405EDD160065C200B92522 /* basedescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EDC160065C200B92522 /* basedescs.h */; }; - 22405EE01600668800B92522 /* msvoip.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EDF1600668800B92522 /* msvoip.c */; }; 22405EE2160066C700B92522 /* voipdescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EE1160066C700B92522 /* voipdescs.h */; }; 22405EE51600671D00B92522 /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE31600671D00B92522 /* logging.c */; }; 22405EE61600671D00B92522 /* rtpprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE41600671D00B92522 /* rtpprofile.c */; }; - 22405EE81600675C00B92522 /* genericplc.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE71600675C00B92522 /* genericplc.c */; }; - 2258C44113A9377B0087A596 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; }; 2258C44513A945520087A596 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44213A945520087A596 /* libswscale.a */; }; 2258C44613A945520087A596 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44313A945520087A596 /* libavutil.a */; }; 2258C44713A945520087A596 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44413A945520087A596 /* libavcodec.a */; }; @@ -151,13 +216,6 @@ 225D64491521BFA6008B2E81 /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; 225D644A1521BFA6008B2E81 /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; 225D644B1521BFA6008B2E81 /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; - 225D644C1521BFA6008B2E81 /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */; }; - 225D644D1521BFA6008B2E81 /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */; }; - 225D644E1521BFA6008B2E81 /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EF11F6CF7600621220 /* g711common.h */; }; - 225D644F1521BFA6008B2E81 /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F511F6CF7600621220 /* kiss_fft.h */; }; - 225D64501521BFA6008B2E81 /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F711F6CF7600621220 /* kiss_fftr.h */; }; - 225D64511521BFA6008B2E81 /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA61B11F6CF7600621220 /* rfc2429.h */; }; - 225D64521521BFA6008B2E81 /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA62411F6CF7600621220 /* vfw-missing.h */; }; 225D64531521BFA6008B2E81 /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; 225D64541521BFA6008B2E81 /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; 225D64551521BFA6008B2E81 /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; @@ -185,7 +243,6 @@ 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 */; }; - 225D646E1521BFA6008B2E81 /* sal_eXosip2.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75D11F6CFB100621220 /* sal_eXosip2.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 */; }; @@ -194,79 +251,12 @@ 225D64741521BFA6008B2E81 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; 225D64751521BFA6008B2E81 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; 225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; - 225D64781521BFA6008B2E81 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; }; - 225D64791521BFA6008B2E81 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; }; - 225D647B1521BFA6008B2E81 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; }; - 225D647C1521BFA6008B2E81 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; }; - 225D647D1521BFA6008B2E81 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; }; 225D64811521BFA6008B2E81 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; - 225D64831521BFA6008B2E81 /* alaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5DF11F6CF7600621220 /* alaw.c */; }; - 225D64841521BFA6008B2E81 /* audiomixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E311F6CF7600621220 /* audiomixer.c */; }; - 225D64851521BFA6008B2E81 /* audiostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E411F6CF7600621220 /* audiostream.c */; }; - 225D64861521BFA6008B2E81 /* chanadapt.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E511F6CF7600621220 /* chanadapt.c */; }; - 225D64871521BFA6008B2E81 /* dsptools.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E711F6CF7600621220 /* dsptools.c */; }; - 225D64881521BFA6008B2E81 /* dtmfgen.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5E811F6CF7600621220 /* dtmfgen.c */; }; - 225D64891521BFA6008B2E81 /* equalizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5EB11F6CF7600621220 /* equalizer.c */; }; - 225D648A1521BFA6008B2E81 /* eventqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5EC11F6CF7600621220 /* eventqueue.c */; }; - 225D648B1521BFA6008B2E81 /* extdisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5ED11F6CF7600621220 /* extdisplay.c */; }; - 225D648C1521BFA6008B2E81 /* gsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F011F6CF7600621220 /* gsm.c */; }; - 225D648D1521BFA6008B2E81 /* ice.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F211F6CF7600621220 /* ice.c */; }; - 225D648E1521BFA6008B2E81 /* itc.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F311F6CF7600621220 /* itc.c */; }; - 225D648F1521BFA6008B2E81 /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F411F6CF7600621220 /* kiss_fft.c */; }; - 225D64901521BFA6008B2E81 /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5F611F6CF7600621220 /* kiss_fftr.c */; }; - 225D64911521BFA6008B2E81 /* mire.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5FB11F6CF7600621220 /* mire.c */; }; - 225D64921521BFA6008B2E81 /* mscommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5FD11F6CF7600621220 /* mscommon.c */; }; - 225D64931521BFA6008B2E81 /* msconf.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA5FE11F6CF7600621220 /* msconf.c */; }; - 225D64941521BFA6008B2E81 /* msfileplayer.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60011F6CF7600621220 /* msfileplayer.c */; }; - 225D64951521BFA6008B2E81 /* msfilerec.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60211F6CF7600621220 /* msfilerec.c */; }; - 225D64961521BFA6008B2E81 /* msfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60411F6CF7600621220 /* msfilter.c */; }; - 225D64981521BFA6008B2E81 /* msjoin.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60611F6CF7600621220 /* msjoin.c */; }; - 225D64991521BFA6008B2E81 /* msqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60711F6CF7600621220 /* msqueue.c */; }; - 225D649A1521BFA6008B2E81 /* msresample.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60811F6CF7600621220 /* msresample.c */; }; - 225D649B1521BFA6008B2E81 /* msrtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60911F6CF7600621220 /* msrtp.c */; }; - 225D649C1521BFA6008B2E81 /* mssndcard.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60A11F6CF7600621220 /* mssndcard.c */; }; - 225D649D1521BFA6008B2E81 /* msspeex.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60B11F6CF7600621220 /* msspeex.c */; }; - 225D649E1521BFA6008B2E81 /* msticker.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA60C11F6CF7600621220 /* msticker.c */; }; - 225D649F1521BFA6008B2E81 /* msvolume.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61111F6CF7600621220 /* msvolume.c */; }; - 225D64A01521BFA6008B2E81 /* mtu.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61311F6CF7600621220 /* mtu.c */; }; - 225D64A11521BFA6008B2E81 /* rfc3984.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61C11F6CF7600621220 /* rfc3984.c */; }; - 225D64A21521BFA6008B2E81 /* speexec.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA61F11F6CF7600621220 /* speexec.c */; }; - 225D64A31521BFA6008B2E81 /* tee.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA62111F6CF7600621220 /* tee.c */; }; - 225D64A41521BFA6008B2E81 /* ulaw.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA62311F6CF7600621220 /* ulaw.c */; }; - 225D64A51521BFA6008B2E81 /* void.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA62911F6CF7600621220 /* void.c */; }; 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 */; }; - 225D64CE1521BFA6008B2E81 /* mswebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 22A10EE711F8920F00373793 /* mswebcam.c */; }; - 225D64D11521BFA6008B2E81 /* ioscapture.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D15AB3139F505400C7713A /* ioscapture.m */; }; - 225D64D21521BFA6008B2E81 /* iosdisplay.m in Sources */ = {isa = PBXBuildFile; fileRef = 2203127113A247B40049A2ED /* iosdisplay.m */; }; 225D64D31521BFA6008B2E81 /* filter-template.c in Sources */ = {isa = PBXBuildFile; fileRef = 2203127413A249F70049A2ED /* filter-template.c */; }; - 225D64D41521BFA6008B2E81 /* nowebcam.c in Sources */ = {isa = PBXBuildFile; fileRef = 220ED1AB13A9062500AC21E0 /* nowebcam.c */; }; - 225D64D51521BFA6008B2E81 /* videostream.c in Sources */ = {isa = PBXBuildFile; fileRef = 2258C44813A946890087A596 /* videostream.c */; }; - 225D64D61521BFA6008B2E81 /* videoenc.c in Sources */ = {isa = PBXBuildFile; fileRef = 2258C44913A946890087A596 /* videoenc.c */; }; - 225D64D71521BFA6008B2E81 /* videodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 2258C44A13A946890087A596 /* videodec.c */; }; - 225D64D81521BFA6008B2E81 /* msvideo.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F589B13AB4FC500D603C9 /* msvideo.c */; }; - 225D64D91521BFA6008B2E81 /* pixconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A113AB6F8000D603C9 /* pixconv.c */; }; - 225D64DA1521BFA6008B2E81 /* tonedetector.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A513AB716300D603C9 /* tonedetector.c */; }; - 225D64DB1521BFA6008B2E81 /* jpegwriter.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A613AB716300D603C9 /* jpegwriter.c */; }; - 225D64DC1521BFA6008B2E81 /* h264dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58A713AB716300D603C9 /* h264dec.c */; }; - 225D64DD1521BFA6008B2E81 /* sizeconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58AB13AB71A400D603C9 /* sizeconv.c */; }; - 225D64DE1521BFA6008B2E81 /* scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = 221F58AD13ABA42800D603C9 /* scaler.c */; }; - 225D64DF1521BFA6008B2E81 /* qualityindicator.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */; }; - 225D64E01521BFA6008B2E81 /* bitratecontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */; }; - 225D64E11521BFA6008B2E81 /* g722_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614913DDFE3500090183 /* g722_decode.c */; }; - 225D64E21521BFA6008B2E81 /* g722_encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614A13DDFE3500090183 /* g722_encode.c */; }; - 225D64E31521BFA6008B2E81 /* msg722.c in Sources */ = {isa = PBXBuildFile; fileRef = 229A614C13DDFE3500090183 /* msg722.c */; }; - 225D64E41521BFA6008B2E81 /* vp8.c in Sources */ = {isa = PBXBuildFile; fileRef = 7066FC0613E82A3600EFC6DC /* vp8.c */; }; - 225D64E61521BFA6008B2E81 /* shaders.c in Sources */ = {isa = PBXBuildFile; fileRef = 7014533713FA7AEA00A01D86 /* shaders.c */; }; - 225D64E81521BFA6008B2E81 /* msvideo_neon.c in Sources */ = {isa = PBXBuildFile; fileRef = 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */; }; - 225D64E91521BFA6008B2E81 /* conference.c in Sources */ = {isa = PBXBuildFile; fileRef = 229ECDEC143AEBDA00D611B8 /* conference.c */; }; - 225D64EA1521BFA6008B2E81 /* audioconference.c in Sources */ = {isa = PBXBuildFile; fileRef = 229ECDEE143AEC2400D611B8 /* audioconference.c */; }; - 225D64ED1521BFA6008B2E81 /* bitratedriver.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F25E14583B580035B0D0 /* bitratedriver.c */; }; - 225D64EE1521BFA6008B2E81 /* qosanalyzer.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F25F14583B580035B0D0 /* qosanalyzer.c */; }; - 225D64EF1521BFA6008B2E81 /* aqsnd.c in Sources */ = {isa = PBXBuildFile; fileRef = 22512698145F13CE0041FBF2 /* aqsnd.c */; }; - 225D64F01521BFA6008B2E81 /* l16.c in Sources */ = {isa = PBXBuildFile; fileRef = 2211DB9B1476539600DEE054 /* l16.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 */; }; @@ -298,13 +288,6 @@ 225D65161521C009008B2E81 /* mswebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5D911F6CF7600621220 /* mswebcam.h */; }; 225D65171521C009008B2E81 /* rfc3984.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DA11F6CF7600621220 /* rfc3984.h */; }; 225D65181521C009008B2E81 /* waveheader.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DB11F6CF7600621220 /* waveheader.h */; }; - 225D65191521C009008B2E81 /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */; }; - 225D651A1521C009008B2E81 /* ffmpeg-priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */; }; - 225D651B1521C009008B2E81 /* g711common.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5EF11F6CF7600621220 /* g711common.h */; }; - 225D651C1521C009008B2E81 /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F511F6CF7600621220 /* kiss_fft.h */; }; - 225D651D1521C009008B2E81 /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5F711F6CF7600621220 /* kiss_fftr.h */; }; - 225D651E1521C009008B2E81 /* rfc2429.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA61B11F6CF7600621220 /* rfc2429.h */; }; - 225D651F1521C009008B2E81 /* vfw-missing.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA62411F6CF7600621220 /* vfw-missing.h */; }; 225D65201521C009008B2E81 /* b64.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A511F6CF9F00621220 /* b64.h */; }; 225D65211521C009008B2E81 /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A611F6CF9F00621220 /* event.h */; }; 225D65221521C009008B2E81 /* ortp.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA6A911F6CF9F00621220 /* ortp.h */; }; @@ -332,7 +315,6 @@ 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 */; }; - 225D653B1521C009008B2E81 /* sal_eXosip2.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA75D11F6CFB100621220 /* sal_eXosip2.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 */; }; @@ -341,11 +323,6 @@ 225D65411521C009008B2E81 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; 225D65421521C009008B2E81 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; 225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; - 225D65451521C009008B2E81 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; }; - 225D65461521C009008B2E81 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; }; - 225D65481521C009008B2E81 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; }; - 225D65491521C009008B2E81 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; }; - 225D654A1521C009008B2E81 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; }; 225D654E1521C009008B2E81 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; 225D65731521C009008B2E81 /* avprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6B811F6CF9F00621220 /* avprofile.c */; }; 225D65741521C009008B2E81 /* b64.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA6B911F6CF9F00621220 /* b64.c */; }; @@ -376,7 +353,6 @@ 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 */; }; 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 225D65C51521C009008B2E81 /* libortp.a */; }; - 229A614F13DDFE3500090183 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; }; 229A615313DEE8A500090183 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 229A615113DEE8A400090183 /* libx264.a */; }; 229A615413DEE8A500090183 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 229A615213DEE8A400090183 /* libmsx264.a */; }; 229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; @@ -387,21 +363,21 @@ 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 */; }; - 22B5106913B060E100CD87DA /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */; }; + 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 */; }; 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 */; }; - 22DD19F713A8DFA70018ECD4 /* mediastream.c in Sources */ = {isa = PBXBuildFile; fileRef = 22DD19E713A8D82C0018ECD4 /* mediastream.c */; }; - 22DD21AE13A8E3310018ECD4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A113A8E3310018ECD4 /* InfoPlist.strings */; }; - 22DD21AF13A8E3310018ECD4 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A313A8E3310018ECD4 /* MainWindow.xib */; }; - 22DD21B013A8E3310018ECD4 /* mediastreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */; }; - 22DD21B313A8E3310018ECD4 /* mediastreamAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */; }; - 22DD21B413A8E3310018ECD4 /* mediastreamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */; }; 7014533C13FA7ECA00A01D86 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; 7066FC0A13E830B800EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0913E830B800EFC6DC /* libvpx.a */; }; 70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */; }; 70E542F113E147CE002BA2C0 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F013E147CE002BA2C0 /* QuartzCore.framework */; }; - 70E542FA13E14816002BA2C0 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; }; AA747D9F0F9514B9006C5449 /* liblinphone_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */; }; AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; }; /* End PBXBuildFile section */ @@ -445,7 +421,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2203127113A247B40049A2ED /* iosdisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iosdisplay.m; sourceTree = ""; }; 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; 220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 220ED19813A8F87700AC21E0 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; @@ -456,25 +431,13 @@ 220ED1A413A903E100AC21E0 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 220ED1A613A9040700AC21E0 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 220ED1A813A9041800AC21E0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; - 220ED1AA13A9062500AC21E0 /* nowebcam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nowebcam.h; sourceTree = ""; }; - 220ED1AB13A9062500AC21E0 /* nowebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nowebcam.c; sourceTree = ""; }; - 2211DB9B1476539600DEE054 /* l16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l16.c; sourceTree = ""; }; 2211DB9E14765CEC00DEE054 /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = ""; }; 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "../liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = ""; }; - 221DCB6715347EF80025E54D /* opengles_display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opengles_display.c; sourceTree = ""; }; 221DCB6A153584410025E54D /* yuv2rgb.fs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = yuv2rgb.fs; sourceTree = ""; }; 221DCB6B153584410025E54D /* yuv2rgb.vs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = yuv2rgb.vs; sourceTree = ""; }; 221F589913AB4EEE00D603C9 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - 221F589B13AB4FC500D603C9 /* msvideo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo.c; sourceTree = ""; }; 221F589D13AB503F00D603C9 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 221F589F13AB50F800D603C9 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; - 221F58A113AB6F8000D603C9 /* pixconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pixconv.c; sourceTree = ""; }; - 221F58A513AB716300D603C9 /* tonedetector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonedetector.c; sourceTree = ""; }; - 221F58A613AB716300D603C9 /* jpegwriter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpegwriter.c; sourceTree = ""; }; - 221F58A713AB716300D603C9 /* h264dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = h264dec.c; sourceTree = ""; }; - 221F58AB13AB71A400D603C9 /* sizeconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sizeconv.c; sourceTree = ""; }; - 221F58AD13ABA42800D603C9 /* scaler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scaler.c; sourceTree = ""; }; - 221F58E313AF44B300D603C9 /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scaler.h; sourceTree = ""; }; 222CA5B911F6CF7600621220 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; 222CA5BA11F6CF7600621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 222CA5BB11F6CF7600621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; @@ -510,50 +473,8 @@ 222CA5DA11F6CF7600621220 /* rfc3984.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfc3984.h; sourceTree = ""; }; 222CA5DB11F6CF7600621220 /* waveheader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = waveheader.h; sourceTree = ""; }; 222CA5DD11F6CF7600621220 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; - 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _kiss_fft_guts.h; sourceTree = ""; }; - 222CA5DF11F6CF7600621220 /* alaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alaw.c; sourceTree = ""; }; - 222CA5E311F6CF7600621220 /* audiomixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiomixer.c; sourceTree = ""; }; - 222CA5E411F6CF7600621220 /* audiostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiostream.c; sourceTree = ""; }; - 222CA5E511F6CF7600621220 /* chanadapt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chanadapt.c; sourceTree = ""; }; - 222CA5E711F6CF7600621220 /* dsptools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsptools.c; sourceTree = ""; }; - 222CA5E811F6CF7600621220 /* dtmfgen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dtmfgen.c; sourceTree = ""; }; - 222CA5EB11F6CF7600621220 /* equalizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = equalizer.c; sourceTree = ""; }; - 222CA5EC11F6CF7600621220 /* eventqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventqueue.c; sourceTree = ""; }; - 222CA5ED11F6CF7600621220 /* extdisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = extdisplay.c; sourceTree = ""; }; - 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ffmpeg-priv.h"; sourceTree = ""; }; - 222CA5EF11F6CF7600621220 /* g711common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g711common.h; sourceTree = ""; }; - 222CA5F011F6CF7600621220 /* gsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gsm.c; sourceTree = ""; }; - 222CA5F211F6CF7600621220 /* ice.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ice.c; sourceTree = ""; }; - 222CA5F311F6CF7600621220 /* itc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = itc.c; sourceTree = ""; }; - 222CA5F411F6CF7600621220 /* kiss_fft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fft.c; sourceTree = ""; }; - 222CA5F511F6CF7600621220 /* kiss_fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fft.h; sourceTree = ""; }; - 222CA5F611F6CF7600621220 /* kiss_fftr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fftr.c; sourceTree = ""; }; - 222CA5F711F6CF7600621220 /* kiss_fftr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fftr.h; sourceTree = ""; }; 222CA5F911F6CF7600621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 222CA5FA11F6CF7600621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; - 222CA5FB11F6CF7600621220 /* mire.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mire.c; sourceTree = ""; }; - 222CA5FD11F6CF7600621220 /* mscommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mscommon.c; sourceTree = ""; }; - 222CA5FE11F6CF7600621220 /* msconf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msconf.c; sourceTree = ""; }; - 222CA60011F6CF7600621220 /* msfileplayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfileplayer.c; sourceTree = ""; }; - 222CA60211F6CF7600621220 /* msfilerec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilerec.c; sourceTree = ""; }; - 222CA60411F6CF7600621220 /* msfilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilter.c; sourceTree = ""; }; - 222CA60511F6CF7600621220 /* msiounit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = msiounit.m; sourceTree = ""; }; - 222CA60611F6CF7600621220 /* msjoin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msjoin.c; sourceTree = ""; }; - 222CA60711F6CF7600621220 /* msqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msqueue.c; sourceTree = ""; }; - 222CA60811F6CF7600621220 /* msresample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msresample.c; sourceTree = ""; }; - 222CA60911F6CF7600621220 /* msrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msrtp.c; sourceTree = ""; }; - 222CA60A11F6CF7600621220 /* mssndcard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mssndcard.c; sourceTree = ""; }; - 222CA60B11F6CF7600621220 /* msspeex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msspeex.c; sourceTree = ""; }; - 222CA60C11F6CF7600621220 /* msticker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msticker.c; sourceTree = ""; }; - 222CA61111F6CF7600621220 /* msvolume.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvolume.c; sourceTree = ""; }; - 222CA61311F6CF7600621220 /* mtu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mtu.c; sourceTree = ""; }; - 222CA61B11F6CF7600621220 /* rfc2429.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfc2429.h; sourceTree = ""; }; - 222CA61C11F6CF7600621220 /* rfc3984.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rfc3984.c; sourceTree = ""; }; - 222CA61F11F6CF7600621220 /* speexec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = speexec.c; sourceTree = ""; }; - 222CA62111F6CF7600621220 /* tee.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tee.c; sourceTree = ""; }; - 222CA62311F6CF7600621220 /* ulaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ulaw.c; sourceTree = ""; }; - 222CA62411F6CF7600621220 /* vfw-missing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "vfw-missing.h"; sourceTree = ""; }; - 222CA62911F6CF7600621220 /* void.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = void.c; sourceTree = ""; }; 222CA6A011F6CF9E00621220 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; 222CA6A111F6CF9E00621220 /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; 222CA6A211F6CF9F00621220 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; @@ -633,42 +554,109 @@ 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 = ""; }; - 222CA75C11F6CFB100621220 /* sal_eXosip2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2.c; sourceTree = ""; }; - 222CA75D11F6CFB100621220 /* sal_eXosip2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sal_eXosip2.h; sourceTree = ""; }; - 222CA75E11F6CFB100621220 /* sal_eXosip2_presence.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2_presence.c; sourceTree = ""; }; - 222CA75F11F6CFB100621220 /* sal_eXosip2_sdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2_sdp.c; 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 = ""; }; - 22313679143DED490035C1F4 /* msandroidvideo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = msandroidvideo.cpp; sourceTree = ""; }; + 223CA7F016D9268D00EF1BEC /* alaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alaw.c; sourceTree = ""; }; + 223CA7F216D9268D00EF1BEC /* aqsnd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aqsnd.c; sourceTree = ""; }; + 223CA7F416D9268D00EF1BEC /* audiomixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiomixer.c; sourceTree = ""; }; + 223CA7F516D9268D00EF1BEC /* chanadapt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chanadapt.c; sourceTree = ""; }; + 223CA7F616D9268D00EF1BEC /* dtmfgen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dtmfgen.c; sourceTree = ""; }; + 223CA7F716D9268D00EF1BEC /* equalizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = equalizer.c; sourceTree = ""; }; + 223CA7F916D9268D00EF1BEC /* genericplc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genericplc.c; sourceTree = ""; }; + 223CA7FA16D9268D00EF1BEC /* gsm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gsm.c; sourceTree = ""; }; + 223CA7FB16D9268D00EF1BEC /* l16.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = l16.c; sourceTree = ""; }; + 223CA7FD16D9268D00EF1BEC /* msconf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msconf.c; sourceTree = ""; }; + 223CA7FE16D9268D00EF1BEC /* msfileplayer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfileplayer.c; sourceTree = ""; }; + 223CA7FF16D9268D00EF1BEC /* msfilerec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilerec.c; sourceTree = ""; }; + 223CA80016D9268D00EF1BEC /* msg722.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msg722.c; sourceTree = ""; }; + 223CA80116D9268D00EF1BEC /* msiounit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = msiounit.m; sourceTree = ""; }; + 223CA80216D9268D00EF1BEC /* msresample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msresample.c; sourceTree = ""; }; + 223CA80316D9268D00EF1BEC /* msspeex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msspeex.c; sourceTree = ""; }; + 223CA80416D9268D00EF1BEC /* msvolume.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvolume.c; sourceTree = ""; }; + 223CA80916D9268D00EF1BEC /* tonedetector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonedetector.c; sourceTree = ""; }; + 223CA80A16D9268D00EF1BEC /* ulaw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ulaw.c; sourceTree = ""; }; + 223CA80B16D9268D00EF1BEC /* waveheader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = waveheader.h; sourceTree = ""; }; + 223CA81216D9268D00EF1BEC /* eventqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventqueue.c; sourceTree = ""; }; + 223CA81316D9268D00EF1BEC /* mscommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mscommon.c; sourceTree = ""; }; + 223CA81416D9268D00EF1BEC /* msfilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msfilter.c; sourceTree = ""; }; + 223CA81516D9268D00EF1BEC /* msqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msqueue.c; sourceTree = ""; }; + 223CA81616D9268D00EF1BEC /* mssndcard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mssndcard.c; sourceTree = ""; }; + 223CA81716D9268D00EF1BEC /* msticker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msticker.c; sourceTree = ""; }; + 223CA81816D9268D00EF1BEC /* mswebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mswebcam.c; sourceTree = ""; }; + 223CA81916D9268D00EF1BEC /* mtu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mtu.c; sourceTree = ""; }; + 223CA81B16D9268D00EF1BEC /* itc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = itc.c; sourceTree = ""; }; + 223CA81C16D9268D00EF1BEC /* join.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = join.c; sourceTree = ""; }; + 223CA81D16D9268D00EF1BEC /* msrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msrtp.c; sourceTree = ""; }; + 223CA81E16D9268D00EF1BEC /* tee.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tee.c; sourceTree = ""; }; + 223CA81F16D9268D00EF1BEC /* void.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = void.c; sourceTree = ""; }; + 223CA82116D9268D00EF1BEC /* _kiss_fft_guts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _kiss_fft_guts.h; sourceTree = ""; }; + 223CA82216D9268D00EF1BEC /* dsptools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsptools.c; sourceTree = ""; }; + 223CA82316D9268D00EF1BEC /* ffmpeg-priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ffmpeg-priv.h"; sourceTree = ""; }; + 223CA82416D9268D00EF1BEC /* g711common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g711common.h; sourceTree = ""; }; + 223CA82516D9268D00EF1BEC /* g722.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g722.h; sourceTree = ""; }; + 223CA82616D9268D00EF1BEC /* g722_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_decode.c; sourceTree = ""; }; + 223CA82716D9268D00EF1BEC /* g722_encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_encode.c; sourceTree = ""; }; + 223CA82816D9268D00EF1BEC /* kiss_fft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fft.c; sourceTree = ""; }; + 223CA82916D9268D00EF1BEC /* kiss_fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fft.h; sourceTree = ""; }; + 223CA82A16D9268D00EF1BEC /* kiss_fftr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kiss_fftr.c; sourceTree = ""; }; + 223CA82B16D9268D00EF1BEC /* kiss_fftr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kiss_fftr.h; sourceTree = ""; }; + 223CA82D16D9268D00EF1BEC /* opengles_display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opengles_display.c; sourceTree = ""; }; + 223CA82E16D9268D00EF1BEC /* opengles_display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opengles_display.h; sourceTree = ""; }; + 223CA82F16D9268D00EF1BEC /* shaders.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shaders.c; sourceTree = ""; }; + 223CA83016D9268D00EF1BEC /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shaders.h; sourceTree = ""; }; + 223CA83116D9268D00EF1BEC /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = ""; }; + 223CA83216D9268D00EF1BEC /* vfw-missing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "vfw-missing.h"; sourceTree = ""; }; + 223CA83516D9268D00EF1BEC /* extdisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = extdisplay.c; sourceTree = ""; }; + 223CA83716D9268D00EF1BEC /* h264dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = h264dec.c; sourceTree = ""; }; + 223CA83816D9268D00EF1BEC /* ioscapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioscapture.m; sourceTree = ""; }; + 223CA83916D9268D00EF1BEC /* iosdisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iosdisplay.m; sourceTree = ""; }; + 223CA83A16D9268D00EF1BEC /* jpegwriter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpegwriter.c; sourceTree = ""; }; + 223CA83B16D9268D00EF1BEC /* mire.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mire.c; sourceTree = ""; }; + 223CA84016D9268D00EF1BEC /* nowebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nowebcam.c; sourceTree = ""; }; + 223CA84116D9268D00EF1BEC /* pixconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pixconv.c; sourceTree = ""; }; + 223CA84316D9268D00EF1BEC /* sizeconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sizeconv.c; sourceTree = ""; }; + 223CA84516D9268D00EF1BEC /* videodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videodec.c; sourceTree = ""; }; + 223CA84616D9268D00EF1BEC /* videoenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videoenc.c; sourceTree = ""; }; + 223CA84816D9268D00EF1BEC /* vp8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vp8.c; sourceTree = ""; }; + 223CA84F16D9268D00EF1BEC /* audioconference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audioconference.c; sourceTree = ""; }; + 223CA85016D9268D00EF1BEC /* audiostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audiostream.c; sourceTree = ""; }; + 223CA85116D9268D00EF1BEC /* bitratecontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratecontrol.c; sourceTree = ""; }; + 223CA85216D9268D00EF1BEC /* bitratedriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratedriver.c; sourceTree = ""; }; + 223CA85316D9268D00EF1BEC /* ice.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ice.c; sourceTree = ""; }; + 223CA85416D9268D00EF1BEC /* layouts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = layouts.c; sourceTree = ""; }; + 223CA85516D9268D00EF1BEC /* layouts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = layouts.h; sourceTree = ""; }; + 223CA85616D9268D00EF1BEC /* mediastream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mediastream.c; sourceTree = ""; }; + 223CA85716D9268D00EF1BEC /* msvideo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo.c; sourceTree = ""; }; + 223CA85816D9268D00EF1BEC /* msvideo_neon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo_neon.c; sourceTree = ""; }; + 223CA85916D9268D00EF1BEC /* msvideo_neon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msvideo_neon.h; sourceTree = ""; }; + 223CA85A16D9268D00EF1BEC /* msvoip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvoip.c; sourceTree = ""; }; + 223CA85B16D9268D00EF1BEC /* nowebcam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nowebcam.h; sourceTree = ""; }; + 223CA85C16D9268D00EF1BEC /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = nowebcamCIF.jpg; sourceTree = ""; }; + 223CA85D16D9268D00EF1BEC /* private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = private.h; sourceTree = ""; }; + 223CA85E16D9268D00EF1BEC /* qosanalyzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qosanalyzer.c; sourceTree = ""; }; + 223CA85F16D9268D00EF1BEC /* qualityindicator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qualityindicator.c; sourceTree = ""; }; + 223CA86016D9268D00EF1BEC /* rfc2429.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfc2429.h; sourceTree = ""; }; + 223CA86116D9268D00EF1BEC /* rfc3984.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rfc3984.c; sourceTree = ""; }; + 223CA86216D9268D00EF1BEC /* ringstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ringstream.c; sourceTree = ""; }; + 223CA86316D9268D00EF1BEC /* scaler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scaler.c; sourceTree = ""; }; + 223CA86416D9268D00EF1BEC /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scaler.h; sourceTree = ""; }; + 223CA86616D9268D00EF1BEC /* videostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videostream.c; sourceTree = ""; }; 22405EDC160065C200B92522 /* basedescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = basedescs.h; path = build/iphone/basedescs.h; sourceTree = ""; }; - 22405EDF1600668800B92522 /* msvoip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvoip.c; sourceTree = ""; }; 22405EE1160066C700B92522 /* voipdescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = voipdescs.h; path = build/iphone/voipdescs.h; sourceTree = ""; }; 22405EE31600671D00B92522 /* logging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = logging.c; sourceTree = ""; }; 22405EE41600671D00B92522 /* rtpprofile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtpprofile.c; sourceTree = ""; }; - 22405EE71600675C00B92522 /* genericplc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genericplc.c; sourceTree = ""; }; - 22512698145F13CE0041FBF2 /* aqsnd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aqsnd.c; sourceTree = ""; }; 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ec-calibrator.c"; path = "linphone/coreapi/ec-calibrator.c"; sourceTree = SOURCE_ROOT; }; - 2258C44013A9377B0087A596 /* swscale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swscale.h; sourceTree = ""; }; 2258C44213A945520087A596 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; 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 = ""; }; - 2258C44813A946890087A596 /* videostream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videostream.c; sourceTree = ""; }; - 2258C44913A946890087A596 /* videoenc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videoenc.c; sourceTree = ""; }; - 2258C44A13A946890087A596 /* videodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = videodec.c; 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; }; 225D65C51521C009008B2E81 /* libortp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libortp.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 229A614913DDFE3500090183 /* g722_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_decode.c; sourceTree = ""; }; - 229A614A13DDFE3500090183 /* g722_encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g722_encode.c; sourceTree = ""; }; - 229A614B13DDFE3500090183 /* g722.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = g722.h; sourceTree = ""; }; - 229A614C13DDFE3500090183 /* msg722.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msg722.c; sourceTree = ""; }; 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 = ""; }; 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphonecore_utils.h; sourceTree = ""; }; - 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvideo_neon.c; sourceTree = ""; }; 229ECDEC143AEBDA00D611B8 /* conference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = conference.c; sourceTree = ""; }; - 229ECDEE143AEC2400D611B8 /* audioconference.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audioconference.c; sourceTree = ""; }; 22A10B4F11F84E2D00373793 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; 22A10B5011F84E2D00373793 /* gsm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gsm.h; sourceTree = ""; }; 22A10B5111F84E2D00373793 /* gsm.h.orig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gsm.h.orig; sourceTree = ""; }; @@ -676,40 +664,30 @@ 22A10B5311F84E2D00373793 /* proto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proto.h; sourceTree = ""; }; 22A10B5411F84E2D00373793 /* toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toast.h; sourceTree = ""; }; 22A10B5511F84E2D00373793 /* unproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unproto.h; sourceTree = ""; }; - 22A10EE711F8920F00373793 /* mswebcam.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mswebcam.c; path = linphone/mediastreamer2/src/mswebcam.c; sourceTree = SOURCE_ROOT; }; - 22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = src/nowebcamCIF.jpg; sourceTree = ""; }; - 22D15AB3139F505400C7713A /* ioscapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioscapture.m; sourceTree = ""; }; - 22D15AB5139F579D00C7713A /* qtcapture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = qtcapture.m; 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 = ""; }; + 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; }; 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 22DD19E713A8D82C0018ECD4 /* mediastream.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = mediastream.c; sourceTree = ""; }; - 22DD21A213A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 22DD21A413A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = ""; }; - 22DD21A613A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/mediastreamViewController.xib; sourceTree = ""; }; - 22DD21A813A8E3310018ECD4 /* mediastream-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "mediastream-Info.plist"; sourceTree = ""; }; - 22DD21A913A8E3310018ECD4 /* mediastream-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mediastream-Prefix.pch"; sourceTree = ""; }; - 22DD21AA13A8E3310018ECD4 /* mediastreamAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamAppDelegate.h; sourceTree = ""; }; - 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamAppDelegate.m; sourceTree = ""; }; - 22DD21AC13A8E3310018ECD4 /* mediastreamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamViewController.h; sourceTree = ""; }; - 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamViewController.m; sourceTree = ""; }; - 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qualityindicator.c; sourceTree = ""; }; - 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratecontrol.c; sourceTree = ""; }; - 7014533713FA7AEA00A01D86 /* shaders.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shaders.c; sourceTree = ""; }; 7014533B13FA7ECA00A01D86 /* zrtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zrtp.h; sourceTree = ""; }; 7014533D13FA841E00A01D86 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = ""; }; - 7066FC0613E82A3600EFC6DC /* vp8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vp8.c; sourceTree = ""; }; 7066FC0913E830B800EFC6DC /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "../liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = ""; }; 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 70E542F013E147CE002BA2C0 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 70E542F613E14816002BA2C0 /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shaders.h; sourceTree = ""; }; AA747D9E0F9514B9006C5449 /* liblinphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = liblinphone_Prefix.pch; sourceTree = SOURCE_ROOT; }; AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D2AAC07E0554694100DB518D /* liblinphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblinphone.a; sourceTree = BUILT_PRODUCTS_DIR; }; F4D9F23D145710540035B0D0 /* netsim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = netsim.c; sourceTree = ""; }; F4D9F23E145710540035B0D0 /* ortp_srtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ortp_srtp.c; sourceTree = ""; }; - F4D9F25E14583B580035B0D0 /* bitratedriver.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitratedriver.c; sourceTree = ""; }; - F4D9F25F14583B580035B0D0 /* qosanalyzer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qosanalyzer.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -852,10 +830,9 @@ 222CA4CF11F6CF2000621220 /* mediastreamer2 */ = { isa = PBXGroup; children = ( + 22D07CAB16F3BC5F009F2C9E /* tools */, 22405EE1160066C700B92522 /* voipdescs.h */, 22405EDC160065C200B92522 /* basedescs.h */, - 22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */, - 22DD19E013A8D82C0018ECD4 /* tests */, 222CA5B811F6CF7600621220 /* include */, 222CA5DC11F6CF7600621220 /* src */, ); @@ -923,89 +900,17 @@ 222CA5DC11F6CF7600621220 /* src */ = { isa = PBXGroup; children = ( + 223CA7EF16D9268D00EF1BEC /* audiofilters */, + 223CA81116D9268D00EF1BEC /* base */, + 223CA81A16D9268D00EF1BEC /* otherfilters */, + 223CA82016D9268D00EF1BEC /* utils */, + 223CA83316D9268D00EF1BEC /* videofilters */, + 223CA84E16D9268D00EF1BEC /* voip */, 222CA5DD11F6CF7600621220 /* .gitignore */, - 222CA5DE11F6CF7600621220 /* _kiss_fft_guts.h */, - 222CA5DF11F6CF7600621220 /* alaw.c */, - 22512698145F13CE0041FBF2 /* aqsnd.c */, - 229ECDEE143AEC2400D611B8 /* audioconference.c */, - 222CA5E311F6CF7600621220 /* audiomixer.c */, - 222CA5E411F6CF7600621220 /* audiostream.c */, - 22FC56A913CB6A4F002FD0F1 /* bitratecontrol.c */, - F4D9F25E14583B580035B0D0 /* bitratedriver.c */, - 222CA5E511F6CF7600621220 /* chanadapt.c */, - 222CA5E711F6CF7600621220 /* dsptools.c */, - 222CA5E811F6CF7600621220 /* dtmfgen.c */, 2252935A12F6CA4700DD9BFB /* ec-calibrator.c */, - 222CA5EB11F6CF7600621220 /* equalizer.c */, - 222CA5EC11F6CF7600621220 /* eventqueue.c */, - 222CA5ED11F6CF7600621220 /* extdisplay.c */, - 222CA5EE11F6CF7600621220 /* ffmpeg-priv.h */, 2203127413A249F70049A2ED /* filter-template.c */, - 222CA5EF11F6CF7600621220 /* g711common.h */, - 229A614B13DDFE3500090183 /* g722.h */, - 229A614913DDFE3500090183 /* g722_decode.c */, - 229A614A13DDFE3500090183 /* g722_encode.c */, - 22405EE71600675C00B92522 /* genericplc.c */, - 222CA5F011F6CF7600621220 /* gsm.c */, - 221F58A713AB716300D603C9 /* h264dec.c */, - 222CA5F211F6CF7600621220 /* ice.c */, - 22D15AB3139F505400C7713A /* ioscapture.m */, - 2203127113A247B40049A2ED /* iosdisplay.m */, - 222CA5F311F6CF7600621220 /* itc.c */, - 221F58A613AB716300D603C9 /* jpegwriter.c */, - 222CA5F411F6CF7600621220 /* kiss_fft.c */, - 222CA5F511F6CF7600621220 /* kiss_fft.h */, - 222CA5F611F6CF7600621220 /* kiss_fftr.c */, - 222CA5F711F6CF7600621220 /* kiss_fftr.h */, - 2211DB9B1476539600DEE054 /* l16.c */, 222CA5F911F6CF7600621220 /* Makefile.am */, 222CA5FA11F6CF7600621220 /* Makefile.in */, - 222CA5FB11F6CF7600621220 /* mire.c */, - 22313679143DED490035C1F4 /* msandroidvideo.cpp */, - 222CA5FD11F6CF7600621220 /* mscommon.c */, - 222CA5FE11F6CF7600621220 /* msconf.c */, - 222CA60011F6CF7600621220 /* msfileplayer.c */, - 222CA60211F6CF7600621220 /* msfilerec.c */, - 222CA60411F6CF7600621220 /* msfilter.c */, - 229A614C13DDFE3500090183 /* msg722.c */, - 222CA60511F6CF7600621220 /* msiounit.m */, - 222CA60611F6CF7600621220 /* msjoin.c */, - 222CA60711F6CF7600621220 /* msqueue.c */, - 222CA60811F6CF7600621220 /* msresample.c */, - 222CA60911F6CF7600621220 /* msrtp.c */, - 222CA60A11F6CF7600621220 /* mssndcard.c */, - 222CA60B11F6CF7600621220 /* msspeex.c */, - 222CA60C11F6CF7600621220 /* msticker.c */, - 221F589B13AB4FC500D603C9 /* msvideo.c */, - 229ECDEA143AEA6300D611B8 /* msvideo_neon.c */, - 22405EDF1600668800B92522 /* msvoip.c */, - 222CA61111F6CF7600621220 /* msvolume.c */, - 222CA61311F6CF7600621220 /* mtu.c */, - 220ED1AB13A9062500AC21E0 /* nowebcam.c */, - 220ED1AA13A9062500AC21E0 /* nowebcam.h */, - 221DCB6715347EF80025E54D /* opengles_display.c */, - 221F58A113AB6F8000D603C9 /* pixconv.c */, - F4D9F25F14583B580035B0D0 /* qosanalyzer.c */, - 22D15AB5139F579D00C7713A /* qtcapture.m */, - 22FC56A713CB69FA002FD0F1 /* qualityindicator.c */, - 222CA61B11F6CF7600621220 /* rfc2429.h */, - 222CA61C11F6CF7600621220 /* rfc3984.c */, - 221F58AD13ABA42800D603C9 /* scaler.c */, - 221F58E313AF44B300D603C9 /* scaler.h */, - 7014533713FA7AEA00A01D86 /* shaders.c */, - 70E542F613E14816002BA2C0 /* shaders.h */, - 221F58AB13AB71A400D603C9 /* sizeconv.c */, - 222CA61F11F6CF7600621220 /* speexec.c */, - 2258C44013A9377B0087A596 /* swscale.h */, - 222CA62111F6CF7600621220 /* tee.c */, - 221F58A513AB716300D603C9 /* tonedetector.c */, - 222CA62311F6CF7600621220 /* ulaw.c */, - 222CA62411F6CF7600621220 /* vfw-missing.h */, - 2258C44A13A946890087A596 /* videodec.c */, - 2258C44913A946890087A596 /* videoenc.c */, - 2258C44813A946890087A596 /* videostream.c */, - 222CA62911F6CF7600621220 /* void.c */, - 7066FC0613E82A3600EFC6DC /* vp8.c */, 221DCB6A153584410025E54D /* yuv2rgb.fs */, 221DCB6B153584410025E54D /* yuv2rgb.vs */, ); @@ -1100,7 +1005,6 @@ 229ECDEC143AEBDA00D611B8 /* conference.c */, 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */, 225D3559124B1FF60008581C /* linphonecall.c */, - 22A10EE711F8920F00373793 /* mswebcam.c */, 222CA72E11F6CFB100621220 /* .gitignore */, 222CA72F11F6CFB100621220 /* address.c */, 222CA73011F6CFB100621220 /* authentication.c */, @@ -1124,10 +1028,6 @@ 222CA75911F6CFB100621220 /* proxy.c */, 222CA75A11F6CFB100621220 /* sal.c */, 222CA75B11F6CFB100621220 /* sal.h */, - 222CA75C11F6CFB100621220 /* sal_eXosip2.c */, - 222CA75D11F6CFB100621220 /* sal_eXosip2.h */, - 222CA75E11F6CFB100621220 /* sal_eXosip2_presence.c */, - 222CA75F11F6CFB100621220 /* sal_eXosip2_sdp.c */, 222CA76211F6CFB100621220 /* siplogin.c */, 222CA76311F6CFB100621220 /* sipsetup.c */, 222CA76411F6CFB100621220 /* sipsetup.h */, @@ -1145,6 +1045,134 @@ path = help; sourceTree = ""; }; + 223CA7EF16D9268D00EF1BEC /* audiofilters */ = { + isa = PBXGroup; + children = ( + 22D07CE416F3BFCB009F2C9E /* speexec.c */, + 223CA7F016D9268D00EF1BEC /* alaw.c */, + 223CA7F216D9268D00EF1BEC /* aqsnd.c */, + 223CA7F416D9268D00EF1BEC /* audiomixer.c */, + 223CA7F516D9268D00EF1BEC /* chanadapt.c */, + 223CA7F616D9268D00EF1BEC /* dtmfgen.c */, + 223CA7F716D9268D00EF1BEC /* equalizer.c */, + 223CA7F916D9268D00EF1BEC /* genericplc.c */, + 223CA7FA16D9268D00EF1BEC /* gsm.c */, + 223CA7FB16D9268D00EF1BEC /* l16.c */, + 223CA7FD16D9268D00EF1BEC /* msconf.c */, + 223CA7FE16D9268D00EF1BEC /* msfileplayer.c */, + 223CA7FF16D9268D00EF1BEC /* msfilerec.c */, + 223CA80016D9268D00EF1BEC /* msg722.c */, + 223CA80116D9268D00EF1BEC /* msiounit.m */, + 223CA80216D9268D00EF1BEC /* msresample.c */, + 223CA80316D9268D00EF1BEC /* msspeex.c */, + 223CA80416D9268D00EF1BEC /* msvolume.c */, + 223CA80916D9268D00EF1BEC /* tonedetector.c */, + 223CA80A16D9268D00EF1BEC /* ulaw.c */, + 223CA80B16D9268D00EF1BEC /* waveheader.h */, + ); + path = audiofilters; + sourceTree = ""; + }; + 223CA81116D9268D00EF1BEC /* base */ = { + isa = PBXGroup; + children = ( + 223CA81216D9268D00EF1BEC /* eventqueue.c */, + 223CA81316D9268D00EF1BEC /* mscommon.c */, + 223CA81416D9268D00EF1BEC /* msfilter.c */, + 223CA81516D9268D00EF1BEC /* msqueue.c */, + 223CA81616D9268D00EF1BEC /* mssndcard.c */, + 223CA81716D9268D00EF1BEC /* msticker.c */, + 223CA81816D9268D00EF1BEC /* mswebcam.c */, + 223CA81916D9268D00EF1BEC /* mtu.c */, + ); + path = base; + sourceTree = ""; + }; + 223CA81A16D9268D00EF1BEC /* otherfilters */ = { + isa = PBXGroup; + children = ( + 223CA81B16D9268D00EF1BEC /* itc.c */, + 223CA81C16D9268D00EF1BEC /* join.c */, + 223CA81D16D9268D00EF1BEC /* msrtp.c */, + 223CA81E16D9268D00EF1BEC /* tee.c */, + 223CA81F16D9268D00EF1BEC /* void.c */, + ); + path = otherfilters; + sourceTree = ""; + }; + 223CA82016D9268D00EF1BEC /* utils */ = { + isa = PBXGroup; + children = ( + 223CA82116D9268D00EF1BEC /* _kiss_fft_guts.h */, + 223CA82216D9268D00EF1BEC /* dsptools.c */, + 223CA82316D9268D00EF1BEC /* ffmpeg-priv.h */, + 223CA82416D9268D00EF1BEC /* g711common.h */, + 223CA82516D9268D00EF1BEC /* g722.h */, + 223CA82616D9268D00EF1BEC /* g722_decode.c */, + 223CA82716D9268D00EF1BEC /* g722_encode.c */, + 223CA82816D9268D00EF1BEC /* kiss_fft.c */, + 223CA82916D9268D00EF1BEC /* kiss_fft.h */, + 223CA82A16D9268D00EF1BEC /* kiss_fftr.c */, + 223CA82B16D9268D00EF1BEC /* kiss_fftr.h */, + 223CA82D16D9268D00EF1BEC /* opengles_display.c */, + 223CA82E16D9268D00EF1BEC /* opengles_display.h */, + 223CA82F16D9268D00EF1BEC /* shaders.c */, + 223CA83016D9268D00EF1BEC /* shaders.h */, + 223CA83116D9268D00EF1BEC /* swscale.h */, + 223CA83216D9268D00EF1BEC /* vfw-missing.h */, + ); + path = utils; + sourceTree = ""; + }; + 223CA83316D9268D00EF1BEC /* videofilters */ = { + isa = PBXGroup; + children = ( + 223CA83516D9268D00EF1BEC /* extdisplay.c */, + 223CA83716D9268D00EF1BEC /* h264dec.c */, + 223CA83816D9268D00EF1BEC /* ioscapture.m */, + 223CA83916D9268D00EF1BEC /* iosdisplay.m */, + 223CA83A16D9268D00EF1BEC /* jpegwriter.c */, + 223CA83B16D9268D00EF1BEC /* mire.c */, + 223CA84016D9268D00EF1BEC /* nowebcam.c */, + 223CA84116D9268D00EF1BEC /* pixconv.c */, + 223CA84316D9268D00EF1BEC /* sizeconv.c */, + 223CA84516D9268D00EF1BEC /* videodec.c */, + 223CA84616D9268D00EF1BEC /* videoenc.c */, + 223CA84816D9268D00EF1BEC /* vp8.c */, + ); + path = videofilters; + sourceTree = ""; + }; + 223CA84E16D9268D00EF1BEC /* voip */ = { + isa = PBXGroup; + children = ( + 223CA84F16D9268D00EF1BEC /* audioconference.c */, + 223CA85016D9268D00EF1BEC /* audiostream.c */, + 223CA85116D9268D00EF1BEC /* bitratecontrol.c */, + 223CA85216D9268D00EF1BEC /* bitratedriver.c */, + 223CA85316D9268D00EF1BEC /* ice.c */, + 223CA85416D9268D00EF1BEC /* layouts.c */, + 223CA85516D9268D00EF1BEC /* layouts.h */, + 223CA85616D9268D00EF1BEC /* mediastream.c */, + 223CA85716D9268D00EF1BEC /* msvideo.c */, + 223CA85816D9268D00EF1BEC /* msvideo_neon.c */, + 223CA85916D9268D00EF1BEC /* msvideo_neon.h */, + 223CA85A16D9268D00EF1BEC /* msvoip.c */, + 223CA85B16D9268D00EF1BEC /* nowebcam.h */, + 223CA85C16D9268D00EF1BEC /* nowebcamCIF.jpg */, + 223CA85D16D9268D00EF1BEC /* private.h */, + 223CA85E16D9268D00EF1BEC /* qosanalyzer.c */, + 223CA85F16D9268D00EF1BEC /* qualityindicator.c */, + 223CA86016D9268D00EF1BEC /* rfc2429.h */, + 223CA86116D9268D00EF1BEC /* rfc3984.c */, + 223CA86216D9268D00EF1BEC /* ringstream.c */, + 223CA86316D9268D00EF1BEC /* scaler.c */, + 223CA86416D9268D00EF1BEC /* scaler.h */, + 223CA86616D9268D00EF1BEC /* videostream.c */, + ); + path = voip; + sourceTree = ""; + }; 22A10B4C11F84DE300373793 /* externals */ = { isa = PBXGroup; children = ( @@ -1176,27 +1204,27 @@ path = externals/gsm/inc; sourceTree = ""; }; - 22DD19E013A8D82C0018ECD4 /* tests */ = { + 22D07CAB16F3BC5F009F2C9E /* tools */ = { isa = PBXGroup; children = ( - 22DD21A013A8E3310018ECD4 /* ios */, - 22DD19E713A8D82C0018ECD4 /* mediastream.c */, + 22D07CB316F3BC5F009F2C9E /* ios */, + 22D07CC016F3BC5F009F2C9E /* mediastream.c */, ); - path = tests; + path = tools; sourceTree = ""; }; - 22DD21A013A8E3310018ECD4 /* ios */ = { + 22D07CB316F3BC5F009F2C9E /* ios */ = { isa = PBXGroup; children = ( - 22DD21A113A8E3310018ECD4 /* InfoPlist.strings */, - 22DD21A313A8E3310018ECD4 /* MainWindow.xib */, - 22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */, - 22DD21A813A8E3310018ECD4 /* mediastream-Info.plist */, - 22DD21A913A8E3310018ECD4 /* mediastream-Prefix.pch */, - 22DD21AA13A8E3310018ECD4 /* mediastreamAppDelegate.h */, - 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */, - 22DD21AC13A8E3310018ECD4 /* mediastreamViewController.h */, - 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */, + 22D07CB416F3BC5F009F2C9E /* InfoPlist.strings */, + 22D07CB616F3BC5F009F2C9E /* MainWindow.xib */, + 22D07CB816F3BC5F009F2C9E /* mediastreamViewController.xib */, + 22D07CBA16F3BC5F009F2C9E /* mediastream-Info.plist */, + 22D07CBB16F3BC5F009F2C9E /* mediastream-Prefix.pch */, + 22D07CBC16F3BC5F009F2C9E /* mediastreamAppDelegate.h */, + 22D07CBD16F3BC5F009F2C9E /* mediastreamAppDelegate.m */, + 22D07CBE16F3BC5F009F2C9E /* mediastreamViewController.h */, + 22D07CBF16F3BC5F009F2C9E /* mediastreamViewController.m */, ); path = ios; sourceTree = ""; @@ -1245,13 +1273,6 @@ 225D64491521BFA6008B2E81 /* mswebcam.h in Headers */, 225D644A1521BFA6008B2E81 /* rfc3984.h in Headers */, 225D644B1521BFA6008B2E81 /* waveheader.h in Headers */, - 225D644C1521BFA6008B2E81 /* _kiss_fft_guts.h in Headers */, - 225D644D1521BFA6008B2E81 /* ffmpeg-priv.h in Headers */, - 225D644E1521BFA6008B2E81 /* g711common.h in Headers */, - 225D644F1521BFA6008B2E81 /* kiss_fft.h in Headers */, - 225D64501521BFA6008B2E81 /* kiss_fftr.h in Headers */, - 225D64511521BFA6008B2E81 /* rfc2429.h in Headers */, - 225D64521521BFA6008B2E81 /* vfw-missing.h in Headers */, 225D64531521BFA6008B2E81 /* b64.h in Headers */, 225D64541521BFA6008B2E81 /* event.h in Headers */, 225D64551521BFA6008B2E81 /* ortp.h in Headers */, @@ -1279,7 +1300,6 @@ 225D646B1521BFA6008B2E81 /* offeranswer.h in Headers */, 225D646C1521BFA6008B2E81 /* private.h in Headers */, 225D646D1521BFA6008B2E81 /* sal.h in Headers */, - 225D646E1521BFA6008B2E81 /* sal_eXosip2.h in Headers */, 225D646F1521BFA6008B2E81 /* sipsetup.h in Headers */, 225D64701521BFA6008B2E81 /* config.h in Headers */, 225D64711521BFA6008B2E81 /* gsm.h in Headers */, @@ -1288,14 +1308,26 @@ 225D64741521BFA6008B2E81 /* toast.h in Headers */, 225D64751521BFA6008B2E81 /* unproto.h in Headers */, 225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */, - 225D64781521BFA6008B2E81 /* nowebcam.h in Headers */, - 225D64791521BFA6008B2E81 /* swscale.h in Headers */, - 225D647B1521BFA6008B2E81 /* scaler.h in Headers */, - 225D647C1521BFA6008B2E81 /* g722.h in Headers */, - 225D647D1521BFA6008B2E81 /* shaders.h in Headers */, 225D64811521BFA6008B2E81 /* zrtp.h in Headers */, 22405EDD160065C200B92522 /* basedescs.h in Headers */, 22405EE2160066C700B92522 /* voipdescs.h in Headers */, + 223CA88216D9268D00EF1BEC /* waveheader.h in Headers */, + 223CA89516D9268D00EF1BEC /* _kiss_fft_guts.h in Headers */, + 223CA89716D9268D00EF1BEC /* ffmpeg-priv.h in Headers */, + 223CA89816D9268D00EF1BEC /* g711common.h in Headers */, + 223CA89916D9268D00EF1BEC /* g722.h in Headers */, + 223CA89D16D9268D00EF1BEC /* kiss_fft.h in Headers */, + 223CA89F16D9268D00EF1BEC /* kiss_fftr.h in Headers */, + 223CA8A216D9268D00EF1BEC /* opengles_display.h in Headers */, + 223CA8A416D9268D00EF1BEC /* shaders.h in Headers */, + 223CA8A516D9268D00EF1BEC /* swscale.h in Headers */, + 223CA8A616D9268D00EF1BEC /* vfw-missing.h in Headers */, + 223CA8C716D9268D00EF1BEC /* layouts.h in Headers */, + 223CA8CB16D9268D00EF1BEC /* msvideo_neon.h in Headers */, + 223CA8CD16D9268D00EF1BEC /* nowebcam.h in Headers */, + 223CA8CE16D9268D00EF1BEC /* private.h in Headers */, + 223CA8D116D9268D00EF1BEC /* rfc2429.h in Headers */, + 223CA8D516D9268D00EF1BEC /* scaler.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1332,13 +1364,6 @@ 225D65161521C009008B2E81 /* mswebcam.h in Headers */, 225D65171521C009008B2E81 /* rfc3984.h in Headers */, 225D65181521C009008B2E81 /* waveheader.h in Headers */, - 225D65191521C009008B2E81 /* _kiss_fft_guts.h in Headers */, - 225D651A1521C009008B2E81 /* ffmpeg-priv.h in Headers */, - 225D651B1521C009008B2E81 /* g711common.h in Headers */, - 225D651C1521C009008B2E81 /* kiss_fft.h in Headers */, - 225D651D1521C009008B2E81 /* kiss_fftr.h in Headers */, - 225D651E1521C009008B2E81 /* rfc2429.h in Headers */, - 225D651F1521C009008B2E81 /* vfw-missing.h in Headers */, 225D65201521C009008B2E81 /* b64.h in Headers */, 225D65211521C009008B2E81 /* event.h in Headers */, 225D65221521C009008B2E81 /* ortp.h in Headers */, @@ -1366,7 +1391,6 @@ 225D65381521C009008B2E81 /* offeranswer.h in Headers */, 225D65391521C009008B2E81 /* private.h in Headers */, 225D653A1521C009008B2E81 /* sal.h in Headers */, - 225D653B1521C009008B2E81 /* sal_eXosip2.h in Headers */, 225D653C1521C009008B2E81 /* sipsetup.h in Headers */, 225D653D1521C009008B2E81 /* config.h in Headers */, 225D653E1521C009008B2E81 /* gsm.h in Headers */, @@ -1375,11 +1399,6 @@ 225D65411521C009008B2E81 /* toast.h in Headers */, 225D65421521C009008B2E81 /* unproto.h in Headers */, 225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */, - 225D65451521C009008B2E81 /* nowebcam.h in Headers */, - 225D65461521C009008B2E81 /* swscale.h in Headers */, - 225D65481521C009008B2E81 /* scaler.h in Headers */, - 225D65491521C009008B2E81 /* g722.h in Headers */, - 225D654A1521C009008B2E81 /* shaders.h in Headers */, 225D654E1521C009008B2E81 /* zrtp.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1417,13 +1436,6 @@ 222CA64B11F6CF7600621220 /* mswebcam.h in Headers */, 222CA64C11F6CF7600621220 /* rfc3984.h in Headers */, 222CA64D11F6CF7600621220 /* waveheader.h in Headers */, - 222CA64E11F6CF7600621220 /* _kiss_fft_guts.h in Headers */, - 222CA65E11F6CF7600621220 /* ffmpeg-priv.h in Headers */, - 222CA65F11F6CF7600621220 /* g711common.h in Headers */, - 222CA66511F6CF7600621220 /* kiss_fft.h in Headers */, - 222CA66711F6CF7600621220 /* kiss_fftr.h in Headers */, - 222CA68811F6CF7600621220 /* rfc2429.h in Headers */, - 222CA69111F6CF7600621220 /* vfw-missing.h in Headers */, 222CA6F411F6CF9F00621220 /* b64.h in Headers */, 222CA6F511F6CF9F00621220 /* event.h in Headers */, 222CA6F611F6CF9F00621220 /* ortp.h in Headers */, @@ -1451,7 +1463,6 @@ 222CA77711F6CFB100621220 /* offeranswer.h in Headers */, 222CA77A11F6CFB100621220 /* private.h in Headers */, 222CA77D11F6CFB100621220 /* sal.h in Headers */, - 222CA77F11F6CFB100621220 /* sal_eXosip2.h in Headers */, 222CA78611F6CFB100621220 /* sipsetup.h in Headers */, 22A10B5611F84E2D00373793 /* config.h in Headers */, 22A10B5711F84E2D00373793 /* gsm.h in Headers */, @@ -1460,11 +1471,6 @@ 22A10B5A11F84E2D00373793 /* toast.h in Headers */, 22A10B5B11F84E2D00373793 /* unproto.h in Headers */, 229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */, - 220ED1AC13A9062600AC21E0 /* nowebcam.h in Headers */, - 2258C44113A9377B0087A596 /* swscale.h in Headers */, - 221F58E413AF44B300D603C9 /* scaler.h in Headers */, - 229A614F13DDFE3500090183 /* g722.h in Headers */, - 70E542FA13E14816002BA2C0 /* shaders.h in Headers */, 7014533C13FA7ECA00A01D86 /* zrtp.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1581,10 +1587,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 22DD21AE13A8E3310018ECD4 /* InfoPlist.strings in Resources */, - 22DD21AF13A8E3310018ECD4 /* MainWindow.xib in Resources */, - 22DD21B013A8E3310018ECD4 /* mediastreamViewController.xib in Resources */, - 22B5106913B060E100CD87DA /* nowebcamCIF.jpg in Resources */, + 22D07CD016F3BC5F009F2C9E /* InfoPlist.strings in Resources */, + 22D07CD116F3BC5F009F2C9E /* MainWindow.xib in Resources */, + 22D07CD216F3BC5F009F2C9E /* mediastreamViewController.xib in Resources */, + 22D07CD316F3BC5F009F2C9E /* mediastream-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1595,79 +1601,81 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 225D64831521BFA6008B2E81 /* alaw.c in Sources */, - 225D64841521BFA6008B2E81 /* audiomixer.c in Sources */, - 225D64851521BFA6008B2E81 /* audiostream.c in Sources */, - 225D64861521BFA6008B2E81 /* chanadapt.c in Sources */, - 225D64871521BFA6008B2E81 /* dsptools.c in Sources */, - 225D64881521BFA6008B2E81 /* dtmfgen.c in Sources */, - 225D64891521BFA6008B2E81 /* equalizer.c in Sources */, - 225D648A1521BFA6008B2E81 /* eventqueue.c in Sources */, - 225D648B1521BFA6008B2E81 /* extdisplay.c in Sources */, - 225D648C1521BFA6008B2E81 /* gsm.c in Sources */, - 225D648D1521BFA6008B2E81 /* ice.c in Sources */, - 225D648E1521BFA6008B2E81 /* itc.c in Sources */, - 225D648F1521BFA6008B2E81 /* kiss_fft.c in Sources */, - 225D64901521BFA6008B2E81 /* kiss_fftr.c in Sources */, - 225D64911521BFA6008B2E81 /* mire.c in Sources */, - 225D64921521BFA6008B2E81 /* mscommon.c in Sources */, - 225D64931521BFA6008B2E81 /* msconf.c in Sources */, - 225D64941521BFA6008B2E81 /* msfileplayer.c in Sources */, - 225D64951521BFA6008B2E81 /* msfilerec.c in Sources */, - 225D64961521BFA6008B2E81 /* msfilter.c in Sources */, - 225D64981521BFA6008B2E81 /* msjoin.c in Sources */, - 225D64991521BFA6008B2E81 /* msqueue.c in Sources */, - 225D649A1521BFA6008B2E81 /* msresample.c in Sources */, - 225D649B1521BFA6008B2E81 /* msrtp.c in Sources */, - 225D649C1521BFA6008B2E81 /* mssndcard.c in Sources */, - 225D649D1521BFA6008B2E81 /* msspeex.c in Sources */, - 225D649E1521BFA6008B2E81 /* msticker.c in Sources */, - 225D649F1521BFA6008B2E81 /* msvolume.c in Sources */, - 225D64A01521BFA6008B2E81 /* mtu.c in Sources */, - 225D64A11521BFA6008B2E81 /* rfc3984.c in Sources */, - 225D64A21521BFA6008B2E81 /* speexec.c in Sources */, - 225D64A31521BFA6008B2E81 /* tee.c in Sources */, - 225D64A41521BFA6008B2E81 /* ulaw.c in Sources */, - 225D64A51521BFA6008B2E81 /* void.c in Sources */, 225D64BC1521BFA6008B2E81 /* address.c in Sources */, 225D64BD1521BFA6008B2E81 /* authentication.c in Sources */, 225D64BE1521BFA6008B2E81 /* callbacks.c in Sources */, 225D64BF1521BFA6008B2E81 /* chat.c in Sources */, - 225D64CE1521BFA6008B2E81 /* mswebcam.c in Sources */, - 225D64D11521BFA6008B2E81 /* ioscapture.m in Sources */, - 225D64D21521BFA6008B2E81 /* iosdisplay.m in Sources */, 225D64D31521BFA6008B2E81 /* filter-template.c in Sources */, - 225D64D41521BFA6008B2E81 /* nowebcam.c in Sources */, - 225D64D51521BFA6008B2E81 /* videostream.c in Sources */, - 225D64D61521BFA6008B2E81 /* videoenc.c in Sources */, - 225D64D71521BFA6008B2E81 /* videodec.c in Sources */, - 225D64D81521BFA6008B2E81 /* msvideo.c in Sources */, - 225D64D91521BFA6008B2E81 /* pixconv.c in Sources */, - 225D64DA1521BFA6008B2E81 /* tonedetector.c in Sources */, - 225D64DB1521BFA6008B2E81 /* jpegwriter.c in Sources */, - 225D64DC1521BFA6008B2E81 /* h264dec.c in Sources */, - 225D64DD1521BFA6008B2E81 /* sizeconv.c in Sources */, - 225D64DE1521BFA6008B2E81 /* scaler.c in Sources */, - 225D64DF1521BFA6008B2E81 /* qualityindicator.c in Sources */, - 225D64E01521BFA6008B2E81 /* bitratecontrol.c in Sources */, - 225D64E11521BFA6008B2E81 /* g722_decode.c in Sources */, - 225D64E21521BFA6008B2E81 /* g722_encode.c in Sources */, - 225D64E31521BFA6008B2E81 /* msg722.c in Sources */, - 225D64E41521BFA6008B2E81 /* vp8.c in Sources */, - 225D64E61521BFA6008B2E81 /* shaders.c in Sources */, - 225D64E81521BFA6008B2E81 /* msvideo_neon.c in Sources */, - 225D64E91521BFA6008B2E81 /* conference.c in Sources */, - 225D64EA1521BFA6008B2E81 /* audioconference.c in Sources */, - 225D64ED1521BFA6008B2E81 /* bitratedriver.c in Sources */, - 225D64EE1521BFA6008B2E81 /* qosanalyzer.c in Sources */, - 225D64EF1521BFA6008B2E81 /* aqsnd.c in Sources */, - 225D64F01521BFA6008B2E81 /* l16.c in Sources */, - 221DCB4D1529E2EB0025E54D /* msiounit.m in Sources */, - 221DCB6915347EF80025E54D /* opengles_display.c in Sources */, 221DCB6D153584410025E54D /* yuv2rgb.fs in Sources */, 221DCB6F153584410025E54D /* yuv2rgb.vs in Sources */, - 22405EE01600668800B92522 /* msvoip.c in Sources */, - 22405EE81600675C00B92522 /* genericplc.c 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 */, + 223CA88B16D9268D00EF1BEC /* msqueue.c in Sources */, + 223CA88C16D9268D00EF1BEC /* mssndcard.c in Sources */, + 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 */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1709,9 +1717,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 22DD19F713A8DFA70018ECD4 /* mediastream.c in Sources */, - 22DD21B313A8E3310018ECD4 /* mediastreamAppDelegate.m in Sources */, - 22DD21B413A8E3310018ECD4 /* mediastreamViewController.m in Sources */, + 22D07CD416F3BC5F009F2C9E /* mediastreamAppDelegate.m in Sources */, + 22D07CD516F3BC5F009F2C9E /* mediastreamViewController.m in Sources */, + 22D07CD616F3BC5F009F2C9E /* mediastream.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1732,15 +1740,11 @@ 222CA77911F6CFB100621220 /* presence.c in Sources */, 222CA77B11F6CFB100621220 /* proxy.c in Sources */, 222CA77C11F6CFB100621220 /* sal.c in Sources */, - 222CA77E11F6CFB100621220 /* sal_eXosip2.c in Sources */, - 222CA78011F6CFB100621220 /* sal_eXosip2_presence.c in Sources */, - 222CA78111F6CFB100621220 /* sal_eXosip2_sdp.c in Sources */, 222CA78411F6CFB100621220 /* siplogin.c in Sources */, 222CA78511F6CFB100621220 /* sipsetup.c in Sources */, 229ECDED143AEBDA00D611B8 /* conference.c in Sources */, 221DCB561529FE660025E54D /* linphonecall.c in Sources */, 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */, - 221DCB6815347EF80025E54D /* opengles_display.c in Sources */, 221DCB6C153584410025E54D /* yuv2rgb.fs in Sources */, 221DCB6E153584410025E54D /* yuv2rgb.vs in Sources */, ); @@ -1767,26 +1771,26 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 22DD21A113A8E3310018ECD4 /* InfoPlist.strings */ = { + 22D07CB416F3BC5F009F2C9E /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 22DD21A213A8E3310018ECD4 /* en */, + 22D07CB516F3BC5F009F2C9E /* en */, ); name = InfoPlist.strings; sourceTree = ""; }; - 22DD21A313A8E3310018ECD4 /* MainWindow.xib */ = { + 22D07CB616F3BC5F009F2C9E /* MainWindow.xib */ = { isa = PBXVariantGroup; children = ( - 22DD21A413A8E3310018ECD4 /* en */, + 22D07CB716F3BC5F009F2C9E /* en */, ); name = MainWindow.xib; sourceTree = ""; }; - 22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */ = { + 22D07CB816F3BC5F009F2C9E /* mediastreamViewController.xib */ = { isa = PBXVariantGroup; children = ( - 22DD21A613A8E3310018ECD4 /* en */, + 22D07CB916F3BC5F009F2C9E /* en */, ); name = mediastreamViewController.xib; sourceTree = ""; @@ -1805,27 +1809,6 @@ 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__, - MS2_INTERNAL, - VIDEO_ENABLED, - HAVE_LIBAVCODEC_AVCODEC_H, - HAVE_LIBSWSCALE_SWSCALE_H, - TARGET_OS_IPHONE, - ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; @@ -1859,27 +1842,6 @@ 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__, - MS2_INTERNAL, - VIDEO_ENABLED, - HAVE_LIBAVCODEC_AVCODEC_H, - HAVE_LIBSWSCALE_SWSCALE_H, - TARGET_OS_IPHONE, - ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; @@ -1916,18 +1878,23 @@ ORTP_INET6, ENABLE_TRACE, "LINPHONE_VERSION=\\\"debug\\\"", - "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "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, - __MACIOUNIT_ENABLED__, - HAVE_EXOSIP_GET_SOCKET, + __MAC_AQ_ENABLED__, MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + "TARGET_OS_IPHONE=1", + USE_BELLESIP, + "PACKAGE_NAME=\\\"Linphone\\\"", + "POSIXTIMER_INTERVAL=10000", ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -1956,18 +1923,23 @@ ORTP_INET6, ENABLE_TRACE, "LINPHONE_VERSION=\\\"debug\\\"", - "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "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, - __MACIOUNIT_ENABLED__, - HAVE_EXOSIP_GET_SOCKET, + __MAC_AQ_ENABLED__, MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + "TARGET_OS_IPHONE=1", + USE_BELLESIP, + "PACKAGE_NAME=\\\"Linphone\\\"", + "POSIXTIMER_INTERVAL=10000", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -2336,18 +2308,23 @@ ORTP_INET6, ENABLE_TRACE, "LINPHONE_VERSION=\\\"debug\\\"", - "LINPHONE_PLUGINS_DIR=\\\"\\\\tmp\\\"", + "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, - __MACIOUNIT_ENABLED__, - HAVE_EXOSIP_GET_SOCKET, + __MAC_AQ_ENABLED__, MS2_INTERNAL, + VIDEO_ENABLED, + HAVE_LIBAVCODEC_AVCODEC_H, + HAVE_LIBSWSCALE_SWSCALE_H, + "TARGET_OS_IPHONE=1", + USE_BELLESIP, + "PACKAGE_NAME=\\\"Linphone\\\"", + "POSIXTIMER_INTERVAL=10000", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -2375,27 +2352,6 @@ 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__, - MS2_INTERNAL, - VIDEO_ENABLED, - HAVE_LIBAVCODEC_AVCODEC_H, - HAVE_LIBSWSCALE_SWSCALE_H, - TARGET_OS_IPHONE, - ); GCC_THUMB_SUPPORT = NO; GCC_UNROLL_LOOPS = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; @@ -2429,7 +2385,7 @@ COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; + GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", @@ -2454,8 +2410,8 @@ "TARGET_OS_IPHONE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; - INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist"; + GCC_VERSION = ""; + INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -2479,7 +2435,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; + GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", @@ -2504,8 +2460,8 @@ "TARGET_OS_IPHONE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; - INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist"; + GCC_VERSION = ""; + INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -2526,7 +2482,7 @@ COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; + GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", @@ -2551,8 +2507,8 @@ "TARGET_OS_IPHONE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; - INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist"; + GCC_VERSION = ""; + INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", From 7b9ff04d7200451e75767c955f43f62de41fe377 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 19 Mar 2013 12:13:52 +0100 Subject: [PATCH 007/218] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2048bac55..71f31347f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2048bac55a33458b4c0a85c9b79f5679045ae252 +Subproject commit 71f31347fcddaa5f0e9e329a7320efe60bc7c281 From d4b3f5cec5c02d4ceb88c10b8ee1290859210bab Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 14 Mar 2013 11:54:18 +0100 Subject: [PATCH 008/218] Add buttons to select the audio route (bluetooth, receiver, speaker). --- Classes/LinphoneManager.h | 3 + Classes/LinphoneManager.m | 47 +- Classes/LinphoneUI/UICallBar.h | 10 +- Classes/LinphoneUI/UICallBar.m | 119 +- Classes/LinphoneUI/en.lproj/UICallBar.xib | 1070 +++++++++++------ Classes/LinphoneUI/fr.lproj/UICallBar.xib | 1006 +++++++++++----- Classes/LinphoneUI/ru.lproj/UICallBar.xib | 1006 +++++++++++----- Resources/route_bluetooth_off_default.png | Bin 0 -> 4684 bytes .../route_bluetooth_off_default_landscape.png | Bin 0 -> 3904 bytes Resources/route_bluetooth_off_disabled.png | Bin 0 -> 4541 bytes ...route_bluetooth_off_disabled_landscape.png | Bin 0 -> 3824 bytes Resources/route_bluetooth_off_over.png | Bin 0 -> 4694 bytes .../route_bluetooth_off_over_landscape.png | Bin 0 -> 3971 bytes Resources/route_bluetooth_on_default.png | Bin 0 -> 4145 bytes .../route_bluetooth_on_default_landscape.png | Bin 0 -> 3393 bytes Resources/route_phone_off_default.png | Bin 0 -> 4687 bytes .../route_phone_off_default_landscape.png | Bin 0 -> 4005 bytes Resources/route_phone_off_disabled.png | Bin 0 -> 4523 bytes .../route_phone_off_disabled_landscape.png | Bin 0 -> 3808 bytes Resources/route_phone_off_over.png | Bin 0 -> 4702 bytes Resources/route_phone_off_over_landscape.png | Bin 0 -> 4010 bytes Resources/route_phone_on_default.png | Bin 0 -> 4078 bytes .../route_phone_on_default_landscape.png | Bin 0 -> 3435 bytes Resources/route_speaker_off_default.png | Bin 0 -> 4466 bytes .../route_speaker_off_default_landscape.png | Bin 0 -> 3783 bytes Resources/route_speaker_off_disabled.png | Bin 0 -> 4329 bytes .../route_speaker_off_disabled_landscape.png | Bin 0 -> 3604 bytes Resources/route_speaker_off_over.png | Bin 0 -> 4562 bytes .../route_speaker_off_over_landscape.png | Bin 0 -> 3826 bytes Resources/route_speaker_on_default.png | Bin 0 -> 3624 bytes .../route_speaker_on_default_landscape.png | Bin 0 -> 2908 bytes Resources/routes_default.png | Bin 0 -> 3239 bytes Resources/routes_default_landscape.png | Bin 0 -> 3685 bytes Resources/routes_disabled.png | Bin 0 -> 3071 bytes Resources/routes_disabled_landscape.png | Bin 0 -> 3517 bytes Resources/routes_over.png | Bin 0 -> 3327 bytes Resources/routes_over_landscape.png | Bin 0 -> 3778 bytes Resources/routes_selected.png | Bin 0 -> 4972 bytes Resources/routes_selected_landscape.png | Bin 0 -> 4617 bytes linphone.ldb/Contents.plist | 320 ++++- .../UICallBar/{12 => 13}/UICallBar.xib | 1070 +++++++++++------ linphone.xcodeproj/project.pbxproj | 192 +++ 42 files changed, 3426 insertions(+), 1417 deletions(-) create mode 100644 Resources/route_bluetooth_off_default.png create mode 100644 Resources/route_bluetooth_off_default_landscape.png create mode 100644 Resources/route_bluetooth_off_disabled.png create mode 100644 Resources/route_bluetooth_off_disabled_landscape.png create mode 100644 Resources/route_bluetooth_off_over.png create mode 100644 Resources/route_bluetooth_off_over_landscape.png create mode 100644 Resources/route_bluetooth_on_default.png create mode 100644 Resources/route_bluetooth_on_default_landscape.png create mode 100644 Resources/route_phone_off_default.png create mode 100644 Resources/route_phone_off_default_landscape.png create mode 100644 Resources/route_phone_off_disabled.png create mode 100644 Resources/route_phone_off_disabled_landscape.png create mode 100644 Resources/route_phone_off_over.png create mode 100644 Resources/route_phone_off_over_landscape.png create mode 100644 Resources/route_phone_on_default.png create mode 100644 Resources/route_phone_on_default_landscape.png create mode 100644 Resources/route_speaker_off_default.png create mode 100644 Resources/route_speaker_off_default_landscape.png create mode 100644 Resources/route_speaker_off_disabled.png create mode 100644 Resources/route_speaker_off_disabled_landscape.png create mode 100644 Resources/route_speaker_off_over.png create mode 100644 Resources/route_speaker_off_over_landscape.png create mode 100644 Resources/route_speaker_on_default.png create mode 100644 Resources/route_speaker_on_default_landscape.png create mode 100644 Resources/routes_default.png create mode 100644 Resources/routes_default_landscape.png create mode 100644 Resources/routes_disabled.png create mode 100644 Resources/routes_disabled_landscape.png create mode 100644 Resources/routes_over.png create mode 100644 Resources/routes_over_landscape.png create mode 100644 Resources/routes_selected.png create mode 100644 Resources/routes_selected_landscape.png rename linphone.ldb/Resources/LinphoneUI/UICallBar/{12 => 13}/UICallBar.xib (79%) diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 5b4e8f741..b90e36f74 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -45,6 +45,7 @@ extern NSString *const kLinphoneMainViewChange; extern NSString *const kLinphoneAddressBookUpdate; extern NSString *const kLinphoneLogsUpdate; extern NSString *const kLinphoneSettingsUpdate; +extern NSString *const kLinphoneBluetoothAvailabilityUpdate; extern NSString *const kContactSipField; @@ -164,6 +165,8 @@ typedef struct _LinphoneManagerSounds { @property (readonly) LinphoneManagerSounds sounds; @property (readonly) NSMutableArray *logs; @property (nonatomic, assign) BOOL speakerEnabled; +@property (nonatomic, assign) BOOL bluetoothAvailable; +@property (nonatomic, assign) BOOL bluetoothEnabled; @property (readonly) ALAssetsLibrary *photoLibrary; @end diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index adb9244eb..d2674539d 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -56,6 +56,7 @@ NSString *const kLinphoneAddressBookUpdate = @"LinphoneAddressBookUpdate"; NSString *const kLinphoneMainViewChange = @"LinphoneMainViewChange"; NSString *const kLinphoneLogsUpdate = @"LinphoneLogsUpdate"; NSString *const kLinphoneSettingsUpdate = @"LinphoneSettingsUpdate"; +NSString *const kLinphoneBluetoothAvailabilityUpdate = @"LinphoneBluetoothAvailabilityUpdate"; NSString *const kContactSipField = @"SIP"; @@ -105,6 +106,8 @@ extern void libmsbcg729_init(); @synthesize sounds; @synthesize logs; @synthesize speakerEnabled; +@synthesize bluetoothAvailable; +@synthesize bluetoothEnabled; @synthesize photoLibrary; struct codec_name_pref_table{ @@ -235,6 +238,7 @@ struct codec_name_pref_table codec_pref_table[]={ logs = [[NSMutableArray alloc] init]; database = NULL; speakerEnabled = FALSE; + bluetoothEnabled = FALSE; [self openDatabase]; [self copyDefaultSettings]; pendindCallIdFromRemoteNotif = [[NSMutableArray alloc] init ]; @@ -466,6 +470,8 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char if(linphone_core_get_calls_nb(theLinphoneCore) == 0) { [self setSpeakerEnabled:FALSE]; [self removeCTCallCenterCb]; + bluetoothAvailable = FALSE; + bluetoothEnabled = FALSE; } if (incallBgTask) { [[UIApplication sharedApplication] endBackgroundTask:incallBgTask]; @@ -1087,7 +1093,6 @@ static int comp_call_state_paused (const LinphoneCall* call, const void* param) /*IOS specific*/ linphone_core_start_dtmf_stream(theLinphoneCore); - } @@ -1119,7 +1124,7 @@ static int comp_call_state_paused (const LinphoneCall* call, const void* param) } -#pragma mark - Speaker Functions +#pragma mark - Audio route Functions - (bool)allowSpeaker { bool notallow = false; @@ -1147,35 +1152,63 @@ static void audioRouteChangeListenerCallback ( if (inPropertyID != kAudioSessionProperty_AudioRouteChange) return; // 5 LinphoneManager* lm = (LinphoneManager*)inUserData; - bool enabled = false; + bool speakerEnabled = false; CFStringRef lNewRoute = CFSTR("Unknown"); UInt32 lNewRouteSize = sizeof(lNewRoute); OSStatus lStatus = AudioSessionGetProperty(kAudioSessionProperty_AudioRoute, &lNewRouteSize, &lNewRoute); if (!lStatus && lNewRouteSize > 0) { NSString *route = (NSString *) lNewRoute; [LinphoneLogger logc:LinphoneLoggerLog format:"Current audio route is [%s]", [route cStringUsingEncoding:[NSString defaultCStringEncoding]]]; - enabled = [route isEqualToString: @"Speaker"] || [route isEqualToString: @"SpeakerAndMicrophone"]; + speakerEnabled = [route isEqualToString: @"Speaker"] || [route isEqualToString: @"SpeakerAndMicrophone"]; + if (![LinphoneManager runningOnIpad] && [route isEqualToString:@"HeadsetBT"] && !speakerEnabled) { + lm.bluetoothEnabled = TRUE; + lm.bluetoothAvailable = TRUE; + NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithBool:lm.bluetoothAvailable], @"available", nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneBluetoothAvailabilityUpdate object:lm userInfo:dict]; + } else { + lm.bluetoothEnabled = FALSE; + } CFRelease(lNewRoute); } - if(enabled != lm.speakerEnabled) { // Reforce value + if(speakerEnabled != lm.speakerEnabled) { // Reforce value lm.speakerEnabled = lm.speakerEnabled; } } - (void)setSpeakerEnabled:(BOOL)enable { speakerEnabled = enable; + if(enable && [self allowSpeaker]) { - UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_Speaker; + UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_Speaker; AudioSessionSetProperty (kAudioSessionProperty_OverrideAudioRoute , sizeof (audioRouteOverride) , &audioRouteOverride); + bluetoothEnabled = FALSE; } else { - UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_None; + UInt32 audioRouteOverride = kAudioSessionOverrideAudioRoute_None; AudioSessionSetProperty (kAudioSessionProperty_OverrideAudioRoute , sizeof (audioRouteOverride) , &audioRouteOverride); } + + if (bluetoothAvailable) { + UInt32 bluetoothInputOverride = bluetoothEnabled; + AudioSessionSetProperty(kAudioSessionProperty_OverrideCategoryEnableBluetoothInput, sizeof(bluetoothInputOverride), &bluetoothInputOverride); + } +} + +- (void)setBluetoothEnabled:(BOOL)enable { + if (bluetoothAvailable) { + // The change of route will be done in setSpeakerEnabled + bluetoothEnabled = enable; + if (bluetoothEnabled) { + [self setSpeakerEnabled:FALSE]; + } else { + [self setSpeakerEnabled:speakerEnabled]; + } + } } #pragma mark - Call Functions diff --git a/Classes/LinphoneUI/UICallBar.h b/Classes/LinphoneUI/UICallBar.h index d328c2173..791ea4d52 100644 --- a/Classes/LinphoneUI/UICallBar.h +++ b/Classes/LinphoneUI/UICallBar.h @@ -35,11 +35,15 @@ @property (nonatomic, retain) IBOutlet UIVideoButton* videoButton; @property (nonatomic, retain) IBOutlet UIMicroButton* microButton; @property (nonatomic, retain) IBOutlet UISpeakerButton* speakerButton; +@property (nonatomic, retain) IBOutlet UIToggleButton* routesButton; @property (nonatomic, retain) IBOutlet UIToggleButton* optionsButton; @property (nonatomic, retain) IBOutlet UIHangUpButton* hangupButton; @property (nonatomic, retain) IBOutlet UIView* padView; +@property (nonatomic, retain) IBOutlet UIView* routesView; @property (nonatomic, retain) IBOutlet UIView* optionsView; - +@property (nonatomic, retain) IBOutlet UIButton* routesReceiverButton; +@property (nonatomic, retain) IBOutlet UIButton* routesSpeakerButton; +@property (nonatomic, retain) IBOutlet UIButton* routesBluetoothButton; @property (nonatomic, retain) IBOutlet UIButton* optionsAddButton; @property (nonatomic, retain) IBOutlet UIButton* optionsTransferButton; @property (nonatomic, retain) IBOutlet UIToggleButton* dialerButton; @@ -57,6 +61,10 @@ @property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton; @property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton; +- (IBAction)onRoutesClick:(id)sender; +- (IBAction)onRoutesBluetoothClick:(id)sender; +- (IBAction)onRoutesReceiverClick:(id)sender; +- (IBAction)onRoutesSpeakerClick:(id)sender; - (IBAction)onOptionsClick:(id)sender; - (IBAction)onOptionsTransferClick:(id)sender; - (IBAction)onOptionsAddClick:(id)sender; diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index c1848ad14..b56cfc255 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -31,15 +31,19 @@ @synthesize conferenceButton; @synthesize videoButton; @synthesize microButton; -@synthesize speakerButton; +@synthesize speakerButton; +@synthesize routesButton; @synthesize optionsButton; @synthesize hangupButton; - +@synthesize routesBluetoothButton; +@synthesize routesReceiverButton; +@synthesize routesSpeakerButton; @synthesize optionsAddButton; @synthesize optionsTransferButton; @synthesize dialerButton; @synthesize padView; +@synthesize routesView; @synthesize optionsView; @synthesize oneButton; @@ -67,9 +71,12 @@ [conferenceButton release]; [videoButton release]; [microButton release]; - [speakerButton release]; + [speakerButton release]; + [routesButton release]; [optionsButton release]; - + [routesBluetoothButton release]; + [routesReceiverButton release]; + [routesSpeakerButton release]; [optionsAddButton release]; [optionsTransferButton release]; [dialerButton release]; @@ -88,6 +95,7 @@ [sharpButton release]; [padView release]; + [routesView release]; [optionsView release]; [[NSNotificationCenter defaultCenter] removeObserver:self]; @@ -125,7 +133,7 @@ [starButton setDtmf:true]; [sharpButton setDigit:'#']; [sharpButton setDtmf:true]; - + { UIButton *videoButtonLandscape = (UIButton*)[landscapeView viewWithTag:[videoButton tag]]; // Set selected+disabled background: IB lack ! @@ -162,6 +170,18 @@ [LinphoneUtils buttonFixStates:speakerButtonLandscape]; } + if (![LinphoneManager runningOnIpad]) { + UIButton *routesButtonLandscape = (UIButton*) [landscapeView viewWithTag:[routesButton tag]]; + // Set selected+over background: IB lack ! + [routesButton setBackgroundImage:[UIImage imageNamed:@"routes_over.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + [routesButtonLandscape setBackgroundImage:[UIImage imageNamed:@"routes_over_landscape.png"] + forState:(UIControlStateHighlighted | UIControlStateSelected)]; + + [LinphoneUtils buttonFixStates:routesButton]; + [LinphoneUtils buttonFixStates:routesButtonLandscape]; + } + { UIButton *microButtonLandscape = (UIButton*) [landscapeView viewWithTag:[microButton tag]]; // Set selected+disabled background: IB lack ! @@ -226,12 +246,18 @@ selector:@selector(callUpdateEvent:) name:kLinphoneCallUpdate object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(bluetoothAvailabilityUpdateEvent:) + name:kLinphoneBluetoothAvailabilityUpdate + object:nil]; // Update on show LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0; [self callUpdate:call state:state]; + [self hideRoutes:FALSE]; [self hideOptions:FALSE]; [self hidePad:FALSE]; + [self showSpeaker]; } - (void)viewWillDisappear:(BOOL)animated { @@ -254,6 +280,11 @@ [self callUpdate:call state:state]; } +- (void)bluetoothAvailabilityUpdateEvent:(NSNotification*)notif { + bool available = [[notif.userInfo objectForKey:@"available"] intValue]; + [self bluetoothAvailabilityUpdate:available]; +} + #pragma mark - @@ -314,13 +345,22 @@ LinphoneCallOutgoing: [self hidePad:TRUE]; [self hideOptions:TRUE]; + [self hideRoutes:TRUE]; default: break; } } +- (void)bluetoothAvailabilityUpdate:(bool)available { + if (available) { + [self hideSpeaker]; + } else { + [self showSpeaker]; + } +} -#pragma mark - + +#pragma mark - - (void)showAnimation:(NSString*)animationID target:(UIView*)target completion:(void (^)(BOOL finished))completion { CGRect frame = [target frame]; @@ -386,6 +426,35 @@ } } +- (void)showRoutes:(BOOL)animated { + if (![LinphoneManager runningOnIpad]) { + [routesButton setOn]; + [routesBluetoothButton setSelected:[[LinphoneManager instance] bluetoothEnabled]]; + [routesSpeakerButton setSelected:[[LinphoneManager instance] speakerEnabled]]; + [routesReceiverButton setSelected:!([[LinphoneManager instance] bluetoothEnabled] || [[LinphoneManager instance] speakerEnabled])]; + if([routesView isHidden]) { + if(animated) { + [self showAnimation:@"show" target:routesView completion:^(BOOL finished){}]; + } else { + [routesView setHidden:FALSE]; + } + } + } +} + +- (void)hideRoutes:(BOOL)animated { + if (![LinphoneManager runningOnIpad]) { + [routesButton setOff]; + if(![routesView isHidden]) { + if(animated) { + [self hideAnimation:@"hide" target:routesView completion:^(BOOL finished){}]; + } else { + [routesView setHidden:TRUE]; + } + } + } +} + - (void)showOptions:(BOOL)animated { [optionsButton setOn]; if([optionsView isHidden]) { @@ -408,6 +477,20 @@ } } +- (void)showSpeaker { + if (![LinphoneManager runningOnIpad]) { + [speakerButton setHidden:FALSE]; + [routesButton setHidden:TRUE]; + } +} + +- (void)hideSpeaker { + if (![LinphoneManager runningOnIpad]) { + [speakerButton setHidden:TRUE]; + [routesButton setHidden:FALSE]; + } +} + #pragma mark - Action Functions @@ -419,6 +502,30 @@ } } +- (IBAction)onRoutesBluetoothClick:(id)sender { + [self hideRoutes:TRUE]; + [[LinphoneManager instance] setBluetoothEnabled:TRUE]; +} + +- (IBAction)onRoutesReceiverClick:(id)sender { + [self hideRoutes:TRUE]; + [[LinphoneManager instance] setSpeakerEnabled:FALSE]; + [[LinphoneManager instance] setBluetoothEnabled:FALSE]; +} + +- (IBAction)onRoutesSpeakerClick:(id)sender { + [self hideRoutes:TRUE]; + [[LinphoneManager instance] setSpeakerEnabled:TRUE]; +} + +- (IBAction)onRoutesClick:(id)sender { + if([routesView isHidden]) { + [self showRoutes:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; + } else { + [self hideRoutes:[[LinphoneManager instance] lpConfigBoolForKey:@"animations_preference"]]; + } +} + - (IBAction)onOptionsTransferClick:(id)sender { [self hideOptions:TRUE]; // Go to dialer view diff --git a/Classes/LinphoneUI/en.lproj/UICallBar.xib b/Classes/LinphoneUI/en.lproj/UICallBar.xib index 3398db0d7..103729845 100644 --- a/Classes/LinphoneUI/en.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/en.lproj/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject @@ -42,7 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} - + _NS:9 1 @@ -64,7 +64,6 @@ 274 {281, 260} - _NS:9 2 @@ -80,7 +79,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -124,7 +122,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -152,7 +149,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -180,7 +176,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -208,7 +203,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -236,7 +230,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -264,7 +257,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -292,7 +284,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -320,7 +311,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -348,7 +338,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -376,7 +365,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -404,7 +392,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -430,7 +417,6 @@ {{20, 57}, {281, 260}} - _NS:9 @@ -440,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Receiver + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Speaker + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -449,7 +608,6 @@ 292 {{3, 0}, {77, 68}} - _NS:9 NO @@ -492,23 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - - _NS:9 NO 17 @@ -542,12 +691,11 @@ options_add_default.png - + {{240, 208}, {80, 126}} - _NS:9 @@ -563,7 +711,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -579,7 +726,6 @@ 292 {{320, -8}, {44, 90}} - _NS:9 101 @@ -595,8 +741,7 @@ 290 {{0, 135}, {320, 2000}} - - + _NS:9 1 @@ -610,7 +755,6 @@ 292 {80, 67} - _NS:9 NO @@ -650,14 +794,13 @@ video_off_default.png - + -2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -670,7 +813,6 @@ 292 {{80, 0}, {80, 67}} - _NS:9 NO @@ -710,15 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - - + _NS:9 NO 22 @@ -757,14 +898,68 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + 292 {{240, 0}, {80, 67}} - _NS:9 NO @@ -804,14 +999,13 @@ options_default.png - + 264 {{0, 67}, {105, 68}} - _NS:9 NO @@ -848,7 +1042,6 @@ -2147483384 {{0, 67}, {105, 68}} - _NS:9 NO @@ -878,7 +1071,6 @@ 264 {{105, 67}, {111, 68}} - _NS:9 NO @@ -908,7 +1100,6 @@ 264 {{215, 67}, {105, 68}} - _NS:9 NO @@ -944,7 +1135,6 @@ {{0, 325}, {320, 135}} - _NS:9 @@ -954,7 +1144,6 @@ {320, 460} - _NS:9 @@ -969,7 +1158,6 @@ -2147483355 {{0, 248}, {480, 72}} - _NS:9 @@ -992,7 +1180,6 @@ 274 {281, 260} - _NS:9 2 @@ -1005,7 +1192,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -1028,7 +1214,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -1047,7 +1232,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -1066,7 +1250,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -1085,7 +1268,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -1104,7 +1286,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1123,7 +1304,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1142,7 +1322,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1161,7 +1340,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1180,7 +1358,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1199,7 +1376,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1218,7 +1394,7 @@ 292 {{193, 196}, {107, 54}} - + NO NO 14 @@ -1234,13 +1410,178 @@ {{91, 0}, {281, 260}} - _NS:9 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1250,7 +1591,6 @@ 292 {65, 55} - _NS:9 NO @@ -1285,15 +1625,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {65, 55}} - - _NS:9 NO 17 @@ -1327,12 +1665,11 @@ options_add_default_landscape.png - + {{415, 140}, {65, 105}} - _NS:9 @@ -1348,7 +1685,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -1361,7 +1697,6 @@ 292 {{480, -8}, {44, 90}} - _NS:9 101 @@ -1374,8 +1709,7 @@ 290 {{0, 82}, {480, 2000}} - - + _NS:9 1 @@ -1389,7 +1723,6 @@ 292 {{65, 0}, {65, 82}} - _NS:9 NO @@ -1429,14 +1762,13 @@ video_off_default_landscape.png - + -2147483356 {{79, 20}, {37, 37}} - _NS:9 NO @@ -1449,7 +1781,6 @@ 292 {{130, 0}, {65, 82}} - _NS:9 NO @@ -1489,15 +1820,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - - + _NS:9 NO 22 @@ -1536,14 +1866,68 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + 292 {{350, 0}, {65, 82}} - _NS:9 NO @@ -1583,14 +1967,13 @@ options_default_landscape.png - + 264 {65, 82} - _NS:9 NO @@ -1624,7 +2007,6 @@ -2147483384 {65, 82} - _NS:9 NO @@ -1654,7 +2036,6 @@ 264 {{195, 0}, {90, 82}} - _NS:9 NO @@ -1684,7 +2065,6 @@ 264 {{415, 0}, {65, 82}} - _NS:9 NO @@ -1717,7 +2097,6 @@ {{0, 238}, {480, 82}} - _NS:9 @@ -1727,7 +2106,6 @@ {480, 320} - _NS:9 @@ -1956,6 +2334,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2098,6 +2516,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2126,6 +2580,7 @@ + Portrait View @@ -2153,6 +2608,7 @@ + buttons @@ -2340,6 +2796,7 @@ + Landscape View @@ -2481,6 +2938,7 @@ + buttons @@ -2581,6 +3039,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2591,7 +3119,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2683,6 +3211,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2743,7 +3299,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2753,289 +3309,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3117,6 +3393,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3134,6 +3442,6 @@ {160, 134} {130, 163} - 1926 + 2083 diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.xib b/Classes/LinphoneUI/fr.lproj/UICallBar.xib index 166865260..a0dc7c585 100644 --- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject @@ -42,6 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} + _NS:9 1 @@ -425,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Écouteur + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Écouteur + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Haut parleur + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Haut parleur + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -476,22 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - _NS:9 NO 17 @@ -525,7 +691,7 @@ options_add_default.png - + {{240, 208}, {80, 126}} @@ -575,7 +741,7 @@ 290 {{0, 135}, {320, 2000}} - + _NS:9 1 @@ -628,7 +794,7 @@ video_off_default.png - + @@ -686,14 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - + _NS:9 NO 22 @@ -732,7 +898,62 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + @@ -778,7 +999,7 @@ options_default.png - + @@ -1172,6 +1393,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1193,6 +1415,172 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Écouteur + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Haut parleur + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1236,14 +1624,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {65, 55}} - _NS:9 NO 17 @@ -1277,7 +1664,7 @@ options_add_default_landscape.png - + {{415, 140}, {65, 105}} @@ -1321,7 +1708,7 @@ 290 {{0, 82}, {480, 2000}} - + _NS:9 1 @@ -1374,7 +1761,7 @@ video_off_default_landscape.png - + @@ -1432,14 +1819,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - + _NS:9 NO 22 @@ -1478,7 +1865,62 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + @@ -1524,7 +1966,7 @@ options_default_landscape.png - + @@ -1890,6 +2332,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2032,6 +2514,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2060,6 +2578,7 @@ + Portrait View @@ -2087,6 +2606,7 @@ + buttons @@ -2274,6 +2794,7 @@ + Landscape View @@ -2415,6 +2936,7 @@ + buttons @@ -2515,6 +3037,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2525,7 +3117,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2617,6 +3209,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2677,7 +3297,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2687,289 +3307,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3051,6 +3391,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3068,6 +3440,6 @@ {160, 134} {130, 163} - 1926 + 2083 diff --git a/Classes/LinphoneUI/ru.lproj/UICallBar.xib b/Classes/LinphoneUI/ru.lproj/UICallBar.xib index 5c3284b42..eb48de3a3 100644 --- a/Classes/LinphoneUI/ru.lproj/UICallBar.xib +++ b/Classes/LinphoneUI/ru.lproj/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 12C60 - 2844 - 1187.34 - 625.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1930 + 2083 IBProxyObject @@ -42,6 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} + _NS:9 1 @@ -425,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Receiver + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Динамик + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Динамик + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -476,22 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - _NS:9 NO 17 @@ -525,7 +691,7 @@ options_add_default.png - + {{240, 208}, {80, 126}} @@ -575,7 +741,7 @@ 290 {{0, 135}, {320, 2000}} - + _NS:9 1 @@ -628,7 +794,7 @@ video_off_default.png - + @@ -686,14 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - + _NS:9 NO 22 @@ -732,7 +898,62 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + @@ -778,7 +999,7 @@ options_default.png - + @@ -1175,6 +1396,7 @@ 292 {{193, 196}, {107, 54}} + NO NO 14 @@ -1199,6 +1421,172 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Динамик + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1242,14 +1630,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {70, 55}} - _NS:9 NO 17 @@ -1283,7 +1670,7 @@ options_add_default_landscape.png - + {{410, 140}, {70, 105}} @@ -1327,7 +1714,7 @@ 290 {{0, 82}, {480, 2000}} - + _NS:9 1 @@ -1380,7 +1767,7 @@ video_off_default_landscape.png - + @@ -1438,14 +1825,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - + _NS:9 NO 22 @@ -1484,7 +1871,62 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + @@ -1530,7 +1972,7 @@ options_default_landscape.png - + @@ -1896,6 +2338,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2038,6 +2520,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2066,6 +2584,7 @@ + Portrait View @@ -2093,6 +2612,7 @@ + buttons @@ -2280,6 +2800,7 @@ + Landscape View @@ -2421,6 +2942,7 @@ + buttons @@ -2521,6 +3043,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2531,7 +3123,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2623,6 +3215,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2683,7 +3303,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2693,289 +3313,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3057,6 +3397,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3074,6 +3446,6 @@ {160, 134} {130, 163} - 1930 + 2083 diff --git a/Resources/route_bluetooth_off_default.png b/Resources/route_bluetooth_off_default.png new file mode 100644 index 0000000000000000000000000000000000000000..01bc1f29168b4b5bf6923b8dc1162f875c0f7ea9 GIT binary patch literal 4684 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 literal 0 HcmV?d00001 diff --git a/Resources/route_bluetooth_off_disabled.png b/Resources/route_bluetooth_off_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..3d03f1cba815a53c5558fd99715eeedeabd7ab69 GIT binary patch literal 4541 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 Gqy7i%zBEn% literal 0 HcmV?d00001 diff --git a/Resources/route_bluetooth_off_over_landscape.png b/Resources/route_bluetooth_off_over_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..ebaffea54d2e0d7ae876c7b59f1741b2aaf0f812 GIT binary patch literal 3971 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 literal 0 HcmV?d00001 diff --git a/Resources/route_bluetooth_on_default.png b/Resources/route_bluetooth_on_default.png new file mode 100644 index 0000000000000000000000000000000000000000..841c93b65d9239cdc437ed3a3a94729e0a88f7d2 GIT binary patch literal 4145 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 literal 0 HcmV?d00001 diff --git a/Resources/route_bluetooth_on_default_landscape.png b/Resources/route_bluetooth_on_default_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..9cbdf574d5a53c6e91a62c7e4a4737fe7f59ab27 GIT binary patch literal 3393 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 WV`|3xUtO91sj(sLB1)`0BmNE7M$^Rr literal 0 HcmV?d00001 diff --git a/Resources/route_phone_off_default.png b/Resources/route_phone_off_default.png new file mode 100644 index 0000000000000000000000000000000000000000..4510f0bcb117d33a1c6388647cf7f89aa8278296 GIT binary patch literal 4687 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 TqglUf`^VXoXi3O5bYlM><2(dC literal 0 HcmV?d00001 diff --git a/Resources/route_phone_off_disabled.png b/Resources/route_phone_off_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..8c94055331dc68d0d3474202ad5409eeb5dabc08 GIT binary patch literal 4523 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 literal 0 HcmV?d00001 diff --git a/Resources/route_phone_off_disabled_landscape.png b/Resources/route_phone_off_disabled_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..1d58d39c89e90f0a19d9c21be5812c6e6e851087 GIT binary patch literal 3808 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 literal 0 HcmV?d00001 diff --git a/Resources/route_phone_off_over.png b/Resources/route_phone_off_over.png new file mode 100644 index 0000000000000000000000000000000000000000..bc383167e549569eaaa7ba93cb60831301912f1d GIT binary patch literal 4702 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 QZTvmk5uEV#*g)QY0A`KB#Q*>R literal 0 HcmV?d00001 diff --git a/Resources/route_phone_on_default.png b/Resources/route_phone_on_default.png new file mode 100644 index 0000000000000000000000000000000000000000..16cc9e2f3a0b476ba50c388fd3c534711264dfaf GIT binary patch literal 4078 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 UM^C)}wEYKegLlB)xA2bsKQQnMc>n+a literal 0 HcmV?d00001 diff --git a/Resources/route_phone_on_default_landscape.png b/Resources/route_phone_on_default_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..b35b9aa64c9455b9484391c6232f9893ae91ff53 GIT binary patch literal 3435 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 C0k(kv literal 0 HcmV?d00001 diff --git a/Resources/route_speaker_off_default.png b/Resources/route_speaker_off_default.png new file mode 100644 index 0000000000000000000000000000000000000000..908031972bea19cfb766248985d4c6dee851fa64 GIT binary patch literal 4466 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 H%uM(XyIxb6 literal 0 HcmV?d00001 diff --git a/Resources/route_speaker_off_disabled.png b/Resources/route_speaker_off_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..8294f5251284215d6787ecbb2051d1caa256cbd2 GIT binary patch literal 4329 zcmbVQc{H1O_m6!mr3;EyP_5Jw2_j-mEG=r^cacQJ79xnX_GK7aOO0CFQdEttMTa6( zkuH{^mfEUXOH)dVQ2b(MI=}aiIqx6ubDr;hKlgs_{oZ@dbDmUl)62ZvBHRD~fY*pI78C6Cs`3ZNug*W4uHfGJa9lmKlC-6B@T@Z3+%^f001mr zcx!u-y~$MshTx}wK9W%&`vox20Dy)zIRK6E!I6L-xNCTSP06*^4oM&$t0`%xVxnjg zpo{auUkNATtinyLG2uQKHLRqz7EptXU?}jzkA^tS7=!&){!cjFqOO7l{;r0E0tALlr`m6bQs?V2GNU+K~<@RGuLr9~9XoY!GHdJmXT(zIp^q zupiE!WT>Yp$v9EK;;{%_Bt#zuS5tu~LKR_f2m}s=BK39Q`bx?uMO`J7-cKF>hE;^3 zRG}~w3a+Atgh2G6aEQLD8bnVYu8%~)40NGCv4;LZB(y&U_tP$(VfSw=^1oscx8DCc=OYZivKyv$dWJV~ zILE<5kbsEbJOe=NbdT?L?V)DlxQp;D93}fLPpNz(T`&R9ELy;$gl%kl2n=L-qdYfq z=iK*Zck$;lCmI&1F(b$tlco#d@@bCJPOZL|vFgAn6VHS$HaQP(opB zZB2HgQ(u@YU&Xb)uRG*Iu}8?&vi^LZ56?_j)-F9g{;dT?p;c_>$y7(+TOC%U{Cz0% zm28fO{4}$qTdQ~8s(Xp9K8lo;Z#3MyH+nx00ONYZN?R3}%u`|Z&b{R$Wv|{}^6G_YcZ?5Ud1lG!Iz>Vo387*jz?uI9_uz&FL&!+Y;547yFzcqBwVRfO9bU*V><2) zvt7^QxdT2-t*>UC+iP&SNn@d2BCXIR`B=EGBo+Ewyg4HyQwnlau#x0x zqokJ)8-KiX>p$-QR($2#?-tLOCnwa|69rHG{@FgW(6y!IagZpYAbt95ePi|9y^vdc z)l0zBZ;gf7m-vL)UO2tJJPAO!oxN{aZOFfIhm;=S_0)IFl6u1^e?{fZ4Qa!;c!Kx% z2%3vtSqk|8Js}9veh|sTB$b2cZ@=);55ZgNH@R=OIQVEUI{=Wy(HGa|eI`jgW`oN@ z{A;h#u4p$X+t_FI`VHLW;;#sPE7-5L zHB0g}UWg&ghY)Q|afP?J2BB36MK=+fHd|C_;wksiIkfo5Rn$1=`>iJJ*#kK_fgQR7 zw{Qqso)uG>`y#1>H$pRBr?F(}0cJT$dFke<6ta2yU@d4+Y#p(GO*ZpR7GAyYv~@ED z6T?2yQ3N<}MJyAbig{%(PK15>+?TR3k)3?6Z-*t`1D^BZVOvh>F&hFkZcOMj>BZrnr8Y%p>=1vkI zT5tX9T*@mU039w~Pzxw#-`g{X!Q23!7y3C0N&roDqT@eUZ~Xcz6BYxQ7#G%ovH$zR z+rO*f-Rwx`+$w0rU(h8}R21+OQE^T%v~DzU?#a6^JWouNHrfS{TsqDagLNVakB1e+ zKk30O(R}Ul$exW3!4_dT66xQj>qWS>sFR3vP4Y4DCqZCiebq>HD@ME!KFP6+NnXCY zF}!Z_`ehd_b@@kxP?9NSuK(UjRD$9I&px>bmMxR87HeDlfa|O7(SmJv*#i09gM%j9 zosEUf!O3CkQ|*VY;_-HyX{}>>D^#|nEdJ`fTD_B9>B}}2E2CZBmCm!yhgIhzn-HFJ zlQb@~^*hsIB@a?(pRn%PE3B5k8=oDDuu@dhT=fp)&3D=v6uf0O+EQmv&!7sc3x-~) z2?m(c+C_`Z%ipHWm!Z11dAqhft3GeI(DuB8FFxqp%_R)24vneKJjhC0`Osr9+^a!J zUfGym*ZI&p(mebme(^-K8KH3f3$2IQ({*cZCe`(tjE z#sN~uL;7N2!YbQKdAX|YvyY*ygryOS*3Z<2{YkdS5*M)3CB*Gj2nM4h_`_4vII-*bo&}z*wuV4jcV__R>A4sO7SEs$wsqO@Eb;^yW=yL}Y^KRRPBe=P z-TENFMj0LAB0n`h)9w}xFEbrQ@x1VDcD>Q-e=H^0$(vgoR3fxfNVUtHO9E-do?~I3 zxWhS9YTNF#jegA_A05ynK^3|W370Vn7<`RaH^$k47>plna7jo;=yXU(!?}|^9weE? zsgmE<5f4I}FS<~+`x7Z=sh^Iyz8ioFMGuR^=1xbJMY_)EE_VAE{GmP-O1mtzFRVBI zs;=-OZM*7_b0)uSV|u$R@x<&!>#2O8Cduv9y21lNXrVUr1Gy zX6LMJeaP0K2z@-y|Cm}>mox7@&j^T{$xDq|k#>0W+bKo1W0MXqdc-<}cGkl#<;EFH z;dkc0u-H4k(zDGK$>;R6Ce%BPcZ9CZfB>Tj-O`bHNoEfks-ZTVx7#>_!=v2HINrX~ ze5Tvncd7K``HGF{7S#n2t(wSwEb%h?f_xCT#JGEBWI$1K?^2EyH*KG(+mmcJ{Is(o zw^mp~YB}1=&p!*Om1yKOkEbL5;5#qV5A>e63FIROPZWj0K5@6FvEiDBwTd*t0gg_V zE9Vm|L&v>+@JT$^%vk?$+&Qf-(DU$;wN6|0a(4yTg_6vXpO!mK45@2n(dvL7J6_Ue zJ}Xg6Xt$||3jXYqD8Pvj;NmRLz&d;(oU?rB``ArVu;Ka+1XIDl>!J}%Y@F~2o$*E2sA zzo8$NG@0^&-(tYC?Ie?_o~hUu8zrY77ce+KmaS%$?!o@rtk?j1-F2;8Tsnij{Tzf!v~WPDeV?yR?L7YZ+( zPm7%cY}}CC;1(`NM&)FII0FU5;OAVQp_uO7PbjpPut*GL%^k7>bO+eU+8WsEgdnOh8USpX-Q8bG*EsXA3Y5ZS=ca|~n1?At zrk)2BZgKp(|D5zB@>YM63HSDs#!|Ct%4K=G}YUvrLo($>h_&|`;oU~*uz39{hJ=g$ER sJp(PQjrEKJQJn)+_A9W@eg}XBFb70w$E{{$9{qeU)Hl`p9pxVPfBQPbEdT%j literal 0 HcmV?d00001 diff --git a/Resources/route_speaker_off_disabled_landscape.png b/Resources/route_speaker_off_disabled_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..f750b1610b14c1fe9abe98f8d1f58dbb3c2f2a0b GIT binary patch literal 3604 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 H5X}2GVgU=v literal 0 HcmV?d00001 diff --git a/Resources/route_speaker_off_over.png b/Resources/route_speaker_off_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c5ce9f62ee204014afc8078853b794239bbeea GIT binary patch literal 4562 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 literal 0 HcmV?d00001 diff --git a/Resources/route_speaker_on_default.png b/Resources/route_speaker_on_default.png new file mode 100644 index 0000000000000000000000000000000000000000..8cfdc036ad034fbcb66cd3ed35273d590be87b17 GIT binary patch literal 3624 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 literal 0 HcmV?d00001 diff --git a/Resources/route_speaker_on_default_landscape.png b/Resources/route_speaker_on_default_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..293e675e22e24831fc9acb55461b05707bad862c GIT binary patch literal 2908 zcmbVNdpuP87T+W$ovE3k65Xb8loIn`#>^lwGhQ8!Gbr+EhRsaOdzdjEN0MiXBd;RS z5l&K6oI+BR$GxK{QA(mXg_CD`oVt4|=iblf_Bnst{n`8XSnK;;YyH-5tx(r zA_=uZe+kOV*$qYIi$D~?#MC$ti^HLaL=&7Dfk?z{N8zzJJO&HBL}Q#8g+Qd>%~4+; zG~`Vb6ii{z?7sSfc2;P%L?WPIFjA@1L~3fn7lmMOWHMQ41CKX`5XRz2o`fkg=85$e zEzm%5pok-oaQHlw(jt?^50_Y>p-8_Rfh%x!{>v~={54Tf$}lpf0E08ZVz^x8xjv)C z5(fC6FusWvdqfIA3ls8=EiT zi`jeuit0{889FlqIXtCctMY=roRPcrh#k*zS5xwQ*V4^FkNEsDOQ z_QOu!198cAw1b-Qn(Lplb|dL5GZAvBN5;D6EVO?{zi!*)xWc9XzF2gq^ovwdc!Hmv{u3GTbi9AGk>0pu6S~M4xB{sVd<2Q&M zZ6n>Dy!J7+Mt_Xfo-}IKBW#|zsDonmP3iTvjYd}0XBKXgU6A;v_GtPlUW9UYyy?bU zIy4sK44ob%zw7&mt<4>cfJ=`oU$`0@+oh)Hi9Y8oeK>YIvY@w%*cDRmQ!u>jy_SM# z!6`|BZzI0U=IpzfZg=uQrXBA$u5Xrko)P)nAStohifeTHNLE2_%fw8<7E%o9V$=2C ziPFAM{>ITr#g^JfofG^Q^RhYb@$26O8?ENUvUYcQfR80`at*(=ceT8>B8K5L|S`} zOP0au)EQEMw4kfTQtXla(z#vR<#D$#9u{$m1pK;p&}EsY0b4U-_Z_47^M>Ur+bj0h zdR9zT4Hj&6s_6UPM}kiXj(cSlh{)IGc|TuK@j5=qDBtOry2te8VEs$OX)E^FS<^Wg zyTToYYHh9*8F=RiCZdKbJ9lmEXc*~#aV8V|uEym~B;#E|mf~!s|Iq52mj{H;ejz=) z8$KZ9-73pA3@BZ98oZ(nbKg7AMRAt5=%0j@7iUe!9-Y z>SniG%~otfNveB5-bu!ppVORTR>#w#BXAv=a?gE-@RC53-yQ>va+P`8oh>OqKpYIE z3ZQ|{!`vzx=4k+}6ea)fWbh$&WTianU+*u4cDjITtqCIrInQA7Uzc^WiO1-F8yh&}m?@H$~ zjpY^f^;@p)`V&i~u5!Fk9IoFu+Yx$f_Cj7V;YRx;Z`x*}0yW3|3CLsndce0BIY049#|fe8h;~ij zg`9xhJHMNF&BKPBeE$s$#foWBLGIK`NGx8rUVS2jjbO5oL%tur^V>yENK`{q=ZIEK zs_j&}z7pO%IIa?X6yd!25%KxVTiUAPoOhuHyGEq&-1Lq18Y?#>qVM(JYCDgdyf!mW zOFDDmNSo1(B|T-`TZ*{F)}P+#re=)zQ7MII%1%ZXnC$04aA6DUJ&8BIP9FPF?>O=K zKb*=KeTstgtCH~W)|b4olfH_^gTF7N{A8pX;5PeqZ9uo;kBB73gTyzxTMf(%@AmiS z|Muva^^;5aImQ8=(!&9tCOi5Nn=+dS1J+zkKTElmu~$RT^&}<@Opj}273PtKHXpZ$ z+DtG%+M;T6c9*@qeMwPXckdG$e5#}64Wb^JJrV5Bh~|k zs*v^+4A4@ELj!JVKq?Ri18kQ-tqFreLYN;?(5VYSqUofY(=vwUnlwm@kUnictJES? n(!NrXmAr2ZJN*`1<5Yl-9xaFCF$K_H82}vVF0?A!eewSWx=g~C literal 0 HcmV?d00001 diff --git a/Resources/routes_default.png b/Resources/routes_default.png new file mode 100644 index 0000000000000000000000000000000000000000..a0502e2934f56996fedde27e7b7c871609664f4d GIT binary patch literal 3239 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 vb!NA+hU2XQy5AvKq1w2t?lAj_eAq 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 literal 0 HcmV?d00001 diff --git a/Resources/routes_over_landscape.png b/Resources/routes_over_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..958cdc28cb6ff6e5941a10b52e9e2f25a137aee7 GIT binary patch literal 3778 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 literal 0 HcmV?d00001 diff --git a/Resources/routes_selected.png b/Resources/routes_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..9930fd81ec4ea0fec1f9514eb8db935c00dfa4ec GIT binary patch literal 4972 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 literal 0 HcmV?d00001 diff --git a/Resources/routes_selected_landscape.png b/Resources/routes_selected_landscape.png new file mode 100644 index 0000000000000000000000000000000000000000..54a0aa48cb40589c762ed7af0f3a01c296077e7a GIT binary patch literal 4617 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 literal 0 HcmV?d00001 diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index a44da0b0c..170d97bda 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -7915,17 +7915,17 @@ backup - 12 + 13 class BLWrapperHandle name - LinphoneUI/UICallBar/12/UICallBar.xib + LinphoneUI/UICallBar/13/UICallBar.xib change date - 2012-11-13T08:39:33Z + 2013-03-19T11:14:29Z changed values class @@ -7935,7 +7935,7 @@ flags 0 hash - 6ce20b228103dd1de3d5c07ecc8cc68a + 9f9815d56c4734db373f49582fd9605c name UICallBar.xib @@ -8839,6 +8839,312 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Route"; ObjectID = "164"; + errors + + flags + 0 + key + 164.accessibilityLabel + localizations + + en + Route + fr + Route + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Route"; ObjectID = "164"; + errors + + flags + 0 + key + 164.normalTitle + localizations + + en + Route + fr + Route + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Speaker"; ObjectID = "168"; + errors + + flags + 0 + key + 168.accessibilityLabel + localizations + + en + Speaker + fr + Haut parleur + ru + Динамик + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "168"; + errors + + flags + 0 + key + 168.normalTitle + localizations + + en + Speaker + fr + Haut parleur + ru + Динамик + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Receiver"; ObjectID = "169"; + errors + + flags + 0 + key + 169.accessibilityLabel + localizations + + en + Receiver + fr + Écouteur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Receiver"; ObjectID = "169"; + errors + + flags + 0 + key + 169.normalTitle + localizations + + en + Receiver + fr + Écouteur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; accessibilityLabel = "Bluetooth"; ObjectID = "174"; + errors + + flags + 0 + key + 174.accessibilityLabel + localizations + + en + Bluetooth + fr + Bluetooth + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Bluetooth"; ObjectID = "174"; + errors + + flags + 0 + key + 174.normalTitle + localizations + + en + Bluetooth + fr + Bluetooth + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Route"; ObjectID = "183"; + errors + + flags + 0 + key + 183.normalTitle + localizations + + en + Route + fr + Route + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Speaker"; ObjectID = "187"; + errors + + flags + 0 + key + 187.normalTitle + localizations + + en + Speaker + fr + Haut parleur + ru + Динамик + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Receiver"; ObjectID = "188"; + errors + + flags + 0 + key + 188.normalTitle + localizations + + en + Receiver + fr + Écouteur + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Bluetooth"; ObjectID = "193"; + errors + + flags + 0 + key + 193.normalTitle + localizations + + en + Bluetooth + fr + Bluetooth + + snapshots + + old objects @@ -9085,11 +9391,11 @@ versions en - 12 + 13 fr - 12 + 13 ru - 12 + 13 diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar/13/UICallBar.xib similarity index 79% rename from linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib rename to linphone.ldb/Resources/LinphoneUI/UICallBar/13/UICallBar.xib index 3398db0d7..103729845 100644 --- a/linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib +++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/13/UICallBar.xib @@ -1,14 +1,14 @@ - 1536 - 11G63 - 2840 - 1138.51 - 569.00 + 1552 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject @@ -42,7 +42,7 @@ -2147483355 {{0, 335}, {320, 125}} - + _NS:9 1 @@ -64,7 +64,6 @@ 274 {281, 260} - _NS:9 2 @@ -80,7 +79,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -124,7 +122,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -152,7 +149,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -180,7 +176,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -208,7 +203,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -236,7 +230,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -264,7 +257,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -292,7 +284,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -320,7 +311,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -348,7 +338,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -376,7 +365,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -404,7 +392,6 @@ 292 {{193, 196}, {107, 54}} - NO NO @@ -430,7 +417,6 @@ {{20, 57}, {281, 260}} - _NS:9 @@ -440,6 +426,179 @@ 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {80, 63} + + + _NS:9 + NO + 30 + + Bluetooth + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over.png + + + NSImage + route_bluetooth_off_disabled.png + + + NSImage + route_bluetooth_on_default.png + + + NSImage + route_bluetooth_off_default.png + + + 1 + 13 + + + Helvetica + 13 + 16 + + + + + 292 + {{0, 60}, {80, 63}} + + + _NS:9 + NO + 31 + + Receiver + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over.png + + + NSImage + route_phone_off_disabled.png + + + NSImage + route_phone_on_default.png + + + NSImage + route_phone_off_default.png + + + + + + + 292 + {{0, 118}, {80, 67}} + + + _NS:9 + NO + 32 + + Speaker + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over.png + + + NSImage + route_speaker_off_disabled.png + + + NSImage + route_speaker_on_default.png + + + NSImage + route_speaker_off_default.png + + + + + + {{160, 156}, {80, 185}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -449,7 +608,6 @@ 292 {{3, 0}, {77, 68}} - _NS:9 NO @@ -492,23 +650,14 @@ NSImage options_transfer_default.png - - 1 - 13 - - - Helvetica - 13 - 16 - + + 292 {{3, 58}, {77, 68}} - - _NS:9 NO 17 @@ -542,12 +691,11 @@ options_add_default.png - + {{240, 208}, {80, 126}} - _NS:9 @@ -563,7 +711,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -579,7 +726,6 @@ 292 {{320, -8}, {44, 90}} - _NS:9 101 @@ -595,8 +741,7 @@ 290 {{0, 135}, {320, 2000}} - - + _NS:9 1 @@ -610,7 +755,6 @@ 292 {80, 67} - _NS:9 NO @@ -650,14 +794,13 @@ video_off_default.png - +

-2147483356 {{20, 20}, {37, 37}} - _NS:9 NO @@ -670,7 +813,6 @@ 292 {{80, 0}, {80, 67}} - _NS:9 NO @@ -710,15 +852,14 @@ micro_off_default.png - + 292 {{160, 0}, {80, 67}} - - + _NS:9 NO 22 @@ -757,14 +898,68 @@ speaker_off_default.png - + + + + + 292 + {{160, 0}, {80, 67}} + + + _NS:9 + NO + 29 + + Route + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 38 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over.png + + + NSImage + routes_disabled.png + + + NSImage + routes_selected.png + + + NSImage + routes_default.png + + + 292 {{240, 0}, {80, 67}} - _NS:9 NO @@ -804,14 +999,13 @@ options_default.png - + 264 {{0, 67}, {105, 68}} - _NS:9 NO @@ -848,7 +1042,6 @@ -2147483384 {{0, 67}, {105, 68}} - _NS:9 NO @@ -878,7 +1071,6 @@ 264 {{105, 67}, {111, 68}} - _NS:9 NO @@ -908,7 +1100,6 @@ 264 {{215, 67}, {105, 68}} - _NS:9 NO @@ -944,7 +1135,6 @@ {{0, 325}, {320, 135}} - _NS:9 @@ -954,7 +1144,6 @@ {320, 460} - _NS:9 @@ -969,7 +1158,6 @@ -2147483355 {{0, 248}, {480, 72}} - _NS:9 @@ -992,7 +1180,6 @@ 274 {281, 260} - _NS:9 2 @@ -1005,7 +1192,6 @@ 292 {{-20, 10}, {107, 54}} - 1 @@ -1028,7 +1214,6 @@ 292 {{87, 10}, {106, 54}} - NO NO @@ -1047,7 +1232,6 @@ 292 {{193, 10}, {107, 54}} - NO NO @@ -1066,7 +1250,6 @@ 292 {{-20, 72}, {107, 54}} - NO NO @@ -1085,7 +1268,6 @@ 292 {{87, 72}, {106, 54}} - NO NO @@ -1104,7 +1286,6 @@ 292 {{193, 72}, {107, 54}} - NO NO @@ -1123,7 +1304,6 @@ 292 {{-20, 134}, {107, 54}} - NO NO @@ -1142,7 +1322,6 @@ 292 {{87, 134}, {106, 54}} - NO NO @@ -1161,7 +1340,6 @@ 292 {{193, 134}, {107, 54}} - NO NO @@ -1180,7 +1358,6 @@ 292 {{-20, 196}, {107, 54}} - NO NO @@ -1199,7 +1376,6 @@ 292 {{87, 196}, {106, 54}} - NO NO @@ -1218,7 +1394,7 @@ 292 {{193, 196}, {107, 54}} - + NO NO 14 @@ -1234,13 +1410,178 @@ {{91, 0}, {281, 260}} - _NS:9 1 IBCocoaTouchFramework + + + 293 + + + + 292 + {65, 57} + + + _NS:9 + NO + 30 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Bluetooth + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_bluetooth_off_over_landscape.png + + + NSImage + route_bluetooth_off_disabled_landscape.png + + + NSImage + route_bluetooth_on_default_landscape.png + + + NSImage + route_bluetooth_off_default_landscape.png + + + + + + + 292 + {{0, 55}, {65, 57}} + + + _NS:9 + NO + 31 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Receiver + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + NSImage + route_phone_off_over_landscape.png + + + NSImage + route_phone_off_disabled_landscape.png + + + NSImage + route_phone_on_default_landscape.png + + + NSImage + route_phone_off_default_landscape.png + + + + + + + 292 + {{0, 108}, {65, 57}} + + + _NS:9 + NO + 32 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 28 + 0.0 + 0.0 + 0.0 + Speaker + + + + + + NSImage + route_speaker_off_over_landscape.png + + + NSImage + route_speaker_off_disabled_landscape.png + + + NSImage + route_speaker_on_default_landscape.png + + + NSImage + route_speaker_off_default_landscape.png + + + + + + {{285, 85}, {65, 170}} + + + _NS:9 + + 33 + IBCocoaTouchFramework + 293 @@ -1250,7 +1591,6 @@ 292 {65, 55} - _NS:9 NO @@ -1285,15 +1625,13 @@ options_transfer_default_landscape.png - + 292 {{0, 51}, {65, 55}} - - _NS:9 NO 17 @@ -1327,12 +1665,11 @@ options_add_default_landscape.png - + {{415, 140}, {65, 105}} - _NS:9 @@ -1348,7 +1685,6 @@ 292 {{-44, -8}, {44, 90}} - _NS:9 100 @@ -1361,7 +1697,6 @@ 292 {{480, -8}, {44, 90}} - _NS:9 101 @@ -1374,8 +1709,7 @@ 290 {{0, 82}, {480, 2000}} - - + _NS:9 1 @@ -1389,7 +1723,6 @@ 292 {{65, 0}, {65, 82}} - _NS:9 NO @@ -1429,14 +1762,13 @@ video_off_default_landscape.png - + -2147483356 {{79, 20}, {37, 37}} - _NS:9 NO @@ -1449,7 +1781,6 @@ 292 {{130, 0}, {65, 82}} - _NS:9 NO @@ -1489,15 +1820,14 @@ micro_off_default_landscape.png - + 292 {{285, 0}, {65, 82}} - - + _NS:9 NO 22 @@ -1536,14 +1866,68 @@ speaker_off_default_landscape.png - + + + + + 292 + {{285, 0}, {65, 82}} + + + _NS:9 + NO + 29 + + + + IBCocoaTouchFramework + 0 + 0 + NO + NO + 24 + 0.0 + 0.0 + 0.0 + Route + + 2 + MC44MTE3NjQ3MDU5IDAuMjk4MDM5MjE1NyAwLjE2MDc4NDMxMzcAA + + + 2 + MC42NTA5ODAzOTIyIDAuNzAxOTYwNzg0MyAwLjc0OTAxOTYwNzgAA + + + 2 + MC4yNTQ5MDE5NjA4IDAuMjgyMzUyOTQxMiAwLjMwOTgwMzkyMTYAA + + + + + NSImage + routes_over_landscape.png + + + NSImage + routes_disabled_landscape.png + + + NSImage + routes_selected_landscape.png + + + NSImage + routes_default_landscape.png + + + 292 {{350, 0}, {65, 82}} - _NS:9 NO @@ -1583,14 +1967,13 @@ options_default_landscape.png - + 264 {65, 82} - _NS:9 NO @@ -1624,7 +2007,6 @@ -2147483384 {65, 82} - _NS:9 NO @@ -1654,7 +2036,6 @@ 264 {{195, 0}, {90, 82}} - _NS:9 NO @@ -1684,7 +2065,6 @@ 264 {{415, 0}, {65, 82}} - _NS:9 NO @@ -1717,7 +2097,6 @@ {{0, 238}, {480, 82}} - _NS:9 @@ -1727,7 +2106,6 @@ {480, 320} - _NS:9 @@ -1956,6 +2334,46 @@ 140 + + + routesButton + + + + 202 + + + + routesBluetoothButton + + + + 203 + + + + routesReceiverButton + + + + 204 + + + + routesSpeakerButton + + + + 205 + + + + routesView + + + + 206 + onPadClick: @@ -2098,6 +2516,42 @@ 133 + + + onRoutesClick: + + + 7 + + 211 + + + + onRoutesSpeakerClick: + + + 7 + + 210 + + + + onRoutesReceiverClick: + + + 7 + + 209 + + + + onRoutesBluetoothClick: + + + 7 + + 208 + @@ -2126,6 +2580,7 @@ + Portrait View @@ -2153,6 +2608,7 @@ + buttons @@ -2340,6 +2796,7 @@ + Landscape View @@ -2481,6 +2938,7 @@ + buttons @@ -2581,6 +3039,76 @@ leftPadding + + 164 + + + routesButton + + + 167 + + + + + + + + routesView + + + 168 + + + routesSpeakerButton + + + 169 + + + routesReceiverButton + + + 174 + + + routesBluetoothButton + + + 183 + + + routesButton + + + 186 + + + + + + + + routesView + + + 187 + + + routesSpeakerButton + + + 188 + + + routesReceiverButton + + + 193 + + + routesBluetoothButton + @@ -2591,7 +3119,7 @@ UIToggleButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UITransparentView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2683,6 +3211,34 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + UIToggleButton + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2743,7 +3299,7 @@ UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -2753,289 +3309,9 @@ - 163 - - - - - TPMultiLayoutViewController - UIViewController - - UIView - UIView - - - - landscapeView - UIView - - - portraitView - UIView - - - - IBProjectSource - ./Classes/TPMultiLayoutViewController.h - - - - UICallBar - TPMultiLayoutViewController - - id - id - id - id - id - - - - onConferenceClick: - id - - - onOptionsAddClick: - id - - - onOptionsClick: - id - - - onOptionsTransferClick: - id - - - onPadClick: - id - - - - UIButton - UIToggleButton - UIDigitButton - UIDigitButton - UIDigitButton - UIHangUpButton - UIMicroButton - UIDigitButton - UIDigitButton - UIButton - UIToggleButton - UIButton - UIView - UIView - UIPauseButton - UIDigitButton - UIDigitButton - UIDigitButton - UISpeakerButton - UIDigitButton - UIDigitButton - UIDigitButton - UIVideoButton - UIDigitButton - - - - conferenceButton - UIButton - - - dialerButton - UIToggleButton - - - eightButton - UIDigitButton - - - fiveButton - UIDigitButton - - - fourButton - UIDigitButton - - - hangupButton - UIHangUpButton - - - microButton - UIMicroButton - - - nineButton - UIDigitButton - - - oneButton - UIDigitButton - - - optionsAddButton - UIButton - - - optionsButton - UIToggleButton - - - optionsTransferButton - UIButton - - - optionsView - UIView - - - padView - UIView - - - pauseButton - UIPauseButton - - - sevenButton - UIDigitButton - - - sharpButton - UIDigitButton - - - sixButton - UIDigitButton - - - speakerButton - UISpeakerButton - - - starButton - UIDigitButton - - - threeButton - UIDigitButton - - - twoButton - UIDigitButton - - - videoButton - UIVideoButton - - - zeroButton - UIDigitButton - - - - IBProjectSource - ./Classes/UICallBar.h - - - - UIDigitButton - UILongTouchButton - - addressField - UITextField - - - addressField - - addressField - UITextField - - - - IBProjectSource - ./Classes/UIDigitButton.h - - - - UIHangUpButton - UIButton - - IBProjectSource - ./Classes/UIHangUpButton.h - - - - UILongTouchButton - UIButton - - IBProjectSource - ./Classes/UILongTouchButton.h - - - - UIMicroButton - UIToggleButton - - IBProjectSource - ./Classes/UIMicroButton.h - - - - UIPauseButton - UIToggleButton - - IBProjectSource - ./Classes/UIPauseButton.h - - - - UISpeakerButton - UIToggleButton - - IBProjectSource - ./Classes/UISpeakerButton.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - UITransparentView - UIView - - IBProjectSource - ./Classes/UITransparentView.h - - - - UIVideoButton - UIToggleButton - - waitView - UIActivityIndicatorView - - - waitView - - waitView - UIActivityIndicatorView - - - - IBProjectSource - ./Classes/UIVideoButton.h - - - + 211 + 0 IBCocoaTouchFramework YES @@ -3117,6 +3393,38 @@ {130, 163} {209, 136} {130, 163} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 127} + {130, 114} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} + {160, 134} + {130, 163} {160, 134} {130, 163} {160, 134} @@ -3134,6 +3442,6 @@ {160, 134} {130, 163} - 1926 + 2083 diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 47d44ea1f..28efeaf74 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -7,6 +7,70 @@ objects = { /* Begin PBXBuildFile section */ + 1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; + 1599105416F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; + 1599105516F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */; }; + 1599105616F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */; }; + 1599105716F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */; }; + 1599105816F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */; }; + 1599105916F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */; }; + 1599105A16F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */; }; + 1599105B16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */; }; + 1599105C16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */; }; + 1599105D16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */; }; + 1599105E16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */; }; + 1599105F16F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */; }; + 1599106016F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */; }; + 1599106116F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */; }; + 1599106216F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */; }; + 1599106316F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */; }; + 1599106416F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */; }; + 1599106516F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */; }; + 1599106616F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */; }; + 1599106716F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */; }; + 1599106816F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */; }; + 1599106916F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */; }; + 1599106A16F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */; }; + 1599106B16F746B2007BF52B /* routes_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104F16F746B2007BF52B /* routes_default_landscape.png */; }; + 1599106C16F746B2007BF52B /* routes_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104F16F746B2007BF52B /* routes_default_landscape.png */; }; + 1599106D16F746B2007BF52B /* routes_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105016F746B2007BF52B /* routes_disabled_landscape.png */; }; + 1599106E16F746B2007BF52B /* routes_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105016F746B2007BF52B /* routes_disabled_landscape.png */; }; + 1599106F16F746B2007BF52B /* routes_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105116F746B2007BF52B /* routes_over_landscape.png */; }; + 1599107016F746B2007BF52B /* routes_over_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105116F746B2007BF52B /* routes_over_landscape.png */; }; + 1599107116F746B2007BF52B /* routes_selected_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105216F746B2007BF52B /* routes_selected_landscape.png */; }; + 1599107216F746B2007BF52B /* routes_selected_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599105216F746B2007BF52B /* routes_selected_landscape.png */; }; + 15AF3C5416F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */; }; + 15AF3C5516F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */; }; + 15AF3C5616F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */; }; + 15AF3C5716F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */; }; + 15AF3C5816F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */; }; + 15AF3C5916F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */; }; + 15AF3C5C16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */; }; + 15AF3C5D16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */; }; + 15AF3C6C16F37A4A00FC52EC /* route_phone_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */; }; + 15AF3C6D16F37A4A00FC52EC /* route_phone_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */; }; + 15AF3C6E16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */; }; + 15AF3C6F16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */; }; + 15AF3C7016F37A4A00FC52EC /* route_phone_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */; }; + 15AF3C7116F37A4A00FC52EC /* route_phone_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */; }; + 15AF3C7416F37A4A00FC52EC /* route_phone_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */; }; + 15AF3C7516F37A4A00FC52EC /* route_phone_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */; }; + 15AF3C8416F37A5500FC52EC /* route_speaker_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */; }; + 15AF3C8516F37A5500FC52EC /* route_speaker_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */; }; + 15AF3C8616F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */; }; + 15AF3C8716F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */; }; + 15AF3C8816F37A5500FC52EC /* route_speaker_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */; }; + 15AF3C8916F37A5500FC52EC /* route_speaker_off_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */; }; + 15AF3C8C16F37A5500FC52EC /* route_speaker_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */; }; + 15AF3C8D16F37A5500FC52EC /* route_speaker_on_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */; }; + 15AF3C9816F37A5D00FC52EC /* routes_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9416F37A5D00FC52EC /* routes_default.png */; }; + 15AF3C9916F37A5D00FC52EC /* routes_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9416F37A5D00FC52EC /* routes_default.png */; }; + 15AF3C9A16F37A5D00FC52EC /* routes_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */; }; + 15AF3C9B16F37A5D00FC52EC /* routes_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */; }; + 15AF3C9C16F37A5D00FC52EC /* routes_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9616F37A5D00FC52EC /* routes_over.png */; }; + 15AF3C9D16F37A5D00FC52EC /* routes_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9616F37A5D00FC52EC /* routes_over.png */; }; + 15AF3C9E16F37A5D00FC52EC /* routes_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9716F37A5D00FC52EC /* routes_selected.png */; }; + 15AF3C9F16F37A5D00FC52EC /* routes_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9716F37A5D00FC52EC /* routes_selected.png */; }; 1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; }; 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; @@ -1345,6 +1409,38 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default_landscape.png; path = Resources/route_bluetooth_off_default_landscape.png; sourceTree = ""; }; + 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_disabled_landscape.png; path = Resources/route_bluetooth_off_disabled_landscape.png; sourceTree = ""; }; + 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_over_landscape.png; path = Resources/route_bluetooth_off_over_landscape.png; sourceTree = ""; }; + 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_on_default_landscape.png; path = Resources/route_bluetooth_on_default_landscape.png; sourceTree = ""; }; + 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_default_landscape.png; path = Resources/route_phone_off_default_landscape.png; sourceTree = ""; }; + 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_disabled_landscape.png; path = Resources/route_phone_off_disabled_landscape.png; sourceTree = ""; }; + 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_over_landscape.png; path = Resources/route_phone_off_over_landscape.png; sourceTree = ""; }; + 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_on_default_landscape.png; path = Resources/route_phone_on_default_landscape.png; sourceTree = ""; }; + 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_default_landscape.png; path = Resources/route_speaker_off_default_landscape.png; sourceTree = ""; }; + 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_disabled_landscape.png; path = Resources/route_speaker_off_disabled_landscape.png; sourceTree = ""; }; + 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_over_landscape.png; path = Resources/route_speaker_off_over_landscape.png; sourceTree = ""; }; + 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_on_default_landscape.png; path = Resources/route_speaker_on_default_landscape.png; sourceTree = ""; }; + 1599104F16F746B2007BF52B /* routes_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_default_landscape.png; path = Resources/routes_default_landscape.png; sourceTree = ""; }; + 1599105016F746B2007BF52B /* routes_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_disabled_landscape.png; path = Resources/routes_disabled_landscape.png; sourceTree = ""; }; + 1599105116F746B2007BF52B /* routes_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_over_landscape.png; path = Resources/routes_over_landscape.png; sourceTree = ""; }; + 1599105216F746B2007BF52B /* routes_selected_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_selected_landscape.png; path = Resources/routes_selected_landscape.png; sourceTree = ""; }; + 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default.png; path = Resources/route_bluetooth_off_default.png; sourceTree = ""; }; + 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_disabled.png; path = Resources/route_bluetooth_off_disabled.png; sourceTree = ""; }; + 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_over.png; path = Resources/route_bluetooth_off_over.png; sourceTree = ""; }; + 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_on_default.png; path = Resources/route_bluetooth_on_default.png; sourceTree = ""; }; + 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_default.png; path = Resources/route_phone_off_default.png; sourceTree = ""; }; + 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_disabled.png; path = Resources/route_phone_off_disabled.png; sourceTree = ""; }; + 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_off_over.png; path = Resources/route_phone_off_over.png; sourceTree = ""; }; + 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_phone_on_default.png; path = Resources/route_phone_on_default.png; sourceTree = ""; }; + 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_default.png; path = Resources/route_speaker_off_default.png; sourceTree = ""; }; + 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_disabled.png; path = Resources/route_speaker_off_disabled.png; sourceTree = ""; }; + 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_off_over.png; path = Resources/route_speaker_off_over.png; sourceTree = ""; }; + 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_speaker_on_default.png; path = Resources/route_speaker_on_default.png; sourceTree = ""; }; + 15AF3C9416F37A5D00FC52EC /* routes_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_default.png; path = Resources/routes_default.png; sourceTree = ""; }; + 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_disabled.png; path = Resources/routes_disabled.png; sourceTree = ""; }; + 15AF3C9616F37A5D00FC52EC /* routes_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_over.png; path = Resources/routes_over.png; sourceTree = ""; }; + 15AF3C9716F37A5D00FC52EC /* routes_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = routes_selected.png; path = Resources/routes_selected.png; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* LinphoneAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneAppDelegate.h; sourceTree = ""; }; 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneAppDelegate.m; sourceTree = ""; }; @@ -3321,6 +3417,38 @@ 2237D4081084D7A9001383EE /* ring.wav */, 22F254801073D99800AC9B3F /* ringback.wav */, 70571E1913FABCB000CDD3C2 /* rootca.pem */, + 15AF3C4C16F37A3E00FC52EC /* route_bluetooth_off_default.png */, + 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */, + 15AF3C4D16F37A3E00FC52EC /* route_bluetooth_off_disabled.png */, + 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */, + 15AF3C4E16F37A3E00FC52EC /* route_bluetooth_off_over.png */, + 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */, + 15AF3C5016F37A3E00FC52EC /* route_bluetooth_on_default.png */, + 1599104616F746B2007BF52B /* route_bluetooth_on_default_landscape.png */, + 15AF3C6416F37A4A00FC52EC /* route_phone_off_default.png */, + 1599104716F746B2007BF52B /* route_phone_off_default_landscape.png */, + 15AF3C6516F37A4A00FC52EC /* route_phone_off_disabled.png */, + 1599104816F746B2007BF52B /* route_phone_off_disabled_landscape.png */, + 15AF3C6616F37A4A00FC52EC /* route_phone_off_over.png */, + 1599104916F746B2007BF52B /* route_phone_off_over_landscape.png */, + 15AF3C6816F37A4A00FC52EC /* route_phone_on_default.png */, + 1599104A16F746B2007BF52B /* route_phone_on_default_landscape.png */, + 15AF3C7C16F37A5500FC52EC /* route_speaker_off_default.png */, + 1599104B16F746B2007BF52B /* route_speaker_off_default_landscape.png */, + 15AF3C7D16F37A5500FC52EC /* route_speaker_off_disabled.png */, + 1599104C16F746B2007BF52B /* route_speaker_off_disabled_landscape.png */, + 15AF3C7E16F37A5500FC52EC /* route_speaker_off_over.png */, + 1599104D16F746B2007BF52B /* route_speaker_off_over_landscape.png */, + 15AF3C8016F37A5500FC52EC /* route_speaker_on_default.png */, + 1599104E16F746B2007BF52B /* route_speaker_on_default_landscape.png */, + 15AF3C9416F37A5D00FC52EC /* routes_default.png */, + 1599104F16F746B2007BF52B /* routes_default_landscape.png */, + 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */, + 1599105016F746B2007BF52B /* routes_disabled_landscape.png */, + 15AF3C9616F37A5D00FC52EC /* routes_over.png */, + 1599105116F746B2007BF52B /* routes_over_landscape.png */, + 15AF3C9716F37A5D00FC52EC /* routes_selected.png */, + 1599105216F746B2007BF52B /* routes_selected_landscape.png */, D3D6A3A5159B0EFE005F692C /* security_ko.png */, D3D6A3A7159B0EFE005F692C /* security_ok.png */, D3D6A3A6159B0EFE005F692C /* security_pending.png */, @@ -4226,6 +4354,38 @@ D310392A162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, D33E1F08164CF35100CFA363 /* callbar_left_padding.png in Resources */, D33E1F0A164CF35100CFA363 /* callbar_right_padding.png in Resources */, + 15AF3C5416F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */, + 15AF3C5616F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */, + 15AF3C5816F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */, + 15AF3C5C16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */, + 15AF3C6C16F37A4A00FC52EC /* route_phone_off_default.png in Resources */, + 15AF3C6E16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */, + 15AF3C7016F37A4A00FC52EC /* route_phone_off_over.png in Resources */, + 15AF3C7416F37A4A00FC52EC /* route_phone_on_default.png in Resources */, + 15AF3C8416F37A5500FC52EC /* route_speaker_off_default.png in Resources */, + 15AF3C8616F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */, + 15AF3C8816F37A5500FC52EC /* route_speaker_off_over.png in Resources */, + 15AF3C8C16F37A5500FC52EC /* route_speaker_on_default.png in Resources */, + 15AF3C9816F37A5D00FC52EC /* routes_default.png in Resources */, + 15AF3C9A16F37A5D00FC52EC /* routes_disabled.png in Resources */, + 15AF3C9C16F37A5D00FC52EC /* routes_over.png in Resources */, + 15AF3C9E16F37A5D00FC52EC /* routes_selected.png in Resources */, + 1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */, + 1599105516F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */, + 1599105716F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */, + 1599105916F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */, + 1599105B16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */, + 1599105D16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */, + 1599105F16F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */, + 1599106116F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */, + 1599106316F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */, + 1599106516F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */, + 1599106716F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */, + 1599106916F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */, + 1599106B16F746B2007BF52B /* routes_default_landscape.png in Resources */, + 1599106D16F746B2007BF52B /* routes_disabled_landscape.png in Resources */, + 1599106F16F746B2007BF52B /* routes_over_landscape.png in Resources */, + 1599107116F746B2007BF52B /* routes_selected_landscape.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4730,6 +4890,38 @@ D310392B162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */, D33E1F09164CF35100CFA363 /* callbar_left_padding.png in Resources */, D33E1F0B164CF35100CFA363 /* callbar_right_padding.png in Resources */, + 15AF3C5516F37A3E00FC52EC /* route_bluetooth_off_default.png in Resources */, + 15AF3C5716F37A3E00FC52EC /* route_bluetooth_off_disabled.png in Resources */, + 15AF3C5916F37A3E00FC52EC /* route_bluetooth_off_over.png in Resources */, + 15AF3C5D16F37A3E00FC52EC /* route_bluetooth_on_default.png in Resources */, + 15AF3C6D16F37A4A00FC52EC /* route_phone_off_default.png in Resources */, + 15AF3C6F16F37A4A00FC52EC /* route_phone_off_disabled.png in Resources */, + 15AF3C7116F37A4A00FC52EC /* route_phone_off_over.png in Resources */, + 15AF3C7516F37A4A00FC52EC /* route_phone_on_default.png in Resources */, + 15AF3C8516F37A5500FC52EC /* route_speaker_off_default.png in Resources */, + 15AF3C8716F37A5500FC52EC /* route_speaker_off_disabled.png in Resources */, + 15AF3C8916F37A5500FC52EC /* route_speaker_off_over.png in Resources */, + 15AF3C8D16F37A5500FC52EC /* route_speaker_on_default.png in Resources */, + 15AF3C9916F37A5D00FC52EC /* routes_default.png in Resources */, + 15AF3C9B16F37A5D00FC52EC /* routes_disabled.png in Resources */, + 15AF3C9D16F37A5D00FC52EC /* routes_over.png in Resources */, + 15AF3C9F16F37A5D00FC52EC /* routes_selected.png in Resources */, + 1599105416F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */, + 1599105616F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */, + 1599105816F746B2007BF52B /* route_bluetooth_off_over_landscape.png in Resources */, + 1599105A16F746B2007BF52B /* route_bluetooth_on_default_landscape.png in Resources */, + 1599105C16F746B2007BF52B /* route_phone_off_default_landscape.png in Resources */, + 1599105E16F746B2007BF52B /* route_phone_off_disabled_landscape.png in Resources */, + 1599106016F746B2007BF52B /* route_phone_off_over_landscape.png in Resources */, + 1599106216F746B2007BF52B /* route_phone_on_default_landscape.png in Resources */, + 1599106416F746B2007BF52B /* route_speaker_off_default_landscape.png in Resources */, + 1599106616F746B2007BF52B /* route_speaker_off_disabled_landscape.png in Resources */, + 1599106816F746B2007BF52B /* route_speaker_off_over_landscape.png in Resources */, + 1599106A16F746B2007BF52B /* route_speaker_on_default_landscape.png in Resources */, + 1599106C16F746B2007BF52B /* routes_default_landscape.png in Resources */, + 1599106E16F746B2007BF52B /* routes_disabled_landscape.png in Resources */, + 1599107016F746B2007BF52B /* routes_over_landscape.png in Resources */, + 1599107216F746B2007BF52B /* routes_selected_landscape.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From e142e4b72de1eb55ae73a3317f410bf286822a1f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 19 Mar 2013 14:36:48 +0100 Subject: [PATCH 009/218] Update bcg729 submodule. --- submodules/bcg729 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/bcg729 b/submodules/bcg729 index 9579f5f78..715309618 160000 --- a/submodules/bcg729 +++ b/submodules/bcg729 @@ -1 +1 @@ -Subproject commit 9579f5f7824106bab671fa2449a5518e5e0473d6 +Subproject commit 715309618f3c5e20311d4c113d401f1c43f87511 From 7f5d1569cf767c9c66e2ccde5002b6a348551f35 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 20 Mar 2013 14:48:36 +0100 Subject: [PATCH 010/218] update both belle-sip and linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index c84fb68cd..9b6ee4c14 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit c84fb68cd38c21510f59820471d4356e2538ed5f +Subproject commit 9b6ee4c140ba1bb83142b921764bbbb1b42ed22c diff --git a/submodules/linphone b/submodules/linphone index 4ee33b245..d69d96a0c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4ee33b2459883210b6ea53aded805483ec3c50a8 +Subproject commit d69d96a0cabe126676524c30d637eb8c2b138a99 From 1e390ccd22d21c6a446a1300e1b24befe5e96f83 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 20 Mar 2013 15:17:52 +0100 Subject: [PATCH 011/218] set correct submodules and clean unused. --- .gitmodules | 2 +- submodules/libantlr3c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 160000 submodules/libantlr3c diff --git a/.gitmodules b/.gitmodules index b1fed58b9..9707bbffb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "submodules/linphone"] path = submodules/linphone - url = git://git.linphone.org/linphone-private.git + url = gitosis@git.linphone.org:linphone-private [submodule "submodules/externals/osip"] path = submodules/externals/osip url = git://git.linphone.org/osip.git diff --git a/submodules/libantlr3c b/submodules/libantlr3c deleted file mode 160000 index eb738fb40..000000000 --- a/submodules/libantlr3c +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eb738fb406d2b75e7e94457da800c38d8bfc3c71 From 755b22fbb9a5d6c9e61aa5d53b17aa0c1eaaa703 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 20 Mar 2013 15:48:04 +0100 Subject: [PATCH 012/218] Activate ICE when configuring a linphone.org account with the wizard. --- Resources/linphonerc-factory | 2 +- Resources/linphonerc-factory~ipad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index 0025fff93..e16499cd6 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -42,6 +42,6 @@ expires=604800 push_notification=1 transport=tls sharing_server=https://www.linphone.org:444/upload.php -ice=0 +ice=1 stun=stun.linphone.org diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index fac1148f1..e9e636be0 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -42,5 +42,5 @@ expires=604800 push_notification=1 transport=tls sharing_server=https://www.linphone.org:444/upload.php -ice=0 +ice=1 stun=stun.linphone.org From 13d6545173c3b9ca7d5d3603c324a8c64a974dbc Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 21 Mar 2013 14:16:02 +0100 Subject: [PATCH 013/218] Fix call transfer to an email address. --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index d2674539d..5f7cbee8a 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1294,7 +1294,7 @@ static void audioRouteChangeListenerCallback ( linphone_address_set_display_name(linphoneAddress, [displayName cStringUsingEncoding:[NSString defaultCStringEncoding]]); } if(transfer) { - linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), normalizedUserName); + linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), linphone_address_as_string_uri_only(linphoneAddress)); } else { call=linphone_core_invite_address_with_params(theLinphoneCore, linphoneAddress, lcallParams); } From 685df1a77919b3c1bd15d3afb4566d479fa7a013 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 29 Mar 2013 15:29:27 +0100 Subject: [PATCH 014/218] Do not use linphone_core_get_identity() when creating a LinphoneAddress to prevent a random port to appear. --- Classes/LinphoneCoreSettingsStore.m | 2 +- Classes/LinphoneManager.m | 2 +- Classes/WizardViewController.m | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index bb54f270f..3c82e864d 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -354,7 +354,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); //possible valid config detected proxyCfg = linphone_core_create_proxy_config(lc); char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(lc)); + LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain(linphoneAddress, [domain cStringUsingEncoding:[NSString defaultCStringEncoding]]); diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 5f7cbee8a..768c7fcab 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1287,7 +1287,7 @@ static void audioRouteChangeListenerCallback ( [error release]; } else { char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(theLinphoneCore)); + LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); linphone_proxy_config_normalize_number(proxyCfg,[address cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); if(displayName!=nil) { diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 125a992b4..2b2be7e94 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -384,13 +384,12 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server { - LinphoneCore *lc = [LinphoneManager getLc]; [self clearProxyConfig]; if(server == nil) { server = domain; } char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(lc)); + LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain(linphoneAddress, [domain UTF8String]); @@ -416,7 +415,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (NSString*)identityFromUsername:(NSString*)username { char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity([LinphoneManager getLc])); + LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain(linphoneAddress, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] UTF8String]); From 5cfe4d211c312574bb9ca07b26246ead6a04da01 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 2 Apr 2013 10:25:18 +0200 Subject: [PATCH 015/218] Fix issue 000624: App crash when editing contact in address book. Do not try to animate the email section of the contact details if it is not shown. --- Classes/ContactDetailsTableViewController.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 1ac0bf331..8f49fd838 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -643,7 +643,8 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C #pragma mark - UITableViewDelegate Functions -- (void)setEditing:(BOOL)editing animated:(BOOL)animated { +- (void)setEditing:(BOOL)editing animated:(BOOL)animated { + bool_t showEmails = [[LinphoneManager instance] lpConfigBoolForKey:@"show_contacts_emails_preference"]; // Resign keyboard if(!editing) { [LinphoneUtils findAndResignFirstResponder:[self tableView]]; @@ -659,14 +660,14 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) { if(contactSections[section] == ContactSections_Number || contactSections[section] == ContactSections_Sip || - contactSections[section] == ContactSections_Email) + (showEmails && contactSections[section] == ContactSections_Email)) [self addEntry:self.tableView section:section animated:animated]; } } else { for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) { if(contactSections[section] == ContactSections_Number || contactSections[section] == ContactSections_Sip || - contactSections[section] == ContactSections_Email) + (showEmails && contactSections[section] == ContactSections_Email)) [self removeEmptyEntry:self.tableView section:section animated:animated]; } } From 892bcefa2cbbdca5c0d3b05fd8fe7a60dd2bffaa Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 2 Apr 2013 10:47:35 +0200 Subject: [PATCH 016/218] Fix domain when performing an outgoing call without outgoing SIP proxy. --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 768c7fcab..bb9dc1bce 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1287,7 +1287,7 @@ static void audioRouteChangeListenerCallback ( [error release]; } else { char normalizedUserName[256]; - LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); + LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity(theLinphoneCore)); linphone_proxy_config_normalize_number(proxyCfg,[address cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); if(displayName!=nil) { From 667f04991a89302dd314ea3eec0a9dd66795248a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 2 Apr 2013 11:23:08 +0200 Subject: [PATCH 017/218] Start dtmf stream when all calls have ended. This has the effect to be able to play DTMFs faster and also resets the audio route when using bluetooth. This allows the route selection to work correctly on next outgoing call. --- Classes/LinphoneManager.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index bb9dc1bce..5ee4f8e62 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -472,6 +472,8 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char [self removeCTCallCenterCb]; bluetoothAvailable = FALSE; bluetoothEnabled = FALSE; + /*IOS specific*/ + linphone_core_start_dtmf_stream(theLinphoneCore); } if (incallBgTask) { [[UIApplication sharedApplication] endBackgroundTask:incallBgTask]; From b4d686489ce2ca57fef65b48209e151d13c9f26e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 4 Apr 2013 11:57:03 +0200 Subject: [PATCH 018/218] Add armv7s to the list of valid architectures for the liblinphone xcode project. --- submodules/liblinphone.xcodeproj/project.pbxproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 6ded720c2..b16778286 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -2015,6 +2015,7 @@ ); PRODUCT_NAME = mediastreamer; SKIP_INSTALL = YES; + VALID_ARCHS = "armv6 armv7 armv7s i386"; }; name = Debug; }; @@ -2071,6 +2072,7 @@ ); PRODUCT_NAME = mediastreamer; SKIP_INSTALL = YES; + VALID_ARCHS = "armv6 armv7 armv7s i386"; }; name = Release; }; @@ -2127,6 +2129,7 @@ ); PRODUCT_NAME = mediastreamer; SKIP_INSTALL = YES; + VALID_ARCHS = "armv6 armv7 armv7s i386"; }; name = DistributionAdhoc; }; From e9bcc568b39b66436d99f107af808a280d279799 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 4 Apr 2013 12:23:15 +0200 Subject: [PATCH 019/218] Increase version number. --- linphone-Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linphone-Info.plist b/linphone-Info.plist index b24ab61b5..6118fb186 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -42,7 +42,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.5.100 + 3.5.101 CFBundleURLTypes @@ -59,7 +59,7 @@ CFBundleVersion - 2.0.2 + 2.0.3 NSMainNibFile LinphoneApp NSMainNibFile~ipad From 8677da1e81e5c79c5a7de1996ac60ae805287aa0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 4 Apr 2013 14:39:37 +0200 Subject: [PATCH 020/218] Update linphone submodule to prevent crash on video toggle. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 71f31347f..125779185 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 71f31347fcddaa5f0e9e329a7320efe60bc7c281 +Subproject commit 12577918593030541fd4d7b12e5881347e0eafb4 From 9b51dea17379f5a8ea31062f7159d858240c57e1 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 5 Apr 2013 10:45:52 +0200 Subject: [PATCH 021/218] Fix crash when using a phone number as username in the wizard. --- Classes/WizardViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 2b2be7e94..bdd693925 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -388,13 +388,13 @@ static UICompositeViewDescription *compositeDescription = nil; if(server == nil) { server = domain; } + LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]); char normalizedUserName[256]; LinphoneAddress* linphoneAddress = linphone_address_new("sip:user@domain.com"); - linphone_proxy_config_normalize_number(NULL, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); + linphone_proxy_config_normalize_number(proxyCfg, [username cStringUsingEncoding:[NSString defaultCStringEncoding]], normalizedUserName, sizeof(normalizedUserName)); linphone_address_set_username(linphoneAddress, normalizedUserName); linphone_address_set_domain(linphoneAddress, [domain UTF8String]); const char* identity = linphone_address_as_string_uri_only(linphoneAddress); - LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]); LinphoneAuthInfo* info = linphone_auth_info_new([username UTF8String], NULL, [password UTF8String], NULL, NULL); linphone_proxy_config_set_identity(proxyCfg, identity); linphone_proxy_config_set_server_addr(proxyCfg, [server UTF8String]); From ab71734232acfee23990fdcc14029f584afa1e63 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 5 Apr 2013 15:56:06 +0200 Subject: [PATCH 022/218] update liblinphone because of bugfix for PUBLISH requests. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 125779185..d630e0a99 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 12577918593030541fd4d7b12e5881347e0eafb4 +Subproject commit d630e0a99decbed3e9a5437b680801dd236beb40 From 5e7c049641b6ec7b5bb54d59686ec74c8d516496 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 5 Apr 2013 15:56:06 +0200 Subject: [PATCH 023/218] update liblinphone because of bugfix for PUBLISH requests. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 125779185..d630e0a99 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 12577918593030541fd4d7b12e5881347e0eafb4 +Subproject commit d630e0a99decbed3e9a5437b680801dd236beb40 From 999f1b5f5061513f98561bbc2ecd4f8f5a0f9648 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 10 Apr 2013 11:32:20 +0200 Subject: [PATCH 024/218] Fix tutorials xcode project. --- .../hello-world.xcodeproj/project.pbxproj | 108 ++++++++++++------ 1 file changed, 71 insertions(+), 37 deletions(-) diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj index 2aa526a1c..9e5c2c61c 100755 --- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj +++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj @@ -7,6 +7,35 @@ objects = { /* Begin PBXBuildFile section */ + 154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1A981715642E00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; @@ -34,12 +63,6 @@ 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; }; 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; 22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; - 22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC3133A2E260044EA25 /* libssl.a */; }; - 22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC4133A2E260044EA25 /* libcrypto.a */; }; - 22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC7133A2E3F0044EA25 /* libssl.a */; }; - 22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */; }; - 22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCB133A2E5C0044EA25 /* libssl.a */; }; - 22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */; }; 22E5AFD1133A2E760044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; 22E5AFD2133A2E760044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; @@ -48,7 +71,6 @@ 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; 34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; - 34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -67,7 +89,6 @@ 34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; }; 34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; 34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; - 34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -82,7 +103,6 @@ 34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; 34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; }; 34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; }; - 34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00A14C4202100E1BC69 /* QuartzCore.framework */; }; 34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; }; 34F9E02414C4211000E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; }; @@ -92,7 +112,6 @@ 34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; 34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; - 34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -115,6 +134,11 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 154E1A931715638900A0D168 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = ""; }; + 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = ""; }; + 154E1A971715642E00A0D168 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; }; + 154E1A991715644400A0D168 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; }; + 154E1A9B1715645F00A0D168 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -126,12 +150,6 @@ 229499BA12A5417D00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 229499FF12A5433F00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 22D1B6A012A3E159001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; - 22E5AFC3133A2E260044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFC4133A2E260044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; - 22E5AFC7133A2E3F0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; - 22E5AFCB133A2E5C0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 22E5AFCF133A2E760044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; 22E5AFD0133A2E760044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -144,7 +162,6 @@ 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; 34F9DFED14C41EBA00E1BC69 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; - 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = ""; }; 34F9DFF014C41EBA00E1BC69 /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; 34F9DFF114C41EBA00E1BC69 /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = ""; }; 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = ""; }; @@ -165,6 +182,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */, + 154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */, + 154E1A981715642E00A0D168 /* libavutil.a in Frameworks */, 34F9E03714C424AF00E1BC69 /* CoreMedia.framework in Frameworks */, 34F9E03514C4249600E1BC69 /* CoreVideo.framework in Frameworks */, 34F9E03414C4247A00E1BC69 /* AVFoundation.framework in Frameworks */, @@ -176,14 +196,13 @@ 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */, 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */, 34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */, - 34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */, + 154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */, 34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */, 34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */, 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */, 34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */, 34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */, - 22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */, - 22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */, @@ -191,6 +210,8 @@ 2220D5DA1278461C008F2C2E /* CoreAudio.framework in Frameworks */, 2220D5EA12784672008F2C2E /* AudioToolbox.framework in Frameworks */, 22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */, + 154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */, + 154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -207,15 +228,12 @@ 34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */, 34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */, 34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */, - 34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */, 34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */, 34F9E00E14C4204600E1BC69 /* libsrtp.a in Frameworks */, 34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */, 34F9E00C14C4203900E1BC69 /* OpenGLES.framework in Frameworks */, 34F9E00D14C4203900E1BC69 /* QuartzCore.framework in Frameworks */, - 22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */, - 22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */, 2294996912A53FEE00D6CF48 /* Foundation.framework in Frameworks */, 2294996A12A53FEE00D6CF48 /* UIKit.framework in Frameworks */, 2294996B12A53FEE00D6CF48 /* CoreGraphics.framework in Frameworks */, @@ -223,6 +241,14 @@ 2294997712A53FEE00D6CF48 /* CoreAudio.framework in Frameworks */, 2294997812A53FEE00D6CF48 /* AudioToolbox.framework in Frameworks */, 2294997912A53FEE00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */, + 154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */, + 154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */, + 154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */, + 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -237,7 +263,6 @@ 34F9E02514C4211000E1BC69 /* libvpx.a in Frameworks */, 34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */, 34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */, - 34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E01914C420DD00E1BC69 /* libeXosip2.a in Frameworks */, 34F9E01A14C420DD00E1BC69 /* libgsm.a in Frameworks */, 34F9E01B14C420DD00E1BC69 /* liblinphone.a in Frameworks */, @@ -246,8 +271,6 @@ 34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */, 34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */, 34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */, - 22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */, - 22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */, 229499A612A5417D00D6CF48 /* Foundation.framework in Frameworks */, 229499A712A5417D00D6CF48 /* UIKit.framework in Frameworks */, 229499A812A5417D00D6CF48 /* CoreGraphics.framework in Frameworks */, @@ -255,6 +278,14 @@ 229499B412A5417D00D6CF48 /* CoreAudio.framework in Frameworks */, 229499B512A5417D00D6CF48 /* AudioToolbox.framework in Frameworks */, 229499B612A5417D00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */, + 154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */, + 154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */, + 154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */, + 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,7 +299,6 @@ 34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */, 34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */, 34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */, - 34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */, 34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */, 34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */, @@ -287,6 +317,12 @@ 229499F912A5433F00D6CF48 /* CoreAudio.framework in Frameworks */, 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */, 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */, + 154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */, + 154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -318,27 +354,25 @@ 34F9E03314C4247A00E1BC69 /* AVFoundation.framework */, 34F9E00A14C4202100E1BC69 /* QuartzCore.framework */, 34F9E00814C41FE900E1BC69 /* CoreVideo.framework */, - 34F9E00414C41FCF00E1BC69 /* libsrtp.a */, - 34F9E00514C41FCF00E1BC69 /* libvpx.a */, 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */, + 154E1A991715644400A0D168 /* libavcodec.a */, + 154E1A971715642E00A0D168 /* libavutil.a */, + 22E5AFD0133A2E760044EA25 /* libcrypto.a */, 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */, 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */, 34F9DFED14C41EBA00E1BC69 /* libilbc.a */, 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */, - 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */, + 154E1A931715638900A0D168 /* libmediastreamer_base.a */, + 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */, 34F9DFF014C41EBA00E1BC69 /* libortp.a */, 34F9DFF114C41EBA00E1BC69 /* libosip2.a */, 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */, 34F9DFF314C41EBA00E1BC69 /* libspeex.a */, 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */, + 34F9E00414C41FCF00E1BC69 /* libsrtp.a */, 22E5AFCF133A2E760044EA25 /* libssl.a */, - 22E5AFD0133A2E760044EA25 /* libcrypto.a */, - 22E5AFCB133A2E5C0044EA25 /* libssl.a */, - 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */, - 22E5AFC7133A2E3F0044EA25 /* libssl.a */, - 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */, - 22E5AFC3133A2E260044EA25 /* libssl.a */, - 22E5AFC4133A2E260044EA25 /* libcrypto.a */, + 154E1A9B1715645F00A0D168 /* libswscale.a */, + 34F9E00514C41FCF00E1BC69 /* libvpx.a */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, From 614061db7f5af9099509cccd78400a3d6067e011 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 10 Apr 2013 11:32:20 +0200 Subject: [PATCH 025/218] Fix tutorials xcode project. --- .../hello-world.xcodeproj/project.pbxproj | 108 ++++++++++++------ 1 file changed, 71 insertions(+), 37 deletions(-) diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj index 2aa526a1c..9e5c2c61c 100755 --- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj +++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj @@ -7,6 +7,35 @@ objects = { /* Begin PBXBuildFile section */ + 154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1A981715642E00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A991715644400A0D168 /* libavcodec.a */; }; + 154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A971715642E00A0D168 /* libavutil.a */; }; + 154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; + 154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A931715638900A0D168 /* libmediastreamer_base.a */; }; + 154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */; }; + 154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; + 154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; + 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; @@ -34,12 +63,6 @@ 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5E912784672008F2C2E /* AudioToolbox.framework */; }; 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; 22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B6A012A3E159001AE361 /* libresolv.dylib */; }; - 22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC3133A2E260044EA25 /* libssl.a */; }; - 22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC4133A2E260044EA25 /* libcrypto.a */; }; - 22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC7133A2E3F0044EA25 /* libssl.a */; }; - 22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */; }; - 22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCB133A2E5C0044EA25 /* libssl.a */; }; - 22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */; }; 22E5AFD1133A2E760044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; 22E5AFD2133A2E760044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; @@ -48,7 +71,6 @@ 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; 34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; - 34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -67,7 +89,6 @@ 34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; }; 34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; 34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; - 34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -82,7 +103,6 @@ 34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; 34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; }; 34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; }; - 34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00A14C4202100E1BC69 /* QuartzCore.framework */; }; 34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; }; 34F9E02414C4211000E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; }; @@ -92,7 +112,6 @@ 34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; 34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */; }; - 34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */; }; 34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF014C41EBA00E1BC69 /* libortp.a */; }; 34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF114C41EBA00E1BC69 /* libosip2.a */; }; 34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; @@ -115,6 +134,11 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 154E1A931715638900A0D168 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = ""; }; + 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = ""; }; + 154E1A971715642E00A0D168 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; }; + 154E1A991715644400A0D168 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; }; + 154E1A9B1715645F00A0D168 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -126,12 +150,6 @@ 229499BA12A5417D00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 229499FF12A5433F00D6CF48 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 22D1B6A012A3E159001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; }; - 22E5AFC3133A2E260044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFC4133A2E260044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; - 22E5AFC7133A2E3F0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; - 22E5AFCB133A2E5C0044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; - 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 22E5AFCF133A2E760044EA25 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = "../../liblinphone-sdk/apple-darwin/lib/libssl.a"; sourceTree = ""; }; 22E5AFD0133A2E760044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -144,7 +162,6 @@ 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; 34F9DFED14C41EBA00E1BC69 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "../../liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = ""; }; - 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "../../liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = ""; }; 34F9DFF014C41EBA00E1BC69 /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; 34F9DFF114C41EBA00E1BC69 /* libosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosip2.a"; sourceTree = ""; }; 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = ""; }; @@ -165,6 +182,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 154E1A9C1715645F00A0D168 /* libswscale.a in Frameworks */, + 154E1A9A1715644400A0D168 /* libavcodec.a in Frameworks */, + 154E1A981715642E00A0D168 /* libavutil.a in Frameworks */, 34F9E03714C424AF00E1BC69 /* CoreMedia.framework in Frameworks */, 34F9E03514C4249600E1BC69 /* CoreVideo.framework in Frameworks */, 34F9E03414C4247A00E1BC69 /* AVFoundation.framework in Frameworks */, @@ -176,14 +196,13 @@ 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */, 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */, 34F9DFF814C41EBA00E1BC69 /* liblinphone.a in Frameworks */, - 34F9DFF914C41EBA00E1BC69 /* libmediastreamer.a in Frameworks */, + 154E1A941715638900A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1A961715639A00A0D168 /* libmediastreamer_voip.a in Frameworks */, 34F9DFFA14C41EBA00E1BC69 /* libortp.a in Frameworks */, 34F9DFFB14C41EBA00E1BC69 /* libosip2.a in Frameworks */, 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */, 34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */, 34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */, - 22E5AFC5133A2E260044EA25 /* libssl.a in Frameworks */, - 22E5AFC6133A2E260044EA25 /* libcrypto.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */, @@ -191,6 +210,8 @@ 2220D5DA1278461C008F2C2E /* CoreAudio.framework in Frameworks */, 2220D5EA12784672008F2C2E /* AudioToolbox.framework in Frameworks */, 22D1B6A112A3E159001AE361 /* libresolv.dylib in Frameworks */, + 154E1AAE171564EB00A0D168 /* libssl.a in Frameworks */, + 154E1AAF171564ED00A0D168 /* libcrypto.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -207,15 +228,12 @@ 34F9E01414C420A200E1BC69 /* libosip2.a in Frameworks */, 34F9E01514C420A200E1BC69 /* libosipparser2.a in Frameworks */, 34F9E01114C4208C00E1BC69 /* libeXosip2.a in Frameworks */, - 34F9E01214C4208C00E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E01314C4208C00E1BC69 /* libortp.a in Frameworks */, 34F9E01014C4207700E1BC69 /* liblinphone.a in Frameworks */, 34F9E00E14C4204600E1BC69 /* libsrtp.a in Frameworks */, 34F9E00F14C4204600E1BC69 /* libvpx.a in Frameworks */, 34F9E00C14C4203900E1BC69 /* OpenGLES.framework in Frameworks */, 34F9E00D14C4203900E1BC69 /* QuartzCore.framework in Frameworks */, - 22E5AFC9133A2E3F0044EA25 /* libssl.a in Frameworks */, - 22E5AFCA133A2E3F0044EA25 /* libcrypto.a in Frameworks */, 2294996912A53FEE00D6CF48 /* Foundation.framework in Frameworks */, 2294996A12A53FEE00D6CF48 /* UIKit.framework in Frameworks */, 2294996B12A53FEE00D6CF48 /* CoreGraphics.framework in Frameworks */, @@ -223,6 +241,14 @@ 2294997712A53FEE00D6CF48 /* CoreAudio.framework in Frameworks */, 2294997812A53FEE00D6CF48 /* AudioToolbox.framework in Frameworks */, 2294997912A53FEE00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9D171564B500A0D168 /* libavcodec.a in Frameworks */, + 154E1AA0171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA3171564C100A0D168 /* libilbc.a in Frameworks */, + 154E1AA6171564C600A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AA9171564C900A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AAD171564EA00A0D168 /* libssl.a in Frameworks */, + 154E1AB0171564EE00A0D168 /* libcrypto.a in Frameworks */, + 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -237,7 +263,6 @@ 34F9E02514C4211000E1BC69 /* libvpx.a in Frameworks */, 34F9E02314C4210100E1BC69 /* OpenGLES.framework in Frameworks */, 34F9E02214C420FA00E1BC69 /* QuartzCore.framework in Frameworks */, - 34F9E02114C420F000E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E01914C420DD00E1BC69 /* libeXosip2.a in Frameworks */, 34F9E01A14C420DD00E1BC69 /* libgsm.a in Frameworks */, 34F9E01B14C420DD00E1BC69 /* liblinphone.a in Frameworks */, @@ -246,8 +271,6 @@ 34F9E01E14C420DD00E1BC69 /* libosipparser2.a in Frameworks */, 34F9E01F14C420DD00E1BC69 /* libspeex.a in Frameworks */, 34F9E02014C420DD00E1BC69 /* libspeexdsp.a in Frameworks */, - 22E5AFCD133A2E5C0044EA25 /* libssl.a in Frameworks */, - 22E5AFCE133A2E5C0044EA25 /* libcrypto.a in Frameworks */, 229499A612A5417D00D6CF48 /* Foundation.framework in Frameworks */, 229499A712A5417D00D6CF48 /* UIKit.framework in Frameworks */, 229499A812A5417D00D6CF48 /* CoreGraphics.framework in Frameworks */, @@ -255,6 +278,14 @@ 229499B412A5417D00D6CF48 /* CoreAudio.framework in Frameworks */, 229499B512A5417D00D6CF48 /* AudioToolbox.framework in Frameworks */, 229499B612A5417D00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9E171564B500A0D168 /* libavcodec.a in Frameworks */, + 154E1AA1171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA4171564C100A0D168 /* libilbc.a in Frameworks */, + 154E1AA7171564C600A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AAA171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AAC171564EA00A0D168 /* libssl.a in Frameworks */, + 154E1AB1171564EE00A0D168 /* libcrypto.a in Frameworks */, + 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,7 +299,6 @@ 34F9E02814C4214500E1BC69 /* libeXosip2.a in Frameworks */, 34F9E02914C4214500E1BC69 /* libgsm.a in Frameworks */, 34F9E02A14C4214500E1BC69 /* liblinphone.a in Frameworks */, - 34F9E02B14C4214500E1BC69 /* libmediastreamer.a in Frameworks */, 34F9E02C14C4214500E1BC69 /* libortp.a in Frameworks */, 34F9E02D14C4214500E1BC69 /* libosip2.a in Frameworks */, 34F9E02E14C4214500E1BC69 /* libosipparser2.a in Frameworks */, @@ -287,6 +317,12 @@ 229499F912A5433F00D6CF48 /* CoreAudio.framework in Frameworks */, 229499FA12A5433F00D6CF48 /* AudioToolbox.framework in Frameworks */, 229499FB12A5433F00D6CF48 /* libresolv.dylib in Frameworks */, + 154E1A9F171564B600A0D168 /* libavcodec.a in Frameworks */, + 154E1AA2171564BA00A0D168 /* libavutil.a in Frameworks */, + 154E1AA5171564C200A0D168 /* libilbc.a in Frameworks */, + 154E1AA8171564C700A0D168 /* libmediastreamer_base.a in Frameworks */, + 154E1AAB171564CA00A0D168 /* libmediastreamer_voip.a in Frameworks */, + 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -318,27 +354,25 @@ 34F9E03314C4247A00E1BC69 /* AVFoundation.framework */, 34F9E00A14C4202100E1BC69 /* QuartzCore.framework */, 34F9E00814C41FE900E1BC69 /* CoreVideo.framework */, - 34F9E00414C41FCF00E1BC69 /* libsrtp.a */, - 34F9E00514C41FCF00E1BC69 /* libvpx.a */, 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */, + 154E1A991715644400A0D168 /* libavcodec.a */, + 154E1A971715642E00A0D168 /* libavutil.a */, + 22E5AFD0133A2E760044EA25 /* libcrypto.a */, 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */, 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */, 34F9DFED14C41EBA00E1BC69 /* libilbc.a */, 34F9DFEE14C41EBA00E1BC69 /* liblinphone.a */, - 34F9DFEF14C41EBA00E1BC69 /* libmediastreamer.a */, + 154E1A931715638900A0D168 /* libmediastreamer_base.a */, + 154E1A951715639A00A0D168 /* libmediastreamer_voip.a */, 34F9DFF014C41EBA00E1BC69 /* libortp.a */, 34F9DFF114C41EBA00E1BC69 /* libosip2.a */, 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */, 34F9DFF314C41EBA00E1BC69 /* libspeex.a */, 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */, + 34F9E00414C41FCF00E1BC69 /* libsrtp.a */, 22E5AFCF133A2E760044EA25 /* libssl.a */, - 22E5AFD0133A2E760044EA25 /* libcrypto.a */, - 22E5AFCB133A2E5C0044EA25 /* libssl.a */, - 22E5AFCC133A2E5C0044EA25 /* libcrypto.a */, - 22E5AFC7133A2E3F0044EA25 /* libssl.a */, - 22E5AFC8133A2E3F0044EA25 /* libcrypto.a */, - 22E5AFC3133A2E260044EA25 /* libssl.a */, - 22E5AFC4133A2E260044EA25 /* libcrypto.a */, + 154E1A9B1715645F00A0D168 /* libswscale.a */, + 34F9E00514C41FCF00E1BC69 /* libvpx.a */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, From 49baee893dda876ef09dd9fdc306ada4c1ad5bcb Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 10 Apr 2013 12:27:29 +0200 Subject: [PATCH 026/218] Install the tutorials source code in the sdk zip and use this installed source code in the tutorials xcode project. --- .../hello-world.xcodeproj/project.pbxproj | 32 +++++++++---------- submodules/build/builder-iphone-os.mk | 1 + 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj index 9e5c2c61c..0624e7e05 100755 --- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj +++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj @@ -36,6 +36,10 @@ 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 15FC168517157478003FDB31 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167E17157478003FDB31 /* buddy_status.c */; }; + 15FC168817157478003FDB31 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167F17157478003FDB31 /* chatroom.c */; }; + 15FC168A17157478003FDB31 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168017157478003FDB31 /* helloworld.c */; }; + 15FC168F17157478003FDB31 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168117157478003FDB31 /* registration.c */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; @@ -66,7 +70,6 @@ 22E5AFD1133A2E760044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; 22E5AFD2133A2E760044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; - 34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE514C418B600E1BC69 /* helloworld.c */; }; 34F9DFF514C41EBA00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; @@ -76,9 +79,6 @@ 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; 34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; }; 34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; }; - 34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE314C418B600E1BC69 /* buddy_status.c */; }; - 34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE414C418B600E1BC69 /* chatroom.c */; }; - 34F9E00114C41F5300E1BC69 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE614C418B600E1BC69 /* registration.c */; }; 34F9E00314C41FB400E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; }; 34F9E00614C41FCF00E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; }; 34F9E00714C41FCF00E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; }; @@ -139,6 +139,10 @@ 154E1A971715642E00A0D168 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; }; 154E1A991715644400A0D168 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; }; 154E1A9B1715645F00A0D168 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; + 15FC167E17157478003FDB31 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/buddy_status.c"; sourceTree = ""; }; + 15FC167F17157478003FDB31 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/chatroom.c"; sourceTree = ""; }; + 15FC168017157478003FDB31 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/helloworld.c"; sourceTree = ""; }; + 15FC168117157478003FDB31 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/registration.c"; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -154,10 +158,6 @@ 22E5AFD0133A2E760044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hello_world_Prefix.pch; sourceTree = ""; }; - 34F9DFE314C418B600E1BC69 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = ../../submodules/linphone/coreapi/help/buddy_status.c; sourceTree = ""; }; - 34F9DFE414C418B600E1BC69 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = ../../submodules/linphone/coreapi/help/chatroom.c; sourceTree = ""; }; - 34F9DFE514C418B600E1BC69 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = ../../submodules/linphone/coreapi/help/helloworld.c; sourceTree = ""; }; - 34F9DFE614C418B600E1BC69 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = ../../submodules/linphone/coreapi/help/registration.c; sourceTree = ""; }; 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; 34F9DFED14C41EBA00E1BC69 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; @@ -390,10 +390,10 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( - 34F9DFE314C418B600E1BC69 /* buddy_status.c */, - 34F9DFE414C418B600E1BC69 /* chatroom.c */, - 34F9DFE514C418B600E1BC69 /* helloworld.c */, - 34F9DFE614C418B600E1BC69 /* registration.c */, + 15FC167E17157478003FDB31 /* buddy_status.c */, + 15FC167F17157478003FDB31 /* chatroom.c */, + 15FC168017157478003FDB31 /* helloworld.c */, + 15FC168117157478003FDB31 /* registration.c */, 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */, ); name = "Other Sources"; @@ -551,7 +551,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */, + 15FC168A17157478003FDB31 /* helloworld.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -559,7 +559,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9E00114C41F5300E1BC69 /* registration.c in Sources */, + 15FC168F17157478003FDB31 /* registration.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -567,7 +567,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */, + 15FC168817157478003FDB31 /* chatroom.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -575,7 +575,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */, + 15FC168517157478003FDB31 /* buddy_status.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index d481f90a5..e7643586d 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -111,6 +111,7 @@ veryclean: veryclean-linphone veryclean-msbcg729 .NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install + mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/ clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean From 814545b13c24c2d401dd1b74dd4dba3422c714f7 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 10 Apr 2013 12:27:29 +0200 Subject: [PATCH 027/218] Install the tutorials source code in the sdk zip and use this installed source code in the tutorials xcode project. --- .../hello-world.xcodeproj/project.pbxproj | 32 +++++++++---------- submodules/build/builder-iphone-os.mk | 1 + 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj index 9e5c2c61c..0624e7e05 100755 --- a/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj +++ b/liblinphone-tutorials/hello-world/hello-world.xcodeproj/project.pbxproj @@ -36,6 +36,10 @@ 154E1AB21715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; 154E1AB31715661100A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; 154E1AB41715661200A0D168 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154E1A9B1715645F00A0D168 /* libswscale.a */; }; + 15FC168517157478003FDB31 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167E17157478003FDB31 /* buddy_status.c */; }; + 15FC168817157478003FDB31 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC167F17157478003FDB31 /* chatroom.c */; }; + 15FC168A17157478003FDB31 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168017157478003FDB31 /* helloworld.c */; }; + 15FC168F17157478003FDB31 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 15FC168117157478003FDB31 /* registration.c */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 2220D5D81278461C008F2C2E /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2220D5D71278461C008F2C2E /* CFNetwork.framework */; }; @@ -66,7 +70,6 @@ 22E5AFD1133A2E760044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFCF133A2E760044EA25 /* libssl.a */; }; 22E5AFD2133A2E760044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5AFD0133A2E760044EA25 /* libcrypto.a */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; - 34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE514C418B600E1BC69 /* helloworld.c */; }; 34F9DFF514C41EBA00E1BC69 /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */; }; 34F9DFF614C41EBA00E1BC69 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */; }; 34F9DFF714C41EBA00E1BC69 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFED14C41EBA00E1BC69 /* libilbc.a */; }; @@ -76,9 +79,6 @@ 34F9DFFC14C41EBA00E1BC69 /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF214C41EBA00E1BC69 /* libosipparser2.a */; }; 34F9DFFD14C41EBA00E1BC69 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF314C41EBA00E1BC69 /* libspeex.a */; }; 34F9DFFE14C41EBA00E1BC69 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9DFF414C41EBA00E1BC69 /* libspeexdsp.a */; }; - 34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE314C418B600E1BC69 /* buddy_status.c */; }; - 34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE414C418B600E1BC69 /* chatroom.c */; }; - 34F9E00114C41F5300E1BC69 /* registration.c in Sources */ = {isa = PBXBuildFile; fileRef = 34F9DFE614C418B600E1BC69 /* registration.c */; }; 34F9E00314C41FB400E1BC69 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00214C41FB400E1BC69 /* OpenGLES.framework */; }; 34F9E00614C41FCF00E1BC69 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00414C41FCF00E1BC69 /* libsrtp.a */; }; 34F9E00714C41FCF00E1BC69 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F9E00514C41FCF00E1BC69 /* libvpx.a */; }; @@ -139,6 +139,10 @@ 154E1A971715642E00A0D168 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; }; 154E1A991715644400A0D168 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; }; 154E1A9B1715645F00A0D168 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; }; + 15FC167E17157478003FDB31 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/buddy_status.c"; sourceTree = ""; }; + 15FC167F17157478003FDB31 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/chatroom.c"; sourceTree = ""; }; + 15FC168017157478003FDB31 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/helloworld.c"; sourceTree = ""; }; + 15FC168117157478003FDB31 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = "../../liblinphone-sdk/apple-darwin/share/linphone/tutorials/registration.c"; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* hello-world.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "hello-world.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -154,10 +158,6 @@ 22E5AFD0133A2E760044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hello_world_Prefix.pch; sourceTree = ""; }; - 34F9DFE314C418B600E1BC69 /* buddy_status.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buddy_status.c; path = ../../submodules/linphone/coreapi/help/buddy_status.c; sourceTree = ""; }; - 34F9DFE414C418B600E1BC69 /* chatroom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = chatroom.c; path = ../../submodules/linphone/coreapi/help/chatroom.c; sourceTree = ""; }; - 34F9DFE514C418B600E1BC69 /* helloworld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = helloworld.c; path = ../../submodules/linphone/coreapi/help/helloworld.c; sourceTree = ""; }; - 34F9DFE614C418B600E1BC69 /* registration.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = registration.c; path = ../../submodules/linphone/coreapi/help/registration.c; sourceTree = ""; }; 34F9DFEB14C41EBA00E1BC69 /* libeXosip2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libeXosip2.a; path = "../../liblinphone-sdk/apple-darwin/lib/libeXosip2.a"; sourceTree = ""; }; 34F9DFEC14C41EBA00E1BC69 /* libgsm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgsm.a; path = "../../liblinphone-sdk/apple-darwin/lib/libgsm.a"; sourceTree = ""; }; 34F9DFED14C41EBA00E1BC69 /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "../../liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; @@ -390,10 +390,10 @@ 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; children = ( - 34F9DFE314C418B600E1BC69 /* buddy_status.c */, - 34F9DFE414C418B600E1BC69 /* chatroom.c */, - 34F9DFE514C418B600E1BC69 /* helloworld.c */, - 34F9DFE614C418B600E1BC69 /* registration.c */, + 15FC167E17157478003FDB31 /* buddy_status.c */, + 15FC167F17157478003FDB31 /* chatroom.c */, + 15FC168017157478003FDB31 /* helloworld.c */, + 15FC168117157478003FDB31 /* registration.c */, 32CA4F630368D1EE00C91783 /* hello_world_Prefix.pch */, ); name = "Other Sources"; @@ -551,7 +551,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9DFE914C418B600E1BC69 /* helloworld.c in Sources */, + 15FC168A17157478003FDB31 /* helloworld.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -559,7 +559,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9E00114C41F5300E1BC69 /* registration.c in Sources */, + 15FC168F17157478003FDB31 /* registration.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -567,7 +567,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9E00014C41F4E00E1BC69 /* chatroom.c in Sources */, + 15FC168817157478003FDB31 /* chatroom.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -575,7 +575,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 34F9DFFF14C41F4900E1BC69 /* buddy_status.c in Sources */, + 15FC168517157478003FDB31 /* buddy_status.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index d481f90a5..e7643586d 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -111,6 +111,7 @@ veryclean: veryclean-linphone veryclean-msbcg729 .NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install + mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/ clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 cd $(LINPHONE_BUILD_DIR) && make clean From bc9569c4b60f613ba8c24968deea36c2075bdf4c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 11 Apr 2013 14:36:12 +0200 Subject: [PATCH 028/218] Set the time of received chat messages from the content of this message instead of the current time. --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 5ee4f8e62..f695d3329 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -578,7 +578,7 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo [chat setMessage:[NSString stringWithUTF8String:linphone_chat_message_get_text(msg)]]; } [chat setDirection:[NSNumber numberWithInt:1]]; - [chat setTime:[NSDate date]]; + [chat setTime:[NSDate dateWithTimeIntervalSince1970:linphone_chat_message_get_time(msg)]]; [chat setRead:[NSNumber numberWithInt:0]]; [chat create]; From 8e8f49949f07ba71f7d42319de223f82ceb0cadd Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 11 Apr 2013 14:36:12 +0200 Subject: [PATCH 029/218] Set the time of received chat messages from the content of this message instead of the current time. --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 5ee4f8e62..f695d3329 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -578,7 +578,7 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo [chat setMessage:[NSString stringWithUTF8String:linphone_chat_message_get_text(msg)]]; } [chat setDirection:[NSNumber numberWithInt:1]]; - [chat setTime:[NSDate date]]; + [chat setTime:[NSDate dateWithTimeIntervalSince1970:linphone_chat_message_get_time(msg)]]; [chat setRead:[NSNumber numberWithInt:0]]; [chat create]; From c17dabfc4fab60090f762bb7f9874bb18b28c190 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 12 Apr 2013 10:57:28 +0200 Subject: [PATCH 030/218] Update linphone submodule for fix of chat messages time. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index d630e0a99..5ddf9069f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d630e0a99decbed3e9a5437b680801dd236beb40 +Subproject commit 5ddf9069f0c5f487b65ef5b64dbd19a56066b350 From 3d4296dce23edf2adb6d4d494bc7c0db40cc5bf2 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 12 Apr 2013 10:57:28 +0200 Subject: [PATCH 031/218] Update linphone submodule for fix of chat messages time. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index d630e0a99..5ddf9069f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d630e0a99decbed3e9a5437b680801dd236beb40 +Subproject commit 5ddf9069f0c5f487b65ef5b64dbd19a56066b350 From 46bfe47ed5f58f1fffe9813bc02c940786580850 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 17 Apr 2013 15:52:50 +0200 Subject: [PATCH 032/218] update liblinphone for publish fix. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 5ddf9069f..bf492b427 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5ddf9069f0c5f487b65ef5b64dbd19a56066b350 +Subproject commit bf492b4278d1c68b2da55c65da173a33aec32ea1 From e5e3b4c02ee95d5dcd8a195bd985f63135243d4f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 17 Apr 2013 15:52:50 +0200 Subject: [PATCH 033/218] update liblinphone for publish fix. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 5ddf9069f..bf492b427 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5ddf9069f0c5f487b65ef5b64dbd19a56066b350 +Subproject commit bf492b4278d1c68b2da55c65da173a33aec32ea1 From 9c7ae1e7ccd413181079113ee253c4c765a6b79c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 19 Apr 2013 16:53:37 +0200 Subject: [PATCH 034/218] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index bf492b427..8b35826dd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bf492b4278d1c68b2da55c65da173a33aec32ea1 +Subproject commit 8b35826ddd1bdbdd88c61c3b76e6f4b1d3b43a39 From ad1841751211bee730d2866e597c72a0ccd7fed6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 19 Apr 2013 16:53:37 +0200 Subject: [PATCH 035/218] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index bf492b427..8b35826dd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bf492b4278d1c68b2da55c65da173a33aec32ea1 +Subproject commit 8b35826ddd1bdbdd88c61c3b76e6f4b1d3b43a39 From a1a91b72af0bec463ea3a399079bf820e045ff78 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Sun, 21 Apr 2013 22:11:13 +0200 Subject: [PATCH 036/218] Add aac-eld in the list of available codecs - two configurations (narrow band and wide band) --- Classes/LinphoneManager.m | 2 ++ Settings/InAppSettings.bundle/Audio.plist | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index f695d3329..92976227d 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -131,6 +131,8 @@ struct codec_name_pref_table codec_pref_table[]={ { "mp4v-es", 90000, @"mp4v-es_preference"}, { "h264", 90000, @"h264_preference"}, { "vp8", 90000, @"vp8_preference"}, + { "mpeg4-generic", 44100, @"aaceld_44k_preference"}, + { "mpeg4-generic", 22050, @"aaceld_22k_preference"}, { NULL,0,Nil } }; diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index 422f9fc29..4331a88d4 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -120,6 +120,26 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + aaceld_44k_preference + Title + AAC-ELD 44kHz + Type + PSToggleSwitchSpecifier + + + DefaultValue + + Key + aaceld_22k_preference + Title + AAC-ELD 22kHz + Type + PSToggleSwitchSpecifier + Key audio_advanced_group From 5206fb1fb191a1defbab23dd58e9d6288698ae48 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Sun, 21 Apr 2013 22:11:13 +0200 Subject: [PATCH 037/218] Add aac-eld in the list of available codecs - two configurations (narrow band and wide band) --- Classes/LinphoneManager.m | 2 ++ Settings/InAppSettings.bundle/Audio.plist | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index f695d3329..92976227d 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -131,6 +131,8 @@ struct codec_name_pref_table codec_pref_table[]={ { "mp4v-es", 90000, @"mp4v-es_preference"}, { "h264", 90000, @"h264_preference"}, { "vp8", 90000, @"vp8_preference"}, + { "mpeg4-generic", 44100, @"aaceld_44k_preference"}, + { "mpeg4-generic", 22050, @"aaceld_22k_preference"}, { NULL,0,Nil } }; diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index 422f9fc29..4331a88d4 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -120,6 +120,26 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + aaceld_44k_preference + Title + AAC-ELD 44kHz + Type + PSToggleSwitchSpecifier + + + DefaultValue + + Key + aaceld_22k_preference + Title + AAC-ELD 22kHz + Type + PSToggleSwitchSpecifier + Key audio_advanced_group From 89b5c96339530345da5f10b93473d9b56a04d703 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Sun, 21 Apr 2013 22:14:34 +0200 Subject: [PATCH 038/218] Add aac-eld.c to the xcode project --- submodules/liblinphone.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index b16778286..590a8ac6e 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 0406A7661721FF79009FD24F /* aac-eld.c in Sources */ = {isa = PBXBuildFile; fileRef = 0406A7651721FF79009FD24F /* aac-eld.c */; }; 220ED19A13A8F87700AC21E0 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19713A8F87700AC21E0 /* libspeexdsp.a */; }; 220ED19B13A8F87700AC21E0 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19813A8F87700AC21E0 /* libspeex.a */; }; 220ED19C13A8F87700AC21E0 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19913A8F87700AC21E0 /* libortp.a */; }; @@ -421,6 +422,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0406A7651721FF79009FD24F /* aac-eld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "aac-eld.c"; sourceTree = ""; }; 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; 220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 220ED19813A8F87700AC21E0 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; @@ -1048,6 +1050,7 @@ 223CA7EF16D9268D00EF1BEC /* audiofilters */ = { isa = PBXGroup; children = ( + 0406A7651721FF79009FD24F /* aac-eld.c */, 22D07CE416F3BFCB009F2C9E /* speexec.c */, 223CA7F016D9268D00EF1BEC /* alaw.c */, 223CA7F216D9268D00EF1BEC /* aqsnd.c */, @@ -1747,6 +1750,7 @@ 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */, 221DCB6C153584410025E54D /* yuv2rgb.fs in Sources */, 221DCB6E153584410025E54D /* yuv2rgb.vs in Sources */, + 0406A7661721FF79009FD24F /* aac-eld.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 10a1c722f087ba72b4b609864d00d4960cbfed8b Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Sun, 21 Apr 2013 22:14:34 +0200 Subject: [PATCH 039/218] Add aac-eld.c to the xcode project --- submodules/liblinphone.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index a85ff2e50..dc4fcbf65 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 0406A7661721FF79009FD24F /* aac-eld.c in Sources */ = {isa = PBXBuildFile; fileRef = 0406A7651721FF79009FD24F /* aac-eld.c */; }; 220ED19A13A8F87700AC21E0 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19713A8F87700AC21E0 /* libspeexdsp.a */; }; 220ED19B13A8F87700AC21E0 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19813A8F87700AC21E0 /* libspeex.a */; }; 220ED19C13A8F87700AC21E0 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19913A8F87700AC21E0 /* libortp.a */; }; @@ -421,6 +422,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0406A7651721FF79009FD24F /* aac-eld.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "aac-eld.c"; sourceTree = ""; }; 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; 220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 220ED19813A8F87700AC21E0 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; @@ -1048,6 +1050,7 @@ 223CA7EF16D9268D00EF1BEC /* audiofilters */ = { isa = PBXGroup; children = ( + 0406A7651721FF79009FD24F /* aac-eld.c */, 22D07CE416F3BFCB009F2C9E /* speexec.c */, 223CA7F016D9268D00EF1BEC /* alaw.c */, 223CA7F216D9268D00EF1BEC /* aqsnd.c */, @@ -1747,6 +1750,7 @@ 221DCB57152A07050025E54D /* ec-calibrator.c in Sources */, 221DCB6C153584410025E54D /* yuv2rgb.fs in Sources */, 221DCB6E153584410025E54D /* yuv2rgb.vs in Sources */, + 0406A7661721FF79009FD24F /* aac-eld.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 0e77d6c31d99890144ee2e16bd7447f3d611eff7 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Mon, 22 Apr 2013 11:13:45 +0200 Subject: [PATCH 040/218] Add linphone with aac-eld support --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 8b35826dd..87a6e07ad 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8b35826ddd1bdbdd88c61c3b76e6f4b1d3b43a39 +Subproject commit 87a6e07ad9eb8ceddd7d451f438d140e92f82e3d From 1edbbc56a112ca2771d373418cdc6666be91f995 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Mon, 22 Apr 2013 11:13:45 +0200 Subject: [PATCH 041/218] Add linphone with aac-eld support --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 8b35826dd..87a6e07ad 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8b35826ddd1bdbdd88c61c3b76e6f4b1d3b43a39 +Subproject commit 87a6e07ad9eb8ceddd7d451f438d140e92f82e3d From 3c479c7a1e34e7f54e6d8734a0f32e4cabc1bde5 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Mon, 22 Apr 2013 11:29:15 +0200 Subject: [PATCH 042/218] Typo in oRTP aac-eld payload type name --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 87a6e07ad..12540ce01 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 87a6e07ad9eb8ceddd7d451f438d140e92f82e3d +Subproject commit 12540ce01c9f024266f6f465c972f72a0c2594bb From 336d090a90b23e4f8dc74c10c7f6b64e5ff68591 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Mon, 22 Apr 2013 11:29:15 +0200 Subject: [PATCH 043/218] Typo in oRTP aac-eld payload type name --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 87a6e07ad..12540ce01 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 87a6e07ad9eb8ceddd7d451f438d140e92f82e3d +Subproject commit 12540ce01c9f024266f6f465c972f72a0c2594bb From 4371c71753614acb30900fd61a26ee56cc01f7f9 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 22 Apr 2013 10:48:36 +0200 Subject: [PATCH 044/218] fix rotation issue introduced by fixe of mode display_filter_auto_rotate --- Classes/InCallViewController.m | 19 +------------------ Resources/linphonerc | 1 - Resources/linphonerc-factory | 2 ++ Resources/linphonerc-factory~ipad | 3 +++ Resources/linphonerc~ipad | 4 ++-- 5 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index fe54143e8..e23e914ed 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -202,24 +202,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration]; - CGRect frame = [videoPreview frame]; - switch (toInterfaceOrientation) { - case UIInterfaceOrientationPortrait: - [videoPreview setTransform: CGAffineTransformMakeRotation(0)]; - break; - case UIInterfaceOrientationPortraitUpsideDown: - [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)]; - break; - case UIInterfaceOrientationLandscapeLeft: - [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)]; - break; - case UIInterfaceOrientationLandscapeRight: - [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)]; - break; - default: - break; - } - [videoPreview setFrame:frame]; +// in mode display_filter_auto_rotate=0, no need to rotate the preview } diff --git a/Resources/linphonerc b/Resources/linphonerc index 040abc310..560a9780a 100644 --- a/Resources/linphonerc +++ b/Resources/linphonerc @@ -14,7 +14,6 @@ capture=1 show_local=0 enabled=1 size=qvga -display_filter_auto_rotate=1 automatically_initiate=0 automatically_accept=0 diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index e16499cd6..fb48ebbdf 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -45,3 +45,5 @@ sharing_server=https://www.linphone.org:444/upload.php ice=1 stun=stun.linphone.org +[video] +display_filter_auto_rotate=0 diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index e9e636be0..80aa4e891 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -44,3 +44,6 @@ transport=tls sharing_server=https://www.linphone.org:444/upload.php ice=1 stun=stun.linphone.org + +[video] +display_filter_auto_rotate=0 diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index 9458f6e74..4efe5a33e 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -14,7 +14,6 @@ capture=1 show_local=1 enabled=1 size=vga -display_filter_auto_rotate=1 automatically_initiate=0 automatically_accept=0 @@ -27,4 +26,5 @@ animations_preference=1 edge_opt_preference=0 [default_values] -reg_expires=600 \ No newline at end of file +reg_expires=600 + From ed0ad82970bf22a67fd191afcd836640f480c85a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 22 Apr 2013 10:48:36 +0200 Subject: [PATCH 045/218] fix rotation issue introduced by fixe of mode display_filter_auto_rotate --- Classes/InCallViewController.m | 19 +------------------ Resources/linphonerc | 1 - Resources/linphonerc-factory | 2 ++ Resources/linphonerc-factory~ipad | 3 +++ Resources/linphonerc~ipad | 4 ++-- 5 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index fe54143e8..e23e914ed 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -202,24 +202,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration]; - CGRect frame = [videoPreview frame]; - switch (toInterfaceOrientation) { - case UIInterfaceOrientationPortrait: - [videoPreview setTransform: CGAffineTransformMakeRotation(0)]; - break; - case UIInterfaceOrientationPortraitUpsideDown: - [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)]; - break; - case UIInterfaceOrientationLandscapeLeft: - [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)]; - break; - case UIInterfaceOrientationLandscapeRight: - [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)]; - break; - default: - break; - } - [videoPreview setFrame:frame]; +// in mode display_filter_auto_rotate=0, no need to rotate the preview } diff --git a/Resources/linphonerc b/Resources/linphonerc index 040abc310..560a9780a 100644 --- a/Resources/linphonerc +++ b/Resources/linphonerc @@ -14,7 +14,6 @@ capture=1 show_local=0 enabled=1 size=qvga -display_filter_auto_rotate=1 automatically_initiate=0 automatically_accept=0 diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index e16499cd6..fb48ebbdf 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -45,3 +45,5 @@ sharing_server=https://www.linphone.org:444/upload.php ice=1 stun=stun.linphone.org +[video] +display_filter_auto_rotate=0 diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index e9e636be0..80aa4e891 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -44,3 +44,6 @@ transport=tls sharing_server=https://www.linphone.org:444/upload.php ice=1 stun=stun.linphone.org + +[video] +display_filter_auto_rotate=0 diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index 9458f6e74..4efe5a33e 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -14,7 +14,6 @@ capture=1 show_local=1 enabled=1 size=vga -display_filter_auto_rotate=1 automatically_initiate=0 automatically_accept=0 @@ -27,4 +26,5 @@ animations_preference=1 edge_opt_preference=0 [default_values] -reg_expires=600 \ No newline at end of file +reg_expires=600 + From 419d004846b5c3d72f63f7e8ab9692cf9c5d429b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 23 Apr 2013 12:12:01 +0200 Subject: [PATCH 046/218] update liblinphone for beep bug. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 12540ce01..6fcf76e40 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 12540ce01c9f024266f6f465c972f72a0c2594bb +Subproject commit 6fcf76e405a695f86a446f430903682f42155f43 From acbc41d7dc4ef5a00bcadf2fb8cbe9415df1b398 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 23 Apr 2013 12:12:01 +0200 Subject: [PATCH 047/218] update liblinphone for beep bug. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 12540ce01..6fcf76e40 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 12540ce01c9f024266f6f465c972f72a0c2594bb +Subproject commit 6fcf76e405a695f86a446f430903682f42155f43 From 0e6c66b027b5337dbb4f82efe0f31247becc433c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 25 Apr 2013 10:43:17 +0200 Subject: [PATCH 048/218] add special case to compute aac network birate --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 6fcf76e40..bf3e43611 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6fcf76e405a695f86a446f430903682f42155f43 +Subproject commit bf3e43611778efc483999cacc470aed67fc6b83d From 731821bd24df26eba01f509c1d78e0d5d897268c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 25 Apr 2013 10:43:17 +0200 Subject: [PATCH 049/218] add special case to compute aac network birate --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 6fcf76e40..bf3e43611 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6fcf76e405a695f86a446f430903682f42155f43 +Subproject commit bf3e43611778efc483999cacc470aed67fc6b83d From 4e5aaaafc3e5ed9283a3f72190a002692e42ad17 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Thu, 25 Apr 2013 17:03:21 +0200 Subject: [PATCH 050/218] Aac-eld add missing headers according to RFC3640 3.3.6 --- submodules/Default-568h@2x.png | Bin 0 -> 18594 bytes submodules/linphone | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 submodules/Default-568h@2x.png diff --git a/submodules/Default-568h@2x.png b/submodules/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/submodules/linphone b/submodules/linphone index bf3e43611..5f109bfb5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bf3e43611778efc483999cacc470aed67fc6b83d +Subproject commit 5f109bfb55224b69dd598d95c2c0dd47fa87b960 From ec30ae5a67860c9b73877f827042a226e04a8a03 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Thu, 25 Apr 2013 17:03:21 +0200 Subject: [PATCH 051/218] Aac-eld add missing headers according to RFC3640 3.3.6 --- submodules/Default-568h@2x.png | Bin 0 -> 18594 bytes submodules/linphone | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 submodules/Default-568h@2x.png diff --git a/submodules/Default-568h@2x.png b/submodules/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/submodules/linphone b/submodules/linphone index bf3e43611..5f109bfb5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bf3e43611778efc483999cacc470aed67fc6b83d +Subproject commit 5f109bfb55224b69dd598d95c2c0dd47fa87b960 From cb922e7c1e0eb41e4a1f7e44e7f6b06dfbada987 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Fri, 26 Apr 2013 01:13:55 +0200 Subject: [PATCH 052/218] aac-eld support multiframe per packet decoding --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 5f109bfb5..a0a70a59d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5f109bfb55224b69dd598d95c2c0dd47fa87b960 +Subproject commit a0a70a59dfedfe22ed3fae3df88a6363bd8596e0 From 6d3ae54e75e8be2ab07e559067fb0e759639fb40 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Fri, 26 Apr 2013 01:13:55 +0200 Subject: [PATCH 053/218] aac-eld support multiframe per packet decoding --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 5f109bfb5..a0a70a59d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5f109bfb55224b69dd598d95c2c0dd47fa87b960 +Subproject commit a0a70a59dfedfe22ed3fae3df88a6363bd8596e0 From bc0df8dc9d9f3b3e169faff153397ae13061d0f9 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 3 May 2013 14:39:04 +0200 Subject: [PATCH 054/218] update linphone submodule for Refer bugfix --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a0a70a59d..4da039cd5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a0a70a59dfedfe22ed3fae3df88a6363bd8596e0 +Subproject commit 4da039cd52a3258f6ce0c09a9a53da1026beadfb From 4c944f5538f35d0f1f817d9d0bab7096ab15cc8b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 3 May 2013 14:39:04 +0200 Subject: [PATCH 055/218] update linphone submodule for Refer bugfix --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a0a70a59d..4da039cd5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a0a70a59dfedfe22ed3fae3df88a6363bd8596e0 +Subproject commit 4da039cd52a3258f6ce0c09a9a53da1026beadfb From 867e418459642d92c7bdf6e2167f9832159da1b8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 6 May 2013 22:11:11 +0200 Subject: [PATCH 056/218] update linphone submodule for conferencing bugfixes. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 4da039cd5..ca42ee87d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4da039cd52a3258f6ce0c09a9a53da1026beadfb +Subproject commit ca42ee87ded3fa4cbf44757f13e2f5537afbb498 From 979a0b0469872f4485cee259aed4866ffbbc6e5d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 6 May 2013 22:11:11 +0200 Subject: [PATCH 057/218] update linphone submodule for conferencing bugfixes. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 4da039cd5..ca42ee87d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4da039cd52a3258f6ce0c09a9a53da1026beadfb +Subproject commit ca42ee87ded3fa4cbf44757f13e2f5537afbb498 From 479031cbc863eead8bbda462e8a76a70576fc99d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 9 May 2013 18:08:47 +0200 Subject: [PATCH 058/218] add polarssl into the build and update srtp to fix duplicated symbols --- linphone.xcodeproj/project.pbxproj | 4 ++++ submodules/build/Makefile | 20 +++++++++++++------- submodules/build/builders.d/belle-sip.mk | 2 +- submodules/build/builders.d/polarssl.mk | 6 +++--- submodules/externals/polarssl | 2 +- submodules/externals/srtp | 2 +- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 01f92038b..ad22b25d3 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -190,6 +190,7 @@ 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */; }; + 57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57B0E35F173C010400A476B8 /* libpolarssl.a */; }; 57F005C415EE2CCF00914747 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C315EE2CCF00914747 /* linphonerc */; }; 57F005C515EE2CCF00914747 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C315EE2CCF00914747 /* linphonerc */; }; 57F005C815EE2D9200914747 /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C615EE2D9200914747 /* linphonerc-factory */; }; @@ -1707,6 +1708,7 @@ 344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; }; 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; }; 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_72.png; path = Resources/linphone_icon_72.png; sourceTree = ""; }; + 57B0E35F173C010400A476B8 /* libpolarssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpolarssl.a; path = "liblinphone-sdk/apple-darwin/lib/libpolarssl.a"; sourceTree = ""; }; 57F005C315EE2CCF00914747 /* linphonerc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = linphonerc; path = Resources/linphonerc; sourceTree = ""; }; 57F005C615EE2D9200914747 /* linphonerc-factory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc-factory"; path = "Resources/linphonerc-factory"; sourceTree = ""; }; 57F005C715EE2D9200914747 /* linphonerc-factory~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc-factory~ipad"; path = "Resources/linphonerc-factory~ipad"; sourceTree = ""; }; @@ -2412,6 +2414,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */, 223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */, 223CA7E716D9255800EF1BEC /* libbellesip.a in Frameworks */, D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */, @@ -2966,6 +2969,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 57B0E35F173C010400A476B8 /* libpolarssl.a */, 223CA7E416D9255800EF1BEC /* libantlr3c.a */, 223CA7E516D9255800EF1BEC /* libbellesip.a */, 2258633C11410BAC00C5A737 /* README */, diff --git a/submodules/build/Makefile b/submodules/build/Makefile index bb1fd7a6c..8e528f6b3 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -35,18 +35,24 @@ endif ifeq ($(enable_gpl_third_parties),yes) warning: @echo - @echo "*****************************************************************" - @echo "*****************************************************************" - @echo "*****CAUTION, this liblinphone SDK is built using GPL code ******" - @echo "*****To disable gpl code, use make enable_gpl_third_parties=no***" - @echo "*****************************************************************" - @echo "*****************************************************************" + @echo "***************************************************************************" + @echo "***************************************************************************" + @echo "*****CAUTION, this liblinphone SDK is built using 3rd party GPL code ******" + @echo "*****Even if you acquired a proprietary license from Belledonne ******" + @echo "*****Communications, this SDK is GPL and GPL only. ******" + @echo "*****To disable 3rd party gpl code, please use: ******" + @echo "*****$ make enable_gpl_third_parties=no ******" + @echo "***************************************************************************" + @echo "***************************************************************************" else warning: @echo @echo "*****************************************************************" @echo "*****************************************************************" - @echo "*****linphone SDK without GPL code ******" + @echo "*****Linphone SDK without 3rd party GPL software ******" + @echo "*****If you acquired a proprietary license from Belledonne ******" + @echo "*****Communications, this SDK can be used to create ******" + @echo "*****a proprietary linphone-based application. ******" @echo "*****************************************************************" @echo "*****************************************************************" endif diff --git a/submodules/build/builders.d/belle-sip.mk b/submodules/build/builders.d/belle-sip.mk index 8628c5c55..8e3614ef3 100644 --- a/submodules/build/builders.d/belle-sip.mk +++ b/submodules/build/builders.d/belle-sip.mk @@ -27,7 +27,7 @@ $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(belle-sip_d mkdir -p $(BUILDER_BUILD_DIR)/$(belle-sip_dir) cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/ \ && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} --enable-tls + $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure --prefix=$(prefix) --host=$(host) ${library_mode} --enable-tls --with-polarssl=$(prefix) build-belle-sip: $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install diff --git a/submodules/build/builders.d/polarssl.mk b/submodules/build/builders.d/polarssl.mk index f1ac89ae1..3dd89da02 100644 --- a/submodules/build/builders.d/polarssl.mk +++ b/submodules/build/builders.d/polarssl.mk @@ -1,13 +1,13 @@ polarssl_dir?=externals/polarssl -$(BUILDER_BUILD_DIR)/$(polarssl_dir)/Makefile: $(BUILDER_SRC_DIR)/$(polarssl_dir)/Makefile +update-tree: $(BUILDER_SRC_DIR)/$(polarssl_dir)/Makefile mkdir -p $(BUILDER_BUILD_DIR)/$(polarssl_dir) cd $(BUILDER_BUILD_DIR)/$(polarssl_dir)/ && \ rsync -rvLpgoc --exclude ".git" $(BUILDER_SRC_DIR)/$(polarssl_dir)/ . -build-polarssl: $(BUILDER_BUILD_DIR)/$(polarssl_dir)/Makefile +build-polarssl: update-tree host_alias=$(host) && . /$(BUILDER_SRC_DIR)/build/$(config_site) && \ - cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make lib && make install DESTDIR=$(prefix) + cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make CC="$$CC" AR="$$AR" CPPFLAGS="$$CPPFLAGS" lib && make install DESTDIR=$(prefix) clean-polarssl: -cd $(BUILDER_BUILD_DIR)/$(polarssl_dir) && make clean diff --git a/submodules/externals/polarssl b/submodules/externals/polarssl index b772d5593..d2bba11d1 160000 --- a/submodules/externals/polarssl +++ b/submodules/externals/polarssl @@ -1 +1 @@ -Subproject commit b772d5593c025e6fb945e21ee683b50ba327e211 +Subproject commit d2bba11d1c5047737822adbaeae381b145c7ccba diff --git a/submodules/externals/srtp b/submodules/externals/srtp index 152b63cba..14027d37c 160000 --- a/submodules/externals/srtp +++ b/submodules/externals/srtp @@ -1 +1 @@ -Subproject commit 152b63cba01823c391cf03600dac35fa101c8894 +Subproject commit 14027d37c7574b27bf22e57f508137b4e86b6466 From fb4301fea3d8bee70652144d9148c39b90337f75 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Thu, 9 May 2013 22:49:25 +0200 Subject: [PATCH 059/218] AAC-ELD: fix SDP/ftmp content according to new recommendation from Fraunhofer --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ca42ee87d..12a3d7951 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ca42ee87ded3fa4cbf44757f13e2f5537afbb498 +Subproject commit 12a3d795131ab1b367ae000f8b70f9b8af684df6 From 3ce69628166929cd3835254532d8831050de83d1 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Thu, 9 May 2013 22:49:25 +0200 Subject: [PATCH 060/218] AAC-ELD: fix SDP/ftmp content according to new recommendation from Fraunhofer --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ca42ee87d..12a3d7951 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ca42ee87ded3fa4cbf44757f13e2f5537afbb498 +Subproject commit 12a3d795131ab1b367ae000f8b70f9b8af684df6 From 874e15fb2320a0a4dc687ca12d92dee2a9313ed6 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 10 May 2013 11:06:30 +0200 Subject: [PATCH 061/218] change the antlr git url to public one --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index e614fb27a..b95960230 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,7 +54,7 @@ url = gitosis@git.linphone.org:belle-sip [submodule "submodules/externals/antlr3"] path = submodules/externals/antlr3 - url = gitosis@git.linphone.org:antlr3 + url = git://git.linphone.org/antlr3.git [submodule "submodules/externals/polarssl"] path = submodules/externals/polarssl url = git://git.linphone.org/polarssl.git From 144291874b2cded264a62e5d8cf70b06f0ac9a05 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 10 May 2013 16:26:36 +0200 Subject: [PATCH 062/218] update belle sip and linphone for bugfixes --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index db7440f29..449f47f2b 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit db7440f29b1f632df236170f9b796f903df12e3b +Subproject commit 449f47f2b4fc0e11d5da1040cd001b101365a178 diff --git a/submodules/linphone b/submodules/linphone index 25f44cc7c..86aa12e97 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 25f44cc7c90bcde78f97d51f489e91f5094827f1 +Subproject commit 86aa12e97ee7b8b9e97ef0b1edbf9660b87f89e7 From 46c06f2259aa22519826a966fadadf775e55bdd3 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 10 May 2013 17:46:11 +0200 Subject: [PATCH 063/218] add antlr3 to README --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 5271e31cf..c2a2e4502 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ Make sure that /opt/local/bin (macport tools) arrives first in your PATH env var Once xcode and macports are installed, open a terminal and install the required build-time tools with: - $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen ImageMagick optipng + $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen ImageMagick optipng antlr3 Install gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : From d66540bfe321430116df2ec91800566fd1c55acd Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 14 May 2013 10:48:39 +0200 Subject: [PATCH 064/218] update linphone and belle-sip for refresher bugfix --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 449f47f2b..7b29b5ca4 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 449f47f2b4fc0e11d5da1040cd001b101365a178 +Subproject commit 7b29b5ca45ad8263b9fd99c6e7dee8cf516bccee diff --git a/submodules/linphone b/submodules/linphone index 86aa12e97..d25af961a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 86aa12e97ee7b8b9e97ef0b1edbf9660b87f89e7 +Subproject commit d25af961abd980e79e57f0b48140e16ad0379f44 From a6dbe8c43716096d185c8b049bd195c154128bb7 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 15 May 2013 11:03:54 +0200 Subject: [PATCH 065/218] update submodules for custom header bugfixes --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 7b29b5ca4..ef33d5b71 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7b29b5ca45ad8263b9fd99c6e7dee8cf516bccee +Subproject commit ef33d5b7158c1b8391a67f9fd01759ae00cc612b diff --git a/submodules/linphone b/submodules/linphone index d25af961a..aae5ae888 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d25af961abd980e79e57f0b48140e16ad0379f44 +Subproject commit aae5ae888c24542bda99ecdef882f0fa0f607670 From f251baac4fcda4d076122ad3038e1f6686691648 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 20 May 2013 15:44:46 +0200 Subject: [PATCH 066/218] update submodules for: - incorrect replaces header - missing refered-by - new LinphoneInfoMessage API --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index ef33d5b71..a74f51569 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit ef33d5b7158c1b8391a67f9fd01759ae00cc612b +Subproject commit a74f515693afc8d1ec47486d6caa85822e2128c5 diff --git a/submodules/linphone b/submodules/linphone index aae5ae888..64d34b30a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit aae5ae888c24542bda99ecdef882f0fa0f607670 +Subproject commit 64d34b30ad24a42b584b17611138b4a658c549ec From 8e6dd30f682b2f2a562b422cdf258f7161a556c7 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 20 May 2013 19:03:53 +0200 Subject: [PATCH 067/218] update linphone submodule for presence bugfix --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 64d34b30a..bfe2437bb 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 64d34b30ad24a42b584b17611138b4a658c549ec +Subproject commit bfe2437bbe7f191d616e9e2f0b3d254cfbff2476 From bd5fccb963382580ae1ad8efebc36ffe275aa2c7 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 22 May 2013 16:13:35 +0200 Subject: [PATCH 068/218] update libvpx to v1.2.0 --- Classes/ContactDetailsTableViewController.m | 2 +- .../LinphoneUI/UICompositeViewController.m | 12 ++-- linphone.xcodeproj/project.pbxproj | 32 ++++++++-- submodules/build/builders.d/libvpx.mk | 7 ++- submodules/build/builders.d/libvpx.patch | 59 ++----------------- submodules/build/iphone-config.site | 8 +-- submodules/externals/libvpx | 2 +- 7 files changed, 51 insertions(+), 71 deletions(-) diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 8f49fd838..7fe664112 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -537,7 +537,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C NSMutableArray *sectionDict = [self getSectionData:[indexPath section]]; Entry *entry = [sectionDict objectAtIndex:[indexPath row]]; if (![self isEditing]) { - NSString *dest; + NSString *dest=NULL;; if(contactSections[[indexPath section]] == ContactSections_Number) { ABMultiValueRef lMap = ABRecordCopyValue(contact, kABPersonPhoneProperty); int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index aa7237646..7a1913db0 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -103,7 +103,7 @@ - (void)initUICompositeViewController { viewControllerCache = [[NSMutableDictionary alloc] init]; - currentOrientation = UIDeviceOrientationUnknown; + currentOrientation = (UIInterfaceOrientation)UIDeviceOrientationUnknown; } - (id)init{ @@ -416,18 +416,18 @@ if(currentOrientation == UIDeviceOrientationUnknown) { return [UIApplication sharedApplication].statusBarOrientation; } - deviceOrientation = currentOrientation; + deviceOrientation = (UIDeviceOrientation)currentOrientation; } if (UIDeviceOrientationIsPortrait(deviceOrientation)) { if ([currentViewDescription portraitMode]) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { return UIInterfaceOrientationLandscapeLeft; } } if (UIDeviceOrientationIsLandscape(deviceOrientation)) { if ([currentViewDescription landscapeMode]) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { return UIInterfaceOrientationPortrait; } @@ -435,7 +435,7 @@ } else if([rotationPreference isEqualToString:@"portrait"]) { if ([currentViewDescription portraitMode]) { if (UIDeviceOrientationIsPortrait(deviceOrientation)) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { if(UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation)) { return [UIApplication sharedApplication].statusBarOrientation; @@ -449,7 +449,7 @@ } else if([rotationPreference isEqualToString:@"landscape"]) { if ([currentViewDescription landscapeMode]) { if (UIDeviceOrientationIsLandscape(deviceOrientation)) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { if(UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) { return [UIApplication sharedApplication].statusBarOrientation; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 28efeaf74..8f5029539 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -75,6 +75,8 @@ 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; }; + 2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 226EF06B15FA256B005865C7 /* MobileCoreServices.framework */; }; 22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; }; 220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; }; 220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; @@ -2481,6 +2483,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */, + 2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */, D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */, D30562141671DC3E00C97967 /* libXMLRPC.a in Frameworks */, 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, @@ -3800,7 +3804,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0460; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "linphone" */; compatibilityVersion = "Xcode 3.2"; @@ -5494,15 +5498,20 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = "7763350E-083E-4ADA-8535-05883F19F947"; + PROVISIONING_PROFILE = "BB7E624F-8CD6-448B-A235-CE8DBB401F92"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5732,10 +5741,15 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; @@ -5798,10 +5812,15 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; @@ -5865,15 +5884,20 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 8cf0564ec..badceee91 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -14,6 +14,9 @@ else libvpx_configure_options+= --target=x86-darwin10-gcc endif libvpx_dir?=externals/libvpx +all_p=armv6-darwin-gcc #neon Cortex-A8 +all_p+=armv7-darwin-gcc #neon Cortex-A8 +all_p+=armv7s-darwin-gcc #neon Cortex-A8 $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp: cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \ @@ -24,10 +27,10 @@ $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/p mkdir -p $(BUILDER_BUILD_DIR)/$(libvpx_dir) cd $(BUILDER_BUILD_DIR)/$(libvpx_dir)/ \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && SYSROOT_PATH=$$SYSROOT_PATH SDK_BIN_PATH=$$SDK_BIN_PATH $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) $(libvpx_configure_options) + && export all_platforms="${all_p}" && $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) --sdk-path=$$SDK_BIN_PATH/../../ --libc=$$SYSROOT_PATH $(libvpx_configure_options) build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk - cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) make && make install clean-libvpx: cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make clean diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch index d651ccfc8..0cd793f5f 100644 --- a/submodules/build/builders.d/libvpx.patch +++ b/submodules/build/builders.d/libvpx.patch @@ -1,29 +1,9 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index 0426f92..38fdcb2 100755 +index c99a01c..48f8876 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -624,6 +624,9 @@ process_common_toolchain() { - if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then - osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk" - fi -+ if test -n "$SYSROOT_PATH" ; then -+ osx_sdk_dir=$SYSROOT_PATH -+ fi - - case ${toolchain} in - *-darwin8-*) -@@ -743,9 +746,17 @@ process_common_toolchain() { - darwin*) - SDK_PATH=/Developer/Platforms/iPhoneOS.platform/Developer - TOOLCHAIN_PATH=${SDK_PATH}/usr/bin -+ if test -n "$SYSROOT_PATH" ; then -+ SDK_FULL_PATH=$SYSROOT_PATH -+ else -+ SDK_FULL_PATH="${SDK_PATH}/SDKs/iPhoneOS5.0.sdk" -+ fi -+ if test -n "$SDK_BIN_PATH" ; then -+ TOOLCHAIN_PATH=$SDK_BIN_PATH -+ fi +@@ -892,7 +892,7 @@ process_common_toolchain() { + CXX=${TOOLCHAIN_PATH}/g++ CC=${TOOLCHAIN_PATH}/gcc AR=${TOOLCHAIN_PATH}/ar - LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2 @@ -31,39 +11,12 @@ index 0426f92..38fdcb2 100755 AS=${TOOLCHAIN_PATH}/as STRIP=${TOOLCHAIN_PATH}/strip NM=${TOOLCHAIN_PATH}/nm -@@ -757,12 +768,12 @@ process_common_toolchain() { +@@ -904,7 +904,7 @@ process_common_toolchain() { ASFLAGS="-version -arch ${tgt_isa} -g" add_cflags -arch ${tgt_isa} - add_ldflags -arch_only ${tgt_isa} + add_ldflags -arch ${tgt_isa} -- add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS5.0.sdk" -+ add_cflags "-isysroot $SDK_FULL_PATH" - - # This should be overridable -- alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.0.sdk -+ alt_libc=$SDK_FULL_PATH - - # Add the paths for the alternate libc - for d in usr/include; do -diff --git a/configure b/configure -index 6f20c6b..4638ea2 100755 ---- a/configure -+++ b/configure -@@ -94,6 +94,7 @@ all_platforms="${all_platforms} iwmmxt-linux-gcc" - all_platforms="${all_platforms} iwmmxt2-linux-rvct" - all_platforms="${all_platforms} iwmmxt2-linux-gcc" - all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 -+all_platforms="${all_platforms} armv7s-darwin-gcc" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 -@@ -198,6 +199,7 @@ ARCH_EXT_LIST=" - armv5te - armv6 - armv7 -+ armv7s - iwmmxt - iwmmxt2 - + if [ -z "${alt_libc}" ]; then + alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.1.sdk diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index ea15aad82..125bdebcd 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -27,11 +27,11 @@ else exit fi echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}" -XCODE_ROOT=/Applications/Xcode.app +XCODE_DEV_PATH=`xcode-select -print-path` #new path with Xcode 4.3: -if test -d ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then - SDK_PATH_LIST=`ls -drt ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` - SDK_BIN_PATH=${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin +if test -d ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then + SDK_PATH_LIST=`ls -drt ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` + SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin else SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx index c8df1656b..b9ce43029 160000 --- a/submodules/externals/libvpx +++ b/submodules/externals/libvpx @@ -1 +1 @@ -Subproject commit c8df1656bd94928059204242e778bd5b8b9dc7aa +Subproject commit b9ce43029298182668d4dcb0e0814189e4a63c2a From 5ea8097dddec301784cb1259b22d174bb51ae732 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 22 May 2013 16:13:35 +0200 Subject: [PATCH 069/218] update libvpx to v1.2.0 --- Classes/ContactDetailsTableViewController.m | 2 +- .../LinphoneUI/UICompositeViewController.m | 12 ++-- linphone.xcodeproj/project.pbxproj | 32 ++++++++-- submodules/build/builders.d/libvpx.mk | 7 ++- submodules/build/builders.d/libvpx.patch | 59 ++----------------- submodules/build/iphone-config.site | 8 +-- submodules/externals/libvpx | 2 +- 7 files changed, 51 insertions(+), 71 deletions(-) diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 8f49fd838..7fe664112 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -537,7 +537,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C NSMutableArray *sectionDict = [self getSectionData:[indexPath section]]; Entry *entry = [sectionDict objectAtIndex:[indexPath row]]; if (![self isEditing]) { - NSString *dest; + NSString *dest=NULL;; if(contactSections[[indexPath section]] == ContactSections_Number) { ABMultiValueRef lMap = ABRecordCopyValue(contact, kABPersonPhoneProperty); int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index aa7237646..7a1913db0 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -103,7 +103,7 @@ - (void)initUICompositeViewController { viewControllerCache = [[NSMutableDictionary alloc] init]; - currentOrientation = UIDeviceOrientationUnknown; + currentOrientation = (UIInterfaceOrientation)UIDeviceOrientationUnknown; } - (id)init{ @@ -416,18 +416,18 @@ if(currentOrientation == UIDeviceOrientationUnknown) { return [UIApplication sharedApplication].statusBarOrientation; } - deviceOrientation = currentOrientation; + deviceOrientation = (UIDeviceOrientation)currentOrientation; } if (UIDeviceOrientationIsPortrait(deviceOrientation)) { if ([currentViewDescription portraitMode]) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { return UIInterfaceOrientationLandscapeLeft; } } if (UIDeviceOrientationIsLandscape(deviceOrientation)) { if ([currentViewDescription landscapeMode]) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { return UIInterfaceOrientationPortrait; } @@ -435,7 +435,7 @@ } else if([rotationPreference isEqualToString:@"portrait"]) { if ([currentViewDescription portraitMode]) { if (UIDeviceOrientationIsPortrait(deviceOrientation)) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { if(UIInterfaceOrientationIsPortrait([UIApplication sharedApplication].statusBarOrientation)) { return [UIApplication sharedApplication].statusBarOrientation; @@ -449,7 +449,7 @@ } else if([rotationPreference isEqualToString:@"landscape"]) { if ([currentViewDescription landscapeMode]) { if (UIDeviceOrientationIsLandscape(deviceOrientation)) { - return deviceOrientation; + return (UIInterfaceOrientation)deviceOrientation; } else { if(UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) { return [UIApplication sharedApplication].statusBarOrientation; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 28efeaf74..8f5029539 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -75,6 +75,8 @@ 1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + 2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; }; + 2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 226EF06B15FA256B005865C7 /* MobileCoreServices.framework */; }; 22058C71116E305000B08DDD /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; }; 220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2810765B400068D98F /* libeXosip2.a */; }; 220FAD3210765B400068D98F /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; }; @@ -2481,6 +2483,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */, + 2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */, D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */, D30562141671DC3E00C97967 /* libXMLRPC.a in Frameworks */, 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, @@ -3800,7 +3804,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0460; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "linphone" */; compatibilityVersion = "Xcode 3.2"; @@ -5494,15 +5498,20 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = "7763350E-083E-4ADA-8535-05883F19F947"; + PROVISIONING_PROFILE = "BB7E624F-8CD6-448B-A235-CE8DBB401F92"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5732,10 +5741,15 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; @@ -5798,10 +5812,15 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; @@ -5865,15 +5884,20 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)"; GCC_THUMB_SUPPORT = NO; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 8cf0564ec..badceee91 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -14,6 +14,9 @@ else libvpx_configure_options+= --target=x86-darwin10-gcc endif libvpx_dir?=externals/libvpx +all_p=armv6-darwin-gcc #neon Cortex-A8 +all_p+=armv7-darwin-gcc #neon Cortex-A8 +all_p+=armv7s-darwin-gcc #neon Cortex-A8 $(BUILDER_SRC_DIR)/$(libvpx_dir)/patched.stamp: cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \ @@ -24,10 +27,10 @@ $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/p mkdir -p $(BUILDER_BUILD_DIR)/$(libvpx_dir) cd $(BUILDER_BUILD_DIR)/$(libvpx_dir)/ \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && SYSROOT_PATH=$$SYSROOT_PATH SDK_BIN_PATH=$$SDK_BIN_PATH $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) $(libvpx_configure_options) + && export all_platforms="${all_p}" && $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) --sdk-path=$$SDK_BIN_PATH/../../ --libc=$$SYSROOT_PATH $(libvpx_configure_options) build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk - cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) make && make install clean-libvpx: cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make clean diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch index d651ccfc8..0cd793f5f 100644 --- a/submodules/build/builders.d/libvpx.patch +++ b/submodules/build/builders.d/libvpx.patch @@ -1,29 +1,9 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index 0426f92..38fdcb2 100755 +index c99a01c..48f8876 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -624,6 +624,9 @@ process_common_toolchain() { - if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then - osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk" - fi -+ if test -n "$SYSROOT_PATH" ; then -+ osx_sdk_dir=$SYSROOT_PATH -+ fi - - case ${toolchain} in - *-darwin8-*) -@@ -743,9 +746,17 @@ process_common_toolchain() { - darwin*) - SDK_PATH=/Developer/Platforms/iPhoneOS.platform/Developer - TOOLCHAIN_PATH=${SDK_PATH}/usr/bin -+ if test -n "$SYSROOT_PATH" ; then -+ SDK_FULL_PATH=$SYSROOT_PATH -+ else -+ SDK_FULL_PATH="${SDK_PATH}/SDKs/iPhoneOS5.0.sdk" -+ fi -+ if test -n "$SDK_BIN_PATH" ; then -+ TOOLCHAIN_PATH=$SDK_BIN_PATH -+ fi +@@ -892,7 +892,7 @@ process_common_toolchain() { + CXX=${TOOLCHAIN_PATH}/g++ CC=${TOOLCHAIN_PATH}/gcc AR=${TOOLCHAIN_PATH}/ar - LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2 @@ -31,39 +11,12 @@ index 0426f92..38fdcb2 100755 AS=${TOOLCHAIN_PATH}/as STRIP=${TOOLCHAIN_PATH}/strip NM=${TOOLCHAIN_PATH}/nm -@@ -757,12 +768,12 @@ process_common_toolchain() { +@@ -904,7 +904,7 @@ process_common_toolchain() { ASFLAGS="-version -arch ${tgt_isa} -g" add_cflags -arch ${tgt_isa} - add_ldflags -arch_only ${tgt_isa} + add_ldflags -arch ${tgt_isa} -- add_cflags "-isysroot ${SDK_PATH}/SDKs/iPhoneOS5.0.sdk" -+ add_cflags "-isysroot $SDK_FULL_PATH" - - # This should be overridable -- alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.0.sdk -+ alt_libc=$SDK_FULL_PATH - - # Add the paths for the alternate libc - for d in usr/include; do -diff --git a/configure b/configure -index 6f20c6b..4638ea2 100755 ---- a/configure -+++ b/configure -@@ -94,6 +94,7 @@ all_platforms="${all_platforms} iwmmxt-linux-gcc" - all_platforms="${all_platforms} iwmmxt2-linux-rvct" - all_platforms="${all_platforms} iwmmxt2-linux-gcc" - all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 -+all_platforms="${all_platforms} armv7s-darwin-gcc" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 -@@ -198,6 +199,7 @@ ARCH_EXT_LIST=" - armv5te - armv6 - armv7 -+ armv7s - iwmmxt - iwmmxt2 - + if [ -z "${alt_libc}" ]; then + alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.1.sdk diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index ea15aad82..125bdebcd 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -27,11 +27,11 @@ else exit fi echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}" -XCODE_ROOT=/Applications/Xcode.app +XCODE_DEV_PATH=`xcode-select -print-path` #new path with Xcode 4.3: -if test -d ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then - SDK_PATH_LIST=`ls -drt ${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` - SDK_BIN_PATH=${XCODE_ROOT}/Contents/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin +if test -d ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then + SDK_PATH_LIST=`ls -drt ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` + SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin else SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx index c8df1656b..b9ce43029 160000 --- a/submodules/externals/libvpx +++ b/submodules/externals/libvpx @@ -1 +1 @@ -Subproject commit c8df1656bd94928059204242e778bd5b8b9dc7aa +Subproject commit b9ce43029298182668d4dcb0e0814189e4a63c2a From 2f527bba0f3d4b44db14de65b024f4152ea2f165 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Wed, 22 May 2013 23:00:34 +0200 Subject: [PATCH 070/218] AAC-ELD: support PLC and multiple frames per RTP packet and fix uninit to free the audio converter. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 12a3d7951..889ff55a0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 12a3d795131ab1b367ae000f8b70f9b8af684df6 +Subproject commit 889ff55a035ece493d053d5bd631df560c28c062 From 1de660be1b23339e9b3a18c46a865dfa4d2102ae Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Wed, 22 May 2013 23:00:34 +0200 Subject: [PATCH 071/218] AAC-ELD: support PLC and multiple frames per RTP packet and fix uninit to free the audio converter. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 12a3d7951..889ff55a0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 12a3d795131ab1b367ae000f8b70f9b8af684df6 +Subproject commit 889ff55a035ece493d053d5bd631df560c28c062 From 1f0089b06c4b5dcbdb085624b4801e40ae333c0f Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Thu, 23 May 2013 11:54:37 +0200 Subject: [PATCH 072/218] AAC-ELD : set an initial max ptime at 50ms - to avoid ptime automatic growing too high when packets are losts - setting overridden up to 100 by initial set ptime --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 889ff55a0..7cb2aa263 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 889ff55a035ece493d053d5bd631df560c28c062 +Subproject commit 7cb2aa2639fd6180e8996eee303cfbbcb3048941 From 6bfdc61a725cf425d0d37d3e9e8f5928523b2f49 Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Thu, 23 May 2013 11:54:37 +0200 Subject: [PATCH 073/218] AAC-ELD : set an initial max ptime at 50ms - to avoid ptime automatic growing too high when packets are losts - setting overridden up to 100 by initial set ptime --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 889ff55a0..7cb2aa263 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 889ff55a035ece493d053d5bd631df560c28c062 +Subproject commit 7cb2aa2639fd6180e8996eee303cfbbcb3048941 From 4b4fcf9a890ece080d6f1aad7fc43cbbb2529bef Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 23 May 2013 14:41:43 +0200 Subject: [PATCH 074/218] update linphone (contact in MESSAGEs option) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index a74f51569..7ae7ac4c8 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit a74f515693afc8d1ec47486d6caa85822e2128c5 +Subproject commit 7ae7ac4c8ae031a028ffb47ef72978ba0b8902d2 diff --git a/submodules/linphone b/submodules/linphone index bfe2437bb..2391436cd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bfe2437bbe7f191d616e9e2f0b3d254cfbff2476 +Subproject commit 2391436cd284e92fac24c482f052149812b88d42 From 3f4528356e616d55f56d590911da162d54b7dfcb Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 27 May 2013 12:41:07 +0200 Subject: [PATCH 075/218] update linphone & bellesip for 'alias' parameter --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 7ae7ac4c8..81b4695a7 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7ae7ac4c8ae031a028ffb47ef72978ba0b8902d2 +Subproject commit 81b4695a7720331d13a8fe5a7175071b10f52eb7 diff --git a/submodules/linphone b/submodules/linphone index 2391436cd..2b0381668 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2391436cd284e92fac24c482f052149812b88d42 +Subproject commit 2b03816684178a07b8719d4079dd5dc86b9442a7 From 7162af2c3d1bee3d79355a258b11a1389fe22b05 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 27 May 2013 22:07:52 +0200 Subject: [PATCH 076/218] add opus submodule --- .gitmodules | 3 + submodules/build/builder-iphone-os.mk | 8 +-- submodules/build/builders.d/opus.mk | 67 +++++++++++++++++++ submodules/externals/opus | 1 + .../liblinphone.xcodeproj/project.pbxproj | 8 +++ submodules/linphone | 2 +- 6 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 submodules/build/builders.d/opus.mk create mode 160000 submodules/externals/opus diff --git a/.gitmodules b/.gitmodules index 48fa6c484..801c0cc77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "submodules/bcg729"] path = submodules/bcg729 url = git://git.linphone.org/bcg729.git +[submodule "submodules/externals/opus"] + path = submodules/externals/opus + url = git://git.opus-codec.org/opus.git diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index e7643586d..605e898c4 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -109,18 +109,18 @@ veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx build-opus detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/ -clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 +clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 clean-opus cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx veryclean-opus #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk +clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk clean-makefile-opus cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile diff --git a/submodules/build/builders.d/opus.mk b/submodules/build/builders.d/opus.mk new file mode 100644 index 000000000..6d905843e --- /dev/null +++ b/submodules/build/builders.d/opus.mk @@ -0,0 +1,67 @@ +############################################################################ +# opus.mk +# Copyright (C) 2013 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +opus_dir?=externals/opus +enable_opus?=yes + +libopus_configure_options=--disable-extra-programs --disable-doc +#ifeq (,$(findstring armv7s,$(host))) +# libopus_configure_options+= --enable-fixed-point +#compilation error with armv7, switching to fpu impl +#endif + +$(BUILDER_SRC_DIR)/$(opus_dir)/configure: + @echo -e "\033[01;32m Running autogen for msopus in $(BUILDER_SRC_DIR)/$(opus_dir) \033[0m" + cd $(BUILDER_SRC_DIR)/$(opus_dir) && ./autogen.sh + +$(BUILDER_BUILD_DIR)/$(opus_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opus_dir)/configure + @echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(opus_dir) \033[0m" + mkdir -p $(BUILDER_BUILD_DIR)/$(opus_dir) + cd $(BUILDER_BUILD_DIR)/$(opus_dir)/ \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(opus_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ + ${libopus_configure_options} + +ifeq ($(enable_opus),yes) + +build-opus: $(BUILDER_BUILD_DIR)/$(opus_dir)/Makefile + @echo -e "\033[01;32m building opus \033[0m" + cd $(BUILDER_BUILD_DIR)/$(opus_dir) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ + CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + make -j1 && make install + + +else +build-opus: + @echo "opus is disabled" + +endif + +clean-opus: + -cd $(BUILDER_BUILD_DIR)/$(opus_dir) && make clean + +veryclean-opus: + -cd $(BUILDER_BUILD_DIR)/$(opus_dir) && make distclean + rm -f $(BUILDER_SRC_DIR)/$(opus_dir)/configure + +clean-makefile-opus: + -cd $(BUILDER_BUILD_DIR)/$(opus_dir) && rm -f Makefile diff --git a/submodules/externals/opus b/submodules/externals/opus new file mode 160000 index 000000000..fcecd29ab --- /dev/null +++ b/submodules/externals/opus @@ -0,0 +1 @@ +Subproject commit fcecd29abf32164326e568acdcdf7d8e877b33b1 diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 590a8ac6e..9921fdae2 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -364,6 +364,8 @@ 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 */; }; @@ -666,6 +668,8 @@ 22A10B5311F84E2D00373793 /* proto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proto.h; sourceTree = ""; }; 22A10B5411F84E2D00373793 /* toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toast.h; sourceTree = ""; }; 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 = ""; }; @@ -715,6 +719,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 22AF73C01753F3E100BE8398 /* libopus.a in Frameworks */, 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */, 225D65CC1521C195008B2E81 /* libmediastreamer.a in Frameworks */, 2211DB9F14765CED00DEE054 /* libmssilk.a in Frameworks */, @@ -767,6 +772,7 @@ 0867D691FE84028FC02AAC07 /* liblinphone */ = { isa = PBXGroup; children = ( + 22AF73BF1753F3E100BE8398 /* libopus.a */, 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */, 2211DB9E14765CEC00DEE054 /* libmssilk.a */, 7066FC0913E830B800EFC6DC /* libvpx.a */, @@ -1050,6 +1056,7 @@ 223CA7EF16D9268D00EF1BEC /* audiofilters */ = { isa = PBXGroup; children = ( + 22AF73BD1753E83700BE8398 /* msopus.c */, 0406A7651721FF79009FD24F /* aac-eld.c */, 22D07CE416F3BFCB009F2C9E /* speexec.c */, 223CA7F016D9268D00EF1BEC /* alaw.c */, @@ -1679,6 +1686,7 @@ 223CA8D416D9268D00EF1BEC /* scaler.c in Sources */, 223CA8D716D9268D00EF1BEC /* videostream.c in Sources */, 22D07CE516F3BFCB009F2C9E /* speexec.c in Sources */, + 22AF73BE1753E83700BE8398 /* msopus.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/linphone b/submodules/linphone index 7cb2aa263..5355e3775 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7cb2aa2639fd6180e8996eee303cfbbcb3048941 +Subproject commit 5355e37750d8c32fbd978161966ba80390a8bec0 From 944e0663932ef3c634718bbfb9facbfaa3034e21 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 27 May 2013 22:07:52 +0200 Subject: [PATCH 077/218] add opus submodule --- .gitmodules | 3 + submodules/build/builder-iphone-os.mk | 8 +-- submodules/build/builders.d/opus.mk | 67 +++++++++++++++++++ submodules/externals/opus | 1 + .../liblinphone.xcodeproj/project.pbxproj | 8 +++ submodules/linphone | 2 +- 6 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 submodules/build/builders.d/opus.mk create mode 160000 submodules/externals/opus diff --git a/.gitmodules b/.gitmodules index 48fa6c484..801c0cc77 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "submodules/bcg729"] path = submodules/bcg729 url = git://git.linphone.org/bcg729.git +[submodule "submodules/externals/opus"] + path = submodules/externals/opus + url = git://git.opus-codec.org/opus.git diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index e7643586d..605e898c4 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -109,18 +109,18 @@ veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-openssl build-srtp build-zrtpcpp build-osip2 build-eXosip2 build-speex build-libgsm build-ffmpeg build-libvpx build-opus detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/ -clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 +clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-openssl clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 clean-opus cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx veryclean-opus #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk +clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk clean-makefile-opus cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile diff --git a/submodules/build/builders.d/opus.mk b/submodules/build/builders.d/opus.mk new file mode 100644 index 000000000..6d905843e --- /dev/null +++ b/submodules/build/builders.d/opus.mk @@ -0,0 +1,67 @@ +############################################################################ +# opus.mk +# Copyright (C) 2013 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +opus_dir?=externals/opus +enable_opus?=yes + +libopus_configure_options=--disable-extra-programs --disable-doc +#ifeq (,$(findstring armv7s,$(host))) +# libopus_configure_options+= --enable-fixed-point +#compilation error with armv7, switching to fpu impl +#endif + +$(BUILDER_SRC_DIR)/$(opus_dir)/configure: + @echo -e "\033[01;32m Running autogen for msopus in $(BUILDER_SRC_DIR)/$(opus_dir) \033[0m" + cd $(BUILDER_SRC_DIR)/$(opus_dir) && ./autogen.sh + +$(BUILDER_BUILD_DIR)/$(opus_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opus_dir)/configure + @echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(opus_dir) \033[0m" + mkdir -p $(BUILDER_BUILD_DIR)/$(opus_dir) + cd $(BUILDER_BUILD_DIR)/$(opus_dir)/ \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(opus_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ + ${libopus_configure_options} + +ifeq ($(enable_opus),yes) + +build-opus: $(BUILDER_BUILD_DIR)/$(opus_dir)/Makefile + @echo -e "\033[01;32m building opus \033[0m" + cd $(BUILDER_BUILD_DIR)/$(opus_dir) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ + CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + make -j1 && make install + + +else +build-opus: + @echo "opus is disabled" + +endif + +clean-opus: + -cd $(BUILDER_BUILD_DIR)/$(opus_dir) && make clean + +veryclean-opus: + -cd $(BUILDER_BUILD_DIR)/$(opus_dir) && make distclean + rm -f $(BUILDER_SRC_DIR)/$(opus_dir)/configure + +clean-makefile-opus: + -cd $(BUILDER_BUILD_DIR)/$(opus_dir) && rm -f Makefile diff --git a/submodules/externals/opus b/submodules/externals/opus new file mode 160000 index 000000000..fcecd29ab --- /dev/null +++ b/submodules/externals/opus @@ -0,0 +1 @@ +Subproject commit fcecd29abf32164326e568acdcdf7d8e877b33b1 diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index dc4fcbf65..ddc235483 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -364,6 +364,8 @@ 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 */; }; @@ -666,6 +668,8 @@ 22A10B5311F84E2D00373793 /* proto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proto.h; sourceTree = ""; }; 22A10B5411F84E2D00373793 /* toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = toast.h; sourceTree = ""; }; 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 = ""; }; @@ -715,6 +719,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 22AF73C01753F3E100BE8398 /* libopus.a in Frameworks */, 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */, 225D65CC1521C195008B2E81 /* libmediastreamer.a in Frameworks */, 2211DB9F14765CED00DEE054 /* libmssilk.a in Frameworks */, @@ -767,6 +772,7 @@ 0867D691FE84028FC02AAC07 /* liblinphone */ = { isa = PBXGroup; children = ( + 22AF73BF1753F3E100BE8398 /* libopus.a */, 2211DBA0147660BB00DEE054 /* libSKP_SILK_SDK.a */, 2211DB9E14765CEC00DEE054 /* libmssilk.a */, 7066FC0913E830B800EFC6DC /* libvpx.a */, @@ -1050,6 +1056,7 @@ 223CA7EF16D9268D00EF1BEC /* audiofilters */ = { isa = PBXGroup; children = ( + 22AF73BD1753E83700BE8398 /* msopus.c */, 0406A7651721FF79009FD24F /* aac-eld.c */, 22D07CE416F3BFCB009F2C9E /* speexec.c */, 223CA7F016D9268D00EF1BEC /* alaw.c */, @@ -1679,6 +1686,7 @@ 223CA8D416D9268D00EF1BEC /* scaler.c in Sources */, 223CA8D716D9268D00EF1BEC /* videostream.c in Sources */, 22D07CE516F3BFCB009F2C9E /* speexec.c in Sources */, + 22AF73BE1753E83700BE8398 /* msopus.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/linphone b/submodules/linphone index 7cb2aa263..5355e3775 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7cb2aa2639fd6180e8996eee303cfbbcb3048941 +Subproject commit 5355e37750d8c32fbd978161966ba80390a8bec0 From b33387c611fe4a02f901137a961f71510ce7da48 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 28 May 2013 08:49:54 +0200 Subject: [PATCH 078/218] update speex submodule to fix symbole colission with opus --- submodules/externals/speex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/speex b/submodules/externals/speex index 89e99a481..e780bd2ce 160000 --- a/submodules/externals/speex +++ b/submodules/externals/speex @@ -1 +1 @@ -Subproject commit 89e99a4814fd62945ff559d3d37d9aa92caf3169 +Subproject commit e780bd2ce36af4133fd0ff304ab2078f1dacaaf6 From fbbbc249f78d77fe8e0d56cc6e260580217795de Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 28 May 2013 08:49:54 +0200 Subject: [PATCH 079/218] update speex submodule to fix symbole colission with opus --- submodules/externals/speex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/speex b/submodules/externals/speex index 89e99a481..e780bd2ce 160000 --- a/submodules/externals/speex +++ b/submodules/externals/speex @@ -1 +1 @@ -Subproject commit 89e99a4814fd62945ff559d3d37d9aa92caf3169 +Subproject commit e780bd2ce36af4133fd0ff304ab2078f1dacaaf6 From 1f2c48e380c90a2e7996797c1fa00cba1bbe7f77 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 28 May 2013 12:40:05 +0200 Subject: [PATCH 080/218] add opus library --- linphone.xcodeproj/project.pbxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 8f5029539..c029ee1e5 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -129,6 +129,8 @@ 22AA8AFD13D7125600B30535 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFB13D7125500B30535 /* libx264.a */; }; 22AA8AFE13D7125600B30535 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFC13D7125500B30535 /* libmsx264.a */; }; 22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AA8B0013D83F6300B30535 /* UICamSwitch.m */; }; + 22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73C11754C0D000BE8398 /* libopus.a */; }; + 22AF73C31754C0D800BE8398 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73C11754C0D000BE8398 /* libopus.a */; }; 22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */; }; 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5F03410CE6B2F00777D97 /* AddressBook.framework */; }; 22BB1A69132FF16A005CD7AA /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */; }; @@ -1616,6 +1618,7 @@ 22AA8AFC13D7125500B30535 /* libmsx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsx264.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsx264.a"; sourceTree = ""; }; 22AA8AFF13D83F6300B30535 /* UICamSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICamSwitch.h; sourceTree = ""; }; 22AA8B0013D83F6300B30535 /* UICamSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICamSwitch.m; sourceTree = ""; }; + 22AF73C11754C0D000BE8398 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = "liblinphone-sdk/apple-darwin/lib/libopus.a"; sourceTree = ""; }; 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; 22B5F03410CE6B2F00777D97 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; 22BB1A67132FF16A005CD7AA /* UIEraseButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEraseButton.h; sourceTree = ""; }; @@ -2423,6 +2426,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */, D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */, D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, @@ -2525,6 +2529,7 @@ 22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */, 22D8F163147548E2008C97DB /* libssl.a in Frameworks */, 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */, + 22AF73C31754C0D800BE8398 /* libopus.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2985,6 +2990,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 22AF73C11754C0D000BE8398 /* libopus.a */, 2258633C11410BAC00C5A737 /* README */, 22276E8013C73D3100210156 /* libavcodec.a */, 22276E8113C73D3100210156 /* libavutil.a */, From 4639c7731875eece23af9c5b36a398a118b02c9b Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 28 May 2013 12:40:05 +0200 Subject: [PATCH 081/218] add opus library --- linphone.xcodeproj/project.pbxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 8f5029539..c029ee1e5 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -129,6 +129,8 @@ 22AA8AFD13D7125600B30535 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFB13D7125500B30535 /* libx264.a */; }; 22AA8AFE13D7125600B30535 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFC13D7125500B30535 /* libmsx264.a */; }; 22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AA8B0013D83F6300B30535 /* UICamSwitch.m */; }; + 22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73C11754C0D000BE8398 /* libopus.a */; }; + 22AF73C31754C0D800BE8398 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73C11754C0D000BE8398 /* libopus.a */; }; 22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */; }; 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5F03410CE6B2F00777D97 /* AddressBook.framework */; }; 22BB1A69132FF16A005CD7AA /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */; }; @@ -1616,6 +1618,7 @@ 22AA8AFC13D7125500B30535 /* libmsx264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsx264.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsx264.a"; sourceTree = ""; }; 22AA8AFF13D83F6300B30535 /* UICamSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICamSwitch.h; sourceTree = ""; }; 22AA8B0013D83F6300B30535 /* UICamSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICamSwitch.m; sourceTree = ""; }; + 22AF73C11754C0D000BE8398 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = "liblinphone-sdk/apple-darwin/lib/libopus.a"; sourceTree = ""; }; 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; 22B5F03410CE6B2F00777D97 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; 22BB1A67132FF16A005CD7AA /* UIEraseButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEraseButton.h; sourceTree = ""; }; @@ -2423,6 +2426,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */, D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */, D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, @@ -2525,6 +2529,7 @@ 22D8F16F147548E2008C97DB /* libspeexdsp.a in Frameworks */, 22D8F163147548E2008C97DB /* libssl.a in Frameworks */, 22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */, + 22AF73C31754C0D800BE8398 /* libopus.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2985,6 +2990,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 22AF73C11754C0D000BE8398 /* libopus.a */, 2258633C11410BAC00C5A737 /* README */, 22276E8013C73D3100210156 /* libavcodec.a */, 22276E8113C73D3100210156 /* libavutil.a */, From e132497f6e721ab960e99fc29f1d46d4d67f7d1c Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Tue, 28 May 2013 13:24:09 +0200 Subject: [PATCH 082/218] Add opus codec to the linphone application - only one mode available: 48kHz --- Classes/LinphoneManager.m | 1 + Settings/InAppSettings.bundle/Audio.plist | 52 ++++++++++++++--------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 92976227d..0cf52f4be 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -133,6 +133,7 @@ struct codec_name_pref_table codec_pref_table[]={ { "vp8", 90000, @"vp8_preference"}, { "mpeg4-generic", 44100, @"aaceld_44k_preference"}, { "mpeg4-generic", 22050, @"aaceld_22k_preference"}, + { "opus", 48000, @"opus_preference"}, { NULL,0,Nil } }; diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index 4331a88d4..5fa9900a1 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -30,6 +30,16 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + opus_preference + Title + Opus 48kHz + Type + PSToggleSwitchSpecifier + DefaultValue @@ -50,6 +60,28 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + aaceld_22k_preference + Title + AAC-ELD 22kHz + Type + PSToggleSwitchSpecifier + + + New item + + DefaultValue + + Key + aaceld_44k_preference + Title + AAC-ELD 44kHz + Type + PSToggleSwitchSpecifier + DefaultValue @@ -120,26 +152,6 @@ Type PSToggleSwitchSpecifier - - DefaultValue - - Key - aaceld_44k_preference - Title - AAC-ELD 44kHz - Type - PSToggleSwitchSpecifier - - - DefaultValue - - Key - aaceld_22k_preference - Title - AAC-ELD 22kHz - Type - PSToggleSwitchSpecifier - Key audio_advanced_group From a305436e080651e629585e76e4ad907810bb810c Mon Sep 17 00:00:00 2001 From: Johan Pascal Date: Tue, 28 May 2013 13:24:09 +0200 Subject: [PATCH 083/218] Add opus codec to the linphone application - only one mode available: 48kHz --- Classes/LinphoneManager.m | 1 + Settings/InAppSettings.bundle/Audio.plist | 52 ++++++++++++++--------- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 92976227d..0cf52f4be 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -133,6 +133,7 @@ struct codec_name_pref_table codec_pref_table[]={ { "vp8", 90000, @"vp8_preference"}, { "mpeg4-generic", 44100, @"aaceld_44k_preference"}, { "mpeg4-generic", 22050, @"aaceld_22k_preference"}, + { "opus", 48000, @"opus_preference"}, { NULL,0,Nil } }; diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index 4331a88d4..5fa9900a1 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -30,6 +30,16 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + opus_preference + Title + Opus 48kHz + Type + PSToggleSwitchSpecifier + DefaultValue @@ -50,6 +60,28 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + aaceld_22k_preference + Title + AAC-ELD 22kHz + Type + PSToggleSwitchSpecifier + + + New item + + DefaultValue + + Key + aaceld_44k_preference + Title + AAC-ELD 44kHz + Type + PSToggleSwitchSpecifier + DefaultValue @@ -120,26 +152,6 @@ Type PSToggleSwitchSpecifier - - DefaultValue - - Key - aaceld_44k_preference - Title - AAC-ELD 44kHz - Type - PSToggleSwitchSpecifier - - - DefaultValue - - Key - aaceld_22k_preference - Title - AAC-ELD 22kHz - Type - PSToggleSwitchSpecifier - Key audio_advanced_group From 49a10e1e9671336f94031c6570a95250294a2ed4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 28 May 2013 17:10:50 +0200 Subject: [PATCH 084/218] better address book sip address handling/filtering --- Classes/ChatViewController.m | 2 +- Classes/ContactDetailsTableViewController.m | 44 ++++++++++++++++++--- Classes/ContactsViewController.h | 5 ++- Classes/ContactsViewController.m | 10 ++--- Classes/LinphoneManager.h | 5 ++- Classes/LinphoneManager.m | 8 +++- Classes/Utils/FastAddressBook.m | 2 +- Resources/linphonerc-factory | 3 ++ 8 files changed, 61 insertions(+), 18 deletions(-) diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m index 4f52378a2..453f11927 100644 --- a/Classes/ChatViewController.m +++ b/Classes/ChatViewController.m @@ -122,7 +122,7 @@ static UICompositeViewDescription *compositeDescription = nil; if ([[addressField text ]length] == 0) { // if no address is manually set, lauch address book [ContactSelection setSelectionMode:ContactSelectionModeMessage]; [ContactSelection setAddAddress:nil]; - [ContactSelection setSipFilter:TRUE]; + [ContactSelection setSipFilter:@"*"]; [ContactSelection setEmailFilter:FALSE]; [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE]; } else { diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 7fe664112..f43280bdc 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -198,7 +198,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, i); BOOL add = false; if(CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { - if(CFStringCompare((CFStringRef)kContactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { + if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { add = true; } } else { @@ -285,7 +285,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C lMap = ABMultiValueCreateMutable(kABDictionaryPropertyType); } CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey }; - CFTypeRef values[] = { [value copy], kContactSipField }; + CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 1, NULL, NULL); CFStringRef label = (CFStringRef)[labelArray objectAtIndex:0]; if(!ABMultiValueAddValueAndLabel(lMap, lDict, label, &identifier)) { @@ -497,7 +497,17 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, index); CFStringRef valueRef = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); if(valueRef != NULL) { - value = [NSString stringWithString:(NSString*) valueRef]; + LinphoneAddress* addr=NULL; + if ([[LinphoneManager instance] lpConfigBoolForKey:@"contact_display_username_only"] + && (addr=linphone_address_new([(NSString *)valueRef UTF8String]))) { + if (linphone_address_get_username(addr)) { + value = [NSString stringWithCString:linphone_address_get_username(addr) + encoding:[NSString defaultCStringEncoding]]; + } /*else value=@""*/ + } else { + value = [NSString stringWithString:(NSString*) valueRef]; + } + if (addr) linphone_address_destroy(addr); } CFRelease(lDict); CFRelease(lMap); @@ -825,11 +835,33 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C CFRelease(lcMap); int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; - CFTypeRef values[] = { [value copy], kContactSipField }; + CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); ABMultiValueReplaceValueAtIndex(lMap, lDict, index); - CFRelease(lDict); - ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); + ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); + CFRelease(lDict); + /*check if message type is kept or not*/ + lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); + lMap = ABMultiValueCreateMutableCopy(lcMap); + CFRelease(lcMap); + index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); + lDict = ABMultiValueCopyValueAtIndex(lMap,index); + if(!CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { + /*too bad probably a gtalk number, storing uri*/ + NSString* username = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); + LinphoneAddress* address = linphone_core_interpret_url([LinphoneManager getLc] + ,[username UTF8String]); + char* uri = linphone_address_as_string_uri_only(address); + CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; + CFTypeRef values[] = { [NSString stringWithCString:uri encoding:[NSString defaultCStringEncoding]], [LinphoneManager instance].contactSipField }; + CFDictionaryRef lDict2 = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); + ABMultiValueReplaceValueAtIndex(lMap, lDict2, index); + ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); + CFRelease(lDict2); + linphone_address_destroy(address); + ms_free(uri); + } + CFRelease(lDict); CFRelease(lMap); } else if(contactSections[[path section]] == ContactSections_Email) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); diff --git a/Classes/ContactsViewController.h b/Classes/ContactsViewController.h index 00da1d3ad..c21948896 100644 --- a/Classes/ContactsViewController.h +++ b/Classes/ContactsViewController.h @@ -36,8 +36,9 @@ typedef enum _ContactSelectionMode { + (ContactSelectionMode)getSelectionMode; + (void)setAddAddress:(NSString*)address; + (NSString*)getAddAddress; -+ (void)setSipFilter:(BOOL)enable; -+ (BOOL)getSipFilter; +/* define sip filter, can be * or sip domain*/ ++ (void)setSipFilter:(NSString*) domain; ++ (NSString*)getSipFilter; + (void)setEmailFilter:(BOOL)enable; + (BOOL)getEmailFilter; diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index cf23d9d01..342ee059f 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -27,7 +27,7 @@ static ContactSelectionMode sSelectionMode = ContactSelectionModeNone; static NSString* sAddAddress = nil; -static BOOL sSipFilter = FALSE; +static NSString* sSipFilter = nil; static BOOL sEmailFilter = FALSE; + (void)setSelectionMode:(ContactSelectionMode)selectionMode { @@ -52,11 +52,11 @@ static BOOL sEmailFilter = FALSE; return sAddAddress; } -+ (void)setSipFilter:(BOOL)enable { - sSipFilter = enable; ++ (void)setSipFilter:(NSString*)domain { + sSipFilter = domain; } -+ (BOOL)getSipFilter { ++ (NSString*)getSipFilter { return sSipFilter; } @@ -206,7 +206,7 @@ static UICompositeViewDescription *compositeDescription = nil; } if(view == History_Linphone) { - [ContactSelection setSipFilter:TRUE]; + [ContactSelection setSipFilter:@"*"]; [ContactSelection setEmailFilter:FALSE]; [tableController loadData]; linphoneButton.selected = TRUE; diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index b90e36f74..4f9a27d06 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -47,8 +47,6 @@ extern NSString *const kLinphoneLogsUpdate; extern NSString *const kLinphoneSettingsUpdate; extern NSString *const kLinphoneBluetoothAvailabilityUpdate; -extern NSString *const kContactSipField; - typedef enum _NetworkType { network_none = 0, network_2g, @@ -117,6 +115,7 @@ typedef struct _LinphoneManagerSounds { + (NSSet *)unsupportedCodecs; + (NSString *)getUserAgent; + - (void)startLibLinphone; - (void)destroyLibLinphone; - (BOOL)resignActive; @@ -155,6 +154,7 @@ typedef struct _LinphoneManagerSounds { - (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key forSection:(NSString*)section; - (BOOL)lpConfigBoolForKey:(NSString*)key forSection:(NSString*)section; + @property (readonly) FastAddressBook* fastAddressBook; @property Connectivity connectivity; @property (readonly) NetworkType network; @@ -168,6 +168,7 @@ typedef struct _LinphoneManagerSounds { @property (nonatomic, assign) BOOL bluetoothAvailable; @property (nonatomic, assign) BOOL bluetoothEnabled; @property (readonly) ALAssetsLibrary *photoLibrary; +@property (readonly) NSString* contactSipField; @end diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 0cf52f4be..c24357942 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -57,7 +57,7 @@ NSString *const kLinphoneMainViewChange = @"LinphoneMainViewChange"; NSString *const kLinphoneLogsUpdate = @"LinphoneLogsUpdate"; NSString *const kLinphoneSettingsUpdate = @"LinphoneSettingsUpdate"; NSString *const kLinphoneBluetoothAvailabilityUpdate = @"LinphoneBluetoothAvailabilityUpdate"; -NSString *const kContactSipField = @"SIP"; + extern void libmsilbc_init(); @@ -246,6 +246,7 @@ struct codec_name_pref_table codec_pref_table[]={ [self copyDefaultSettings]; pendindCallIdFromRemoteNotif = [[NSMutableArray alloc] init ]; photoLibrary = [[ALAssetsLibrary alloc] init]; + } return self; } @@ -925,6 +926,11 @@ static LinphoneCoreVTable linphonec_vtable = { //go directly to bg mode [self resignActive]; } + + _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; + if (_contactSipField == nil) + _contactSipField =@"SIP"; + // Post event NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"]; diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index ab5f0b1a3..9831c2812 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -179,7 +179,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, i); BOOL add = false; if(CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { - if(CFStringCompare((CFStringRef)kContactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { + if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { add = true; } } else { diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index fb48ebbdf..ec3d25d96 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -47,3 +47,6 @@ stun=stun.linphone.org [video] display_filter_auto_rotate=0 + +[app] +#contact_display_username_only=1 From 8553bac55d4a7ed505dc70d3b1d57a90aa8c14bd Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 28 May 2013 17:10:50 +0200 Subject: [PATCH 085/218] better address book sip address handling/filtering --- Classes/ChatViewController.m | 2 +- Classes/ContactDetailsTableViewController.m | 44 ++++++++++++++++++--- Classes/ContactsViewController.h | 5 ++- Classes/ContactsViewController.m | 10 ++--- Classes/LinphoneManager.h | 5 ++- Classes/LinphoneManager.m | 8 +++- Classes/Utils/FastAddressBook.m | 2 +- Resources/linphonerc-factory | 3 ++ 8 files changed, 61 insertions(+), 18 deletions(-) diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m index 4f52378a2..453f11927 100644 --- a/Classes/ChatViewController.m +++ b/Classes/ChatViewController.m @@ -122,7 +122,7 @@ static UICompositeViewDescription *compositeDescription = nil; if ([[addressField text ]length] == 0) { // if no address is manually set, lauch address book [ContactSelection setSelectionMode:ContactSelectionModeMessage]; [ContactSelection setAddAddress:nil]; - [ContactSelection setSipFilter:TRUE]; + [ContactSelection setSipFilter:@"*"]; [ContactSelection setEmailFilter:FALSE]; [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE]; } else { diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 7fe664112..f43280bdc 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -198,7 +198,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, i); BOOL add = false; if(CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { - if(CFStringCompare((CFStringRef)kContactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { + if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { add = true; } } else { @@ -285,7 +285,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C lMap = ABMultiValueCreateMutable(kABDictionaryPropertyType); } CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey }; - CFTypeRef values[] = { [value copy], kContactSipField }; + CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 1, NULL, NULL); CFStringRef label = (CFStringRef)[labelArray objectAtIndex:0]; if(!ABMultiValueAddValueAndLabel(lMap, lDict, label, &identifier)) { @@ -497,7 +497,17 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, index); CFStringRef valueRef = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); if(valueRef != NULL) { - value = [NSString stringWithString:(NSString*) valueRef]; + LinphoneAddress* addr=NULL; + if ([[LinphoneManager instance] lpConfigBoolForKey:@"contact_display_username_only"] + && (addr=linphone_address_new([(NSString *)valueRef UTF8String]))) { + if (linphone_address_get_username(addr)) { + value = [NSString stringWithCString:linphone_address_get_username(addr) + encoding:[NSString defaultCStringEncoding]]; + } /*else value=@""*/ + } else { + value = [NSString stringWithString:(NSString*) valueRef]; + } + if (addr) linphone_address_destroy(addr); } CFRelease(lDict); CFRelease(lMap); @@ -825,11 +835,33 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C CFRelease(lcMap); int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; - CFTypeRef values[] = { [value copy], kContactSipField }; + CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); ABMultiValueReplaceValueAtIndex(lMap, lDict, index); - CFRelease(lDict); - ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); + ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); + CFRelease(lDict); + /*check if message type is kept or not*/ + lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); + lMap = ABMultiValueCreateMutableCopy(lcMap); + CFRelease(lcMap); + index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); + lDict = ABMultiValueCopyValueAtIndex(lMap,index); + if(!CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { + /*too bad probably a gtalk number, storing uri*/ + NSString* username = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); + LinphoneAddress* address = linphone_core_interpret_url([LinphoneManager getLc] + ,[username UTF8String]); + char* uri = linphone_address_as_string_uri_only(address); + CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; + CFTypeRef values[] = { [NSString stringWithCString:uri encoding:[NSString defaultCStringEncoding]], [LinphoneManager instance].contactSipField }; + CFDictionaryRef lDict2 = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); + ABMultiValueReplaceValueAtIndex(lMap, lDict2, index); + ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); + CFRelease(lDict2); + linphone_address_destroy(address); + ms_free(uri); + } + CFRelease(lDict); CFRelease(lMap); } else if(contactSections[[path section]] == ContactSections_Email) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); diff --git a/Classes/ContactsViewController.h b/Classes/ContactsViewController.h index 00da1d3ad..c21948896 100644 --- a/Classes/ContactsViewController.h +++ b/Classes/ContactsViewController.h @@ -36,8 +36,9 @@ typedef enum _ContactSelectionMode { + (ContactSelectionMode)getSelectionMode; + (void)setAddAddress:(NSString*)address; + (NSString*)getAddAddress; -+ (void)setSipFilter:(BOOL)enable; -+ (BOOL)getSipFilter; +/* define sip filter, can be * or sip domain*/ ++ (void)setSipFilter:(NSString*) domain; ++ (NSString*)getSipFilter; + (void)setEmailFilter:(BOOL)enable; + (BOOL)getEmailFilter; diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index cf23d9d01..342ee059f 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -27,7 +27,7 @@ static ContactSelectionMode sSelectionMode = ContactSelectionModeNone; static NSString* sAddAddress = nil; -static BOOL sSipFilter = FALSE; +static NSString* sSipFilter = nil; static BOOL sEmailFilter = FALSE; + (void)setSelectionMode:(ContactSelectionMode)selectionMode { @@ -52,11 +52,11 @@ static BOOL sEmailFilter = FALSE; return sAddAddress; } -+ (void)setSipFilter:(BOOL)enable { - sSipFilter = enable; ++ (void)setSipFilter:(NSString*)domain { + sSipFilter = domain; } -+ (BOOL)getSipFilter { ++ (NSString*)getSipFilter { return sSipFilter; } @@ -206,7 +206,7 @@ static UICompositeViewDescription *compositeDescription = nil; } if(view == History_Linphone) { - [ContactSelection setSipFilter:TRUE]; + [ContactSelection setSipFilter:@"*"]; [ContactSelection setEmailFilter:FALSE]; [tableController loadData]; linphoneButton.selected = TRUE; diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index b90e36f74..4f9a27d06 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -47,8 +47,6 @@ extern NSString *const kLinphoneLogsUpdate; extern NSString *const kLinphoneSettingsUpdate; extern NSString *const kLinphoneBluetoothAvailabilityUpdate; -extern NSString *const kContactSipField; - typedef enum _NetworkType { network_none = 0, network_2g, @@ -117,6 +115,7 @@ typedef struct _LinphoneManagerSounds { + (NSSet *)unsupportedCodecs; + (NSString *)getUserAgent; + - (void)startLibLinphone; - (void)destroyLibLinphone; - (BOOL)resignActive; @@ -155,6 +154,7 @@ typedef struct _LinphoneManagerSounds { - (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key forSection:(NSString*)section; - (BOOL)lpConfigBoolForKey:(NSString*)key forSection:(NSString*)section; + @property (readonly) FastAddressBook* fastAddressBook; @property Connectivity connectivity; @property (readonly) NetworkType network; @@ -168,6 +168,7 @@ typedef struct _LinphoneManagerSounds { @property (nonatomic, assign) BOOL bluetoothAvailable; @property (nonatomic, assign) BOOL bluetoothEnabled; @property (readonly) ALAssetsLibrary *photoLibrary; +@property (readonly) NSString* contactSipField; @end diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 0cf52f4be..c24357942 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -57,7 +57,7 @@ NSString *const kLinphoneMainViewChange = @"LinphoneMainViewChange"; NSString *const kLinphoneLogsUpdate = @"LinphoneLogsUpdate"; NSString *const kLinphoneSettingsUpdate = @"LinphoneSettingsUpdate"; NSString *const kLinphoneBluetoothAvailabilityUpdate = @"LinphoneBluetoothAvailabilityUpdate"; -NSString *const kContactSipField = @"SIP"; + extern void libmsilbc_init(); @@ -246,6 +246,7 @@ struct codec_name_pref_table codec_pref_table[]={ [self copyDefaultSettings]; pendindCallIdFromRemoteNotif = [[NSMutableArray alloc] init ]; photoLibrary = [[ALAssetsLibrary alloc] init]; + } return self; } @@ -925,6 +926,11 @@ static LinphoneCoreVTable linphonec_vtable = { //go directly to bg mode [self resignActive]; } + + _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; + if (_contactSipField == nil) + _contactSipField =@"SIP"; + // Post event NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"]; diff --git a/Classes/Utils/FastAddressBook.m b/Classes/Utils/FastAddressBook.m index ab5f0b1a3..9831c2812 100644 --- a/Classes/Utils/FastAddressBook.m +++ b/Classes/Utils/FastAddressBook.m @@ -179,7 +179,7 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, i); BOOL add = false; if(CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { - if(CFStringCompare((CFStringRef)kContactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { + if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { add = true; } } else { diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index fb48ebbdf..ec3d25d96 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -47,3 +47,6 @@ stun=stun.linphone.org [video] display_filter_auto_rotate=0 + +[app] +#contact_display_username_only=1 From a0a02062d194f82c77ccd856966218ac527c912f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 31 May 2013 11:25:00 +0200 Subject: [PATCH 086/218] enhanced management of sip uri in contact --- Classes/ChatViewController.m | 2 +- Classes/ContactDetailsTableViewController.m | 34 ++++++++++++++------- Classes/ContactsTableViewController.m | 25 +++++++++++---- Classes/ContactsViewController.m | 7 +++-- Classes/DialerViewController.m | 2 +- Classes/HistoryDetailsViewController.m | 18 ++++++----- Classes/LinphoneManager.h | 2 ++ Classes/LinphoneManager.m | 27 +++++++++++++--- Classes/LinphoneUI/UIMainBar.m | 2 +- Resources/linphonerc-factory | 1 + linphone.xcodeproj/project.pbxproj | 2 ++ 11 files changed, 86 insertions(+), 36 deletions(-) diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m index 453f11927..1bc923dbc 100644 --- a/Classes/ChatViewController.m +++ b/Classes/ChatViewController.m @@ -122,7 +122,7 @@ static UICompositeViewDescription *compositeDescription = nil; if ([[addressField text ]length] == 0) { // if no address is manually set, lauch address book [ContactSelection setSelectionMode:ContactSelectionModeMessage]; [ContactSelection setAddAddress:nil]; - [ContactSelection setSipFilter:@"*"]; + [ContactSelection setSipFilter: [LinphoneManager instance].contactFilter]; [ContactSelection setEmailFilter:FALSE]; [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE]; } else { diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index f43280bdc..7b64c2990 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -201,17 +201,29 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { add = true; } - } else { - add = true; - } - if(add) { - Entry *entry = [[Entry alloc] initWithData:identifier]; - [subArray addObject: entry]; - [entry release]; - } - CFRelease(lDict); - } - CFRelease(lMap); + } else { //check domain + LinphoneAddress* address = linphone_address_new([(NSString*)CFDictionaryGetValue(lDict,kABPersonInstantMessageUsernameKey) UTF8String]); + if (address) { + if ([[ContactSelection getSipFilter] compare:@"*" options:NSCaseInsensitiveSearch] == NSOrderedSame) { + add = true; + } else { + NSString* domain = [NSString stringWithCString:linphone_address_get_domain(address) + encoding:[NSString defaultCStringEncoding]]; + add = [domain compare:[ContactSelection getSipFilter] options:NSCaseInsensitiveSearch] == NSOrderedSame; + } + linphone_address_destroy(address); + } else { + add = false; + } + } + if(add) { + Entry *entry = [[Entry alloc] initWithData:identifier]; + [subArray addObject: entry]; + [entry release]; + } + CFRelease(lDict); + } + CFRelease(lMap); } [dataCache addObject:subArray]; } diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m index 866b247ce..c424b1ea5 100644 --- a/Classes/ContactsTableViewController.m +++ b/Classes/ContactsTableViewController.m @@ -87,13 +87,26 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, i); if(CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { CFStringRef serviceKey = CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey); - if(CFStringCompare((CFStringRef)@"SIP", serviceKey, kCFCompareCaseInsensitive) == 0) { - add = true; - } - } else { - NSString* usernameKey = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); - if([usernameKey hasPrefix:@"sip:"]) { + CFStringRef username = username=CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); + if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, serviceKey, kCFCompareCaseInsensitive) == 0) { add = true; + } else { + add=false; + } + } else { + //check domain + LinphoneAddress* address = linphone_address_new([(NSString*)CFDictionaryGetValue(lDict,kABPersonInstantMessageUsernameKey) UTF8String]); + if (address) { + if ([[ContactSelection getSipFilter] compare:@"*" options:NSCaseInsensitiveSearch] == NSOrderedSame) { + add = true; + } else { + NSString* domain = [NSString stringWithCString:linphone_address_get_domain(address) + encoding:[NSString defaultCStringEncoding]]; + add = [domain compare:[ContactSelection getSipFilter] options:NSCaseInsensitiveSearch] == NSOrderedSame; + } + linphone_address_destroy(address); + } else { + add = false; } } CFRelease(lDict); diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index 342ee059f..d3b54c122 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -53,7 +53,8 @@ static BOOL sEmailFilter = FALSE; } + (void)setSipFilter:(NSString*)domain { - sSipFilter = domain; + [sSipFilter release]; + sSipFilter = [domain retain]; } + (NSString*)getSipFilter { @@ -197,7 +198,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)changeView:(HistoryView)view { if(view == History_All) { - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; [tableController loadData]; allButton.selected = TRUE; @@ -206,7 +207,7 @@ static UICompositeViewDescription *compositeDescription = nil; } if(view == History_Linphone) { - [ContactSelection setSipFilter:@"*"]; + [ContactSelection setSipFilter:[LinphoneManager instance].contactFilter]; [ContactSelection setEmailFilter:FALSE]; [tableController loadData]; linphoneButton.selected = TRUE; diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index 0263d8138..cb28fefaa 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -317,7 +317,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (IBAction)onAddContactClick: (id) event { [ContactSelection setSelectionMode:ContactSelectionModeEdit]; [ContactSelection setAddAddress:[addressField text]]; - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); if(controller != nil) { diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m index 16454d126..ec172566a 100644 --- a/Classes/HistoryDetailsViewController.m +++ b/Classes/HistoryDetailsViewController.m @@ -281,13 +281,15 @@ static UICompositeViewDescription *compositeDescription = nil; // contact name [plainAddressLabel setText:@""]; if (addr != NULL) { - char* lAddress = linphone_address_as_string_uri_only(addr); - if(lAddress != NULL) { - [plainAddressLabel setText:[NSString stringWithUTF8String:lAddress]]; - ms_free(lAddress); - } else { - - } + if ([[LinphoneManager instance] lpConfigBoolForKey:@"contact_display_username_only"]) { + [plainAddressLabel setText:[NSString stringWithUTF8String:linphone_address_get_username(addr)?linphone_address_get_username(addr):""]]; + } else { + char* lAddress = linphone_address_as_string_uri_only(addr); + if(lAddress != NULL) { + [plainAddressLabel setText:[NSString stringWithUTF8String:lAddress]]; + ms_free(lAddress); + } + } } if (addr != NULL) { @@ -327,7 +329,7 @@ static UICompositeViewDescription *compositeDescription = nil; [ContactSelection setAddAddress:[NSString stringWithUTF8String:lAddress]]; [ContactSelection setSelectionMode:ContactSelectionModeEdit]; - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); if(controller != nil) { diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 4f9a27d06..da64fca6c 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -143,6 +143,7 @@ typedef struct _LinphoneManagerSounds { - (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key; - (NSString*)lpConfigStringForKey:(NSString*)key; +- (NSString*)lpConfigStringForKey:(NSString*)key withDefault:(NSString*)value; - (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key forSection:(NSString*)section; - (NSString*)lpConfigStringForKey:(NSString*)key forSection:(NSString*)section; - (void)lpConfigSetInt:(NSInteger)value forKey:(NSString*)key; @@ -169,6 +170,7 @@ typedef struct _LinphoneManagerSounds { @property (nonatomic, assign) BOOL bluetoothEnabled; @property (readonly) ALAssetsLibrary *photoLibrary; @property (readonly) NSString* contactSipField; +@property (readonly,copy) NSString* contactFilter; @end diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index c24357942..882dae154 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -842,6 +842,11 @@ static LinphoneCoreVTable linphonec_vtable = { ,self); linphone_core_set_user_agent(theLinphoneCore,"LinphoneIPhone", [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); + + _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; + if (_contactSipField == nil) + _contactSipField =@"SIP"; + fastAddressBook = [[FastAddressBook alloc] init]; linphone_core_set_root_ca(theLinphoneCore, lRootCa); @@ -926,11 +931,7 @@ static LinphoneCoreVTable linphonec_vtable = { //go directly to bg mode [self resignActive]; } - - _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; - if (_contactSipField == nil) - _contactSipField =@"SIP"; - + // Post event NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"]; @@ -1420,6 +1421,10 @@ static void audioRouteChangeListenerCallback ( - (NSString*)lpConfigStringForKey:(NSString*)key { return [self lpConfigStringForKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]]; } +- (NSString*)lpConfigStringForKey:(NSString*)key withDefault:(NSString*)defaultValue { + NSString* value = [self lpConfigStringForKey:key]; + return value?value:defaultValue; +} - (NSString*)lpConfigStringForKey:(NSString*)key forSection:(NSString *)section { if (!key) return nil; @@ -1504,4 +1509,16 @@ static void audioRouteChangeListenerCallback ( } } //else nop, keep call in paused state } +-(NSString*) contactFilter { + NSString* filter=@"*"; + if ( [self lpConfigBoolForKey:@"contact_filter_on_default_domain"]) { + LinphoneProxyConfig* proxy_cfg; + linphone_core_get_default_proxy(theLinphoneCore, &proxy_cfg); + if (proxy_cfg && linphone_proxy_config_get_addr(proxy_cfg)) { + return [NSString stringWithCString:linphone_proxy_config_get_domain(proxy_cfg) + encoding:[NSString defaultCStringEncoding]]; + } + } + return filter; +} @end diff --git a/Classes/LinphoneUI/UIMainBar.m b/Classes/LinphoneUI/UIMainBar.m index 5e7cbe771..18d750620 100644 --- a/Classes/LinphoneUI/UIMainBar.m +++ b/Classes/LinphoneUI/UIMainBar.m @@ -400,7 +400,7 @@ static NSString * const kDisappearAnimation = @"disappear"; - (IBAction)onContactsClick:(id)event { [ContactSelection setSelectionMode:ContactSelectionModeNone]; [ContactSelection setAddAddress:nil]; - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription]]; } diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index ec3d25d96..cc6384010 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -50,3 +50,4 @@ display_filter_auto_rotate=0 [app] #contact_display_username_only=1 +#contact_filter_on_default_domain=1 diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c029ee1e5..a585e11ca 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5529,6 +5529,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ""; @@ -5567,6 +5568,7 @@ ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; + PROVISIONING_PROFILE = "B0005B58-1160-4269-B1FC-C5BA54ACBA65"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; From bea35b0ac33d9e443d9759c7c51d0962ab0447e4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 31 May 2013 11:25:00 +0200 Subject: [PATCH 087/218] enhanced management of sip uri in contact --- Classes/ChatViewController.m | 2 +- Classes/ContactDetailsTableViewController.m | 34 ++++++++++++++------- Classes/ContactsTableViewController.m | 25 +++++++++++---- Classes/ContactsViewController.m | 7 +++-- Classes/DialerViewController.m | 2 +- Classes/HistoryDetailsViewController.m | 18 ++++++----- Classes/LinphoneManager.h | 2 ++ Classes/LinphoneManager.m | 27 +++++++++++++--- Classes/LinphoneUI/UIMainBar.m | 2 +- Resources/linphonerc-factory | 1 + linphone.xcodeproj/project.pbxproj | 2 ++ 11 files changed, 86 insertions(+), 36 deletions(-) diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m index 453f11927..1bc923dbc 100644 --- a/Classes/ChatViewController.m +++ b/Classes/ChatViewController.m @@ -122,7 +122,7 @@ static UICompositeViewDescription *compositeDescription = nil; if ([[addressField text ]length] == 0) { // if no address is manually set, lauch address book [ContactSelection setSelectionMode:ContactSelectionModeMessage]; [ContactSelection setAddAddress:nil]; - [ContactSelection setSipFilter:@"*"]; + [ContactSelection setSipFilter: [LinphoneManager instance].contactFilter]; [ContactSelection setEmailFilter:FALSE]; [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE]; } else { diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index f43280bdc..7b64c2990 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -201,17 +201,29 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey), kCFCompareCaseInsensitive) == 0) { add = true; } - } else { - add = true; - } - if(add) { - Entry *entry = [[Entry alloc] initWithData:identifier]; - [subArray addObject: entry]; - [entry release]; - } - CFRelease(lDict); - } - CFRelease(lMap); + } else { //check domain + LinphoneAddress* address = linphone_address_new([(NSString*)CFDictionaryGetValue(lDict,kABPersonInstantMessageUsernameKey) UTF8String]); + if (address) { + if ([[ContactSelection getSipFilter] compare:@"*" options:NSCaseInsensitiveSearch] == NSOrderedSame) { + add = true; + } else { + NSString* domain = [NSString stringWithCString:linphone_address_get_domain(address) + encoding:[NSString defaultCStringEncoding]]; + add = [domain compare:[ContactSelection getSipFilter] options:NSCaseInsensitiveSearch] == NSOrderedSame; + } + linphone_address_destroy(address); + } else { + add = false; + } + } + if(add) { + Entry *entry = [[Entry alloc] initWithData:identifier]; + [subArray addObject: entry]; + [entry release]; + } + CFRelease(lDict); + } + CFRelease(lMap); } [dataCache addObject:subArray]; } diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m index 866b247ce..c424b1ea5 100644 --- a/Classes/ContactsTableViewController.m +++ b/Classes/ContactsTableViewController.m @@ -87,13 +87,26 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf CFDictionaryRef lDict = ABMultiValueCopyValueAtIndex(lMap, i); if(CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { CFStringRef serviceKey = CFDictionaryGetValue(lDict, kABPersonInstantMessageServiceKey); - if(CFStringCompare((CFStringRef)@"SIP", serviceKey, kCFCompareCaseInsensitive) == 0) { - add = true; - } - } else { - NSString* usernameKey = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); - if([usernameKey hasPrefix:@"sip:"]) { + CFStringRef username = username=CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); + if(CFStringCompare((CFStringRef)[LinphoneManager instance].contactSipField, serviceKey, kCFCompareCaseInsensitive) == 0) { add = true; + } else { + add=false; + } + } else { + //check domain + LinphoneAddress* address = linphone_address_new([(NSString*)CFDictionaryGetValue(lDict,kABPersonInstantMessageUsernameKey) UTF8String]); + if (address) { + if ([[ContactSelection getSipFilter] compare:@"*" options:NSCaseInsensitiveSearch] == NSOrderedSame) { + add = true; + } else { + NSString* domain = [NSString stringWithCString:linphone_address_get_domain(address) + encoding:[NSString defaultCStringEncoding]]; + add = [domain compare:[ContactSelection getSipFilter] options:NSCaseInsensitiveSearch] == NSOrderedSame; + } + linphone_address_destroy(address); + } else { + add = false; } } CFRelease(lDict); diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index 342ee059f..d3b54c122 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -53,7 +53,8 @@ static BOOL sEmailFilter = FALSE; } + (void)setSipFilter:(NSString*)domain { - sSipFilter = domain; + [sSipFilter release]; + sSipFilter = [domain retain]; } + (NSString*)getSipFilter { @@ -197,7 +198,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)changeView:(HistoryView)view { if(view == History_All) { - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; [tableController loadData]; allButton.selected = TRUE; @@ -206,7 +207,7 @@ static UICompositeViewDescription *compositeDescription = nil; } if(view == History_Linphone) { - [ContactSelection setSipFilter:@"*"]; + [ContactSelection setSipFilter:[LinphoneManager instance].contactFilter]; [ContactSelection setEmailFilter:FALSE]; [tableController loadData]; linphoneButton.selected = TRUE; diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index 0263d8138..cb28fefaa 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -317,7 +317,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (IBAction)onAddContactClick: (id) event { [ContactSelection setSelectionMode:ContactSelectionModeEdit]; [ContactSelection setAddAddress:[addressField text]]; - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); if(controller != nil) { diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m index 16454d126..ec172566a 100644 --- a/Classes/HistoryDetailsViewController.m +++ b/Classes/HistoryDetailsViewController.m @@ -281,13 +281,15 @@ static UICompositeViewDescription *compositeDescription = nil; // contact name [plainAddressLabel setText:@""]; if (addr != NULL) { - char* lAddress = linphone_address_as_string_uri_only(addr); - if(lAddress != NULL) { - [plainAddressLabel setText:[NSString stringWithUTF8String:lAddress]]; - ms_free(lAddress); - } else { - - } + if ([[LinphoneManager instance] lpConfigBoolForKey:@"contact_display_username_only"]) { + [plainAddressLabel setText:[NSString stringWithUTF8String:linphone_address_get_username(addr)?linphone_address_get_username(addr):""]]; + } else { + char* lAddress = linphone_address_as_string_uri_only(addr); + if(lAddress != NULL) { + [plainAddressLabel setText:[NSString stringWithUTF8String:lAddress]]; + ms_free(lAddress); + } + } } if (addr != NULL) { @@ -327,7 +329,7 @@ static UICompositeViewDescription *compositeDescription = nil; [ContactSelection setAddAddress:[NSString stringWithUTF8String:lAddress]]; [ContactSelection setSelectionMode:ContactSelectionModeEdit]; - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; ContactsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE], ContactsViewController); if(controller != nil) { diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 4f9a27d06..da64fca6c 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -143,6 +143,7 @@ typedef struct _LinphoneManagerSounds { - (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key; - (NSString*)lpConfigStringForKey:(NSString*)key; +- (NSString*)lpConfigStringForKey:(NSString*)key withDefault:(NSString*)value; - (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key forSection:(NSString*)section; - (NSString*)lpConfigStringForKey:(NSString*)key forSection:(NSString*)section; - (void)lpConfigSetInt:(NSInteger)value forKey:(NSString*)key; @@ -169,6 +170,7 @@ typedef struct _LinphoneManagerSounds { @property (nonatomic, assign) BOOL bluetoothEnabled; @property (readonly) ALAssetsLibrary *photoLibrary; @property (readonly) NSString* contactSipField; +@property (readonly,copy) NSString* contactFilter; @end diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index c24357942..882dae154 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -842,6 +842,11 @@ static LinphoneCoreVTable linphonec_vtable = { ,self); linphone_core_set_user_agent(theLinphoneCore,"LinphoneIPhone", [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); + + _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; + if (_contactSipField == nil) + _contactSipField =@"SIP"; + fastAddressBook = [[FastAddressBook alloc] init]; linphone_core_set_root_ca(theLinphoneCore, lRootCa); @@ -926,11 +931,7 @@ static LinphoneCoreVTable linphonec_vtable = { //go directly to bg mode [self resignActive]; } - - _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; - if (_contactSipField == nil) - _contactSipField =@"SIP"; - + // Post event NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"]; @@ -1420,6 +1421,10 @@ static void audioRouteChangeListenerCallback ( - (NSString*)lpConfigStringForKey:(NSString*)key { return [self lpConfigStringForKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]]; } +- (NSString*)lpConfigStringForKey:(NSString*)key withDefault:(NSString*)defaultValue { + NSString* value = [self lpConfigStringForKey:key]; + return value?value:defaultValue; +} - (NSString*)lpConfigStringForKey:(NSString*)key forSection:(NSString *)section { if (!key) return nil; @@ -1504,4 +1509,16 @@ static void audioRouteChangeListenerCallback ( } } //else nop, keep call in paused state } +-(NSString*) contactFilter { + NSString* filter=@"*"; + if ( [self lpConfigBoolForKey:@"contact_filter_on_default_domain"]) { + LinphoneProxyConfig* proxy_cfg; + linphone_core_get_default_proxy(theLinphoneCore, &proxy_cfg); + if (proxy_cfg && linphone_proxy_config_get_addr(proxy_cfg)) { + return [NSString stringWithCString:linphone_proxy_config_get_domain(proxy_cfg) + encoding:[NSString defaultCStringEncoding]]; + } + } + return filter; +} @end diff --git a/Classes/LinphoneUI/UIMainBar.m b/Classes/LinphoneUI/UIMainBar.m index 5e7cbe771..18d750620 100644 --- a/Classes/LinphoneUI/UIMainBar.m +++ b/Classes/LinphoneUI/UIMainBar.m @@ -400,7 +400,7 @@ static NSString * const kDisappearAnimation = @"disappear"; - (IBAction)onContactsClick:(id)event { [ContactSelection setSelectionMode:ContactSelectionModeNone]; [ContactSelection setAddAddress:nil]; - [ContactSelection setSipFilter:FALSE]; + [ContactSelection setSipFilter:nil]; [ContactSelection setEmailFilter:FALSE]; [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription]]; } diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index ec3d25d96..cc6384010 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -50,3 +50,4 @@ display_filter_auto_rotate=0 [app] #contact_display_username_only=1 +#contact_filter_on_default_domain=1 diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index c029ee1e5..a585e11ca 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5529,6 +5529,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_ENTITLEMENTS = ""; + CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ""; @@ -5567,6 +5568,7 @@ ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; + PROVISIONING_PROFILE = "B0005B58-1160-4269-B1FC-C5BA54ACBA65"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; From 5db768ff295be819726aad03233221d22d27bd94 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 31 May 2013 18:24:03 +0200 Subject: [PATCH 088/218] update sip stack for new debug traces --- submodules/belle-sip | 2 +- submodules/build/iphone-config.site | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 81b4695a7..a5569489c 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 81b4695a7720331d13a8fe5a7175071b10f52eb7 +Subproject commit a5569489c2fd7f3ffe51ce0098ae49985df7ee79 diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 61b1105b5..3a25e4bfe 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -49,3 +49,7 @@ RANLIB=${SDK_BIN_PATH}/ranlib CPPFLAGS="-Dasm=__asm" OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" +#Force install script to use -C so that header files don't get re-written if not changed. +INSTALL_DATA="ginstall -C" + + From 2339dce28514806069a986f73450c53cc6777d87 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 09:00:48 +0200 Subject: [PATCH 089/218] port sdk to clang except for mssilk & opencore-amr --- submodules/build/builder-iphone-os.mk | 1 + submodules/build/builders.d/mssilk.mk | 4 +- submodules/build/builders.d/opencore-amr.mk | 4 +- submodules/build/builders.d/opus.mk | 12 +++-- submodules/build/builders.d/srtp.mk | 2 +- submodules/build/iphone-config-gcc.site | 51 +++++++++++++++++++++ submodules/build/iphone-config.site | 12 ++--- submodules/externals/speex | 2 +- 8 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 submodules/build/iphone-config-gcc.site diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 605e898c4..d8b1f5938 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -22,6 +22,7 @@ host?=armv7-apple-darwin config_site:=iphone-config.site +config_site_gcc:=iphone-config-gcc.site library_mode:= --disable-shared --enable-static linphone_configure_controls= \ --disable-strict \ diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk index bffd7de26..8c5aad5e4 100644 --- a/submodules/build/builders.d/mssilk.mk +++ b/submodules/build/builders.d/mssilk.mk @@ -30,7 +30,7 @@ $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/co echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir) cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ --enable-static @@ -40,7 +40,7 @@ build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile echo -e "\033[01;32m building silk \033[0m" cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ - CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ make -j1 && make install diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk index dcd2347e9..8ab5abe96 100644 --- a/submodules/build/builders.d/opencore-amr.mk +++ b/submodules/build/builders.d/opencore-amr.mk @@ -31,11 +31,11 @@ $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure: $(BUILDER_SRC_DIR)/$(opencore- $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure mkdir -p $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/ \ - && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${opencore-amr-configure-option} build-opencore-amr: $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) make && make install clean-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean diff --git a/submodules/build/builders.d/opus.mk b/submodules/build/builders.d/opus.mk index 6d905843e..f0e6dcf32 100644 --- a/submodules/build/builders.d/opus.mk +++ b/submodules/build/builders.d/opus.mk @@ -23,10 +23,12 @@ opus_dir?=externals/opus enable_opus?=yes libopus_configure_options=--disable-extra-programs --disable-doc -#ifeq (,$(findstring armv7s,$(host))) -# libopus_configure_options+= --enable-fixed-point -#compilation error with armv7, switching to fpu impl -#endif +ifneq (,$(findstring armv7,$(host))) + libopus_configure_options+= --enable-fixed-point --disable-asm +endif +ifneq (,$(findstring armv7s,$(host))) + libopus_configure_options+= --enable-fixed-point --disable-asm +endif $(BUILDER_SRC_DIR)/$(opus_dir)/configure: @echo -e "\033[01;32m Running autogen for msopus in $(BUILDER_SRC_DIR)/$(opus_dir) \033[0m" @@ -47,7 +49,7 @@ build-opus: $(BUILDER_BUILD_DIR)/$(opus_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(opus_dir) \ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - make -j1 && make install + make && make install else diff --git a/submodules/build/builders.d/srtp.mk b/submodules/build/builders.d/srtp.mk index dd5ebfc22..ee2d6c92a 100644 --- a/submodules/build/builders.d/srtp.mk +++ b/submodules/build/builders.d/srtp.mk @@ -11,7 +11,7 @@ $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/config build-srtp: $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile host_alias=$(host) && . /$(BUILDER_SRC_DIR)/build/$(config_site) && \ - cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a AR=$$AR && make install + cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a AR="$$AR" && make install clean-srtp: -cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make clean diff --git a/submodules/build/iphone-config-gcc.site b/submodules/build/iphone-config-gcc.site new file mode 100644 index 000000000..125bdebcd --- /dev/null +++ b/submodules/build/iphone-config-gcc.site @@ -0,0 +1,51 @@ +# -*- shell-script -*- + +SDK_VERSION_MAJOR=4 +SDK_VERSION=4.0 +MCPU="" +if test "${host_alias}" = "i386-apple-darwin" ; then + PLATFORM=Simulator + ARCH=i386 + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386" + MCPU="" +elif test "${host_alias}" = "armv6-apple-darwin" ; then + ARCH=armv6 + PLATFORM=OS + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" + MCPU="-mcpu=arm1176jzf-s" +elif test "${host_alias}" = "armv7-apple-darwin" ; then + ARCH=armv7 + PLATFORM=OS + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" + MCPU="-mcpu=cortex-a8" +elif test "${host_alias}" = "armv7s-apple-darwin" ; then + ARCH=armv7s + PLATFORM=OS + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" +else + echo "bad host ${host_alias} must be either i386-apple-darwin or armv6-apple-darwin" + exit +fi +echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}" +XCODE_DEV_PATH=`xcode-select -print-path` +#new path with Xcode 4.3: +if test -d ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then + SDK_PATH_LIST=`ls -drt ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` + SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin +else + SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` + SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin +fi + +for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; +echo "Selecting SDK path = ${SYSROOT_PATH}" +COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS" +CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" +OBJC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" +CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS" +LD="${SDK_BIN_PATH}/ld -arch ${ARCH}" +AR=${SDK_BIN_PATH}/ar +RANLIB=${SDK_BIN_PATH}/ranlib + +CPPFLAGS="-Dasm=__asm" +OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 125bdebcd..2c93fa080 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -40,12 +40,12 @@ fi for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; echo "Selecting SDK path = ${SYSROOT_PATH}" COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS" -CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" -OBJC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" -CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS" -LD="${SDK_BIN_PATH}/ld -arch ${ARCH}" -AR=${SDK_BIN_PATH}/ar -RANLIB=${SDK_BIN_PATH}/ranlib +CC="xcrun clang -std=c99 $COMMON_FLAGS" +OBJC="xcrun clang -std=c99 $COMMON_FLAGS" +CXX="xcrun clang++ $COMMON_FLAGS" +LD="xcrun ld -arch ${ARCH}" +AR="xcrun ar" +RANLIB="xcrun ranlib" CPPFLAGS="-Dasm=__asm" OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" diff --git a/submodules/externals/speex b/submodules/externals/speex index e780bd2ce..3c3178184 160000 --- a/submodules/externals/speex +++ b/submodules/externals/speex @@ -1 +1 @@ -Subproject commit e780bd2ce36af4133fd0ff304ab2078f1dacaaf6 +Subproject commit 3c317818481b67e0dd732e5dc045d6b981a8775b From dec3c0bfd178a694af82e65502f1a2c92fb71ce3 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 09:00:48 +0200 Subject: [PATCH 090/218] port sdk to clang except for mssilk & opencore-amr --- submodules/build/builder-iphone-os.mk | 1 + submodules/build/builders.d/mssilk.mk | 4 +- submodules/build/builders.d/opencore-amr.mk | 4 +- submodules/build/builders.d/opus.mk | 12 +++-- submodules/build/builders.d/srtp.mk | 2 +- submodules/build/iphone-config-gcc.site | 51 +++++++++++++++++++++ submodules/build/iphone-config.site | 12 ++--- submodules/externals/speex | 2 +- 8 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 submodules/build/iphone-config-gcc.site diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 605e898c4..d8b1f5938 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -22,6 +22,7 @@ host?=armv7-apple-darwin config_site:=iphone-config.site +config_site_gcc:=iphone-config-gcc.site library_mode:= --disable-shared --enable-static linphone_configure_controls= \ --disable-strict \ diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk index bffd7de26..8c5aad5e4 100644 --- a/submodules/build/builders.d/mssilk.mk +++ b/submodules/build/builders.d/mssilk.mk @@ -30,7 +30,7 @@ $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/co echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir) cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \ - && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ --enable-static @@ -40,7 +40,7 @@ build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile echo -e "\033[01;32m building silk \033[0m" cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ - CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ make -j1 && make install diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk index dcd2347e9..8ab5abe96 100644 --- a/submodules/build/builders.d/opencore-amr.mk +++ b/submodules/build/builders.d/opencore-amr.mk @@ -31,11 +31,11 @@ $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure: $(BUILDER_SRC_DIR)/$(opencore- $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure mkdir -p $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/ \ - && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${opencore-amr-configure-option} build-opencore-amr: $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) make && make install clean-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean diff --git a/submodules/build/builders.d/opus.mk b/submodules/build/builders.d/opus.mk index 6d905843e..f0e6dcf32 100644 --- a/submodules/build/builders.d/opus.mk +++ b/submodules/build/builders.d/opus.mk @@ -23,10 +23,12 @@ opus_dir?=externals/opus enable_opus?=yes libopus_configure_options=--disable-extra-programs --disable-doc -#ifeq (,$(findstring armv7s,$(host))) -# libopus_configure_options+= --enable-fixed-point -#compilation error with armv7, switching to fpu impl -#endif +ifneq (,$(findstring armv7,$(host))) + libopus_configure_options+= --enable-fixed-point --disable-asm +endif +ifneq (,$(findstring armv7s,$(host))) + libopus_configure_options+= --enable-fixed-point --disable-asm +endif $(BUILDER_SRC_DIR)/$(opus_dir)/configure: @echo -e "\033[01;32m Running autogen for msopus in $(BUILDER_SRC_DIR)/$(opus_dir) \033[0m" @@ -47,7 +49,7 @@ build-opus: $(BUILDER_BUILD_DIR)/$(opus_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(opus_dir) \ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - make -j1 && make install + make && make install else diff --git a/submodules/build/builders.d/srtp.mk b/submodules/build/builders.d/srtp.mk index dd5ebfc22..ee2d6c92a 100644 --- a/submodules/build/builders.d/srtp.mk +++ b/submodules/build/builders.d/srtp.mk @@ -11,7 +11,7 @@ $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/config build-srtp: $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile host_alias=$(host) && . /$(BUILDER_SRC_DIR)/build/$(config_site) && \ - cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a AR=$$AR && make install + cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a AR="$$AR" && make install clean-srtp: -cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make clean diff --git a/submodules/build/iphone-config-gcc.site b/submodules/build/iphone-config-gcc.site new file mode 100644 index 000000000..125bdebcd --- /dev/null +++ b/submodules/build/iphone-config-gcc.site @@ -0,0 +1,51 @@ +# -*- shell-script -*- + +SDK_VERSION_MAJOR=4 +SDK_VERSION=4.0 +MCPU="" +if test "${host_alias}" = "i386-apple-darwin" ; then + PLATFORM=Simulator + ARCH=i386 + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386" + MCPU="" +elif test "${host_alias}" = "armv6-apple-darwin" ; then + ARCH=armv6 + PLATFORM=OS + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" + MCPU="-mcpu=arm1176jzf-s" +elif test "${host_alias}" = "armv7-apple-darwin" ; then + ARCH=armv7 + PLATFORM=OS + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" + MCPU="-mcpu=cortex-a8" +elif test "${host_alias}" = "armv7s-apple-darwin" ; then + ARCH=armv7s + PLATFORM=OS + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" +else + echo "bad host ${host_alias} must be either i386-apple-darwin or armv6-apple-darwin" + exit +fi +echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}" +XCODE_DEV_PATH=`xcode-select -print-path` +#new path with Xcode 4.3: +if test -d ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then + SDK_PATH_LIST=`ls -drt ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` + SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin +else + SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` + SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin +fi + +for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; +echo "Selecting SDK path = ${SYSROOT_PATH}" +COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS" +CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" +OBJC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" +CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS" +LD="${SDK_BIN_PATH}/ld -arch ${ARCH}" +AR=${SDK_BIN_PATH}/ar +RANLIB=${SDK_BIN_PATH}/ranlib + +CPPFLAGS="-Dasm=__asm" +OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 125bdebcd..2c93fa080 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -40,12 +40,12 @@ fi for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; echo "Selecting SDK path = ${SYSROOT_PATH}" COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS" -CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" -OBJC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" -CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS" -LD="${SDK_BIN_PATH}/ld -arch ${ARCH}" -AR=${SDK_BIN_PATH}/ar -RANLIB=${SDK_BIN_PATH}/ranlib +CC="xcrun clang -std=c99 $COMMON_FLAGS" +OBJC="xcrun clang -std=c99 $COMMON_FLAGS" +CXX="xcrun clang++ $COMMON_FLAGS" +LD="xcrun ld -arch ${ARCH}" +AR="xcrun ar" +RANLIB="xcrun ranlib" CPPFLAGS="-Dasm=__asm" OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" diff --git a/submodules/externals/speex b/submodules/externals/speex index e780bd2ce..3c3178184 160000 --- a/submodules/externals/speex +++ b/submodules/externals/speex @@ -1 +1 @@ -Subproject commit e780bd2ce36af4133fd0ff304ab2078f1dacaaf6 +Subproject commit 3c317818481b67e0dd732e5dc045d6b981a8775b From adb45ff83e2743fffc08fd04614552c393099b08 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 3 Jun 2013 09:39:28 +0200 Subject: [PATCH 091/218] update belle-sip & linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index a5569489c..030ba21bf 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit a5569489c2fd7f3ffe51ce0098ae49985df7ee79 +Subproject commit 030ba21bfc551856824b17bd6a0396f970407547 diff --git a/submodules/linphone b/submodules/linphone index 2b0381668..0fc6d3fd9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2b03816684178a07b8719d4079dd5dc86b9442a7 +Subproject commit 0fc6d3fd955f99a4418281f19ac3e62bc295b8d7 From adacafb30b24102e6d322fe0354503b17d79010c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 16:13:03 +0200 Subject: [PATCH 092/218] fix contact management + update liblinphone --- Classes/ContactDetailsTableViewController.m | 132 +++++++++++--------- Classes/LinphoneManager.m | 5 +- Resources/linphonerc-factory | 4 +- submodules/linphone | 2 +- 4 files changed, 77 insertions(+), 66 deletions(-) diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 7b64c2990..42332e723 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -253,6 +253,68 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C [self.tableView reloadData]; } +-(Entry *) setOrCreateSipContactEntry:(Entry *)entry withValue:(NSString*)value { + ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); + ABMutableMultiValueRef lMap; + if(lcMap != NULL) { + lMap = ABMultiValueCreateMutableCopy(lcMap); + CFRelease(lcMap); + } else { + lMap = ABMultiValueCreateMutable(kABStringPropertyType); + } + ABMultiValueIdentifier index; + NSError* error = NULL; + + CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; + CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; + CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); + if (entry) { + index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); + ABMultiValueReplaceValueAtIndex(lMap, lDict, index); + } else { + + CFStringRef label = (CFStringRef)[labelArray objectAtIndex:0]; + ABMultiValueAddValueAndLabel(lMap, lDict, label, &index); + } + if (!ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, (CFErrorRef*)&error)) { + [LinphoneLogger log:LinphoneLoggerLog format:@"Can't set contact with value [%@] cause [%@]", value,[error localizedDescription]]; + } else { + if (entry == nil) { + entry = [[Entry alloc] initWithData:index]; + } + CFRelease(lDict); + /*check if message type is kept or not*/ + lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); + lMap = ABMultiValueCreateMutableCopy(lcMap); + CFRelease(lcMap); + index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); + lDict = ABMultiValueCopyValueAtIndex(lMap,index); + if(!CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { + /*too bad probably a gtalk number, storing uri*/ + NSString* username = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); + LinphoneAddress* address = linphone_core_interpret_url([LinphoneManager getLc] + ,[username UTF8String]); + char* uri = linphone_address_as_string_uri_only(address); + CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; + CFTypeRef values[] = { [NSString stringWithCString:uri encoding:[NSString defaultCStringEncoding]], [LinphoneManager instance].contactSipField }; + CFDictionaryRef lDict2 = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); + ABMultiValueReplaceValueAtIndex(lMap, lDict2, index); + if (!ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, (CFErrorRef*)&error)) { + [LinphoneLogger log:LinphoneLoggerLog format:@"Can't set contact with value [%@] cause [%@]", value,[error localizedDescription]]; + } + CFRelease(lDict2); + linphone_address_destroy(address); + ms_free(uri); + } + CFRelease(lMap); + } + CFRelease(lDict); + + return entry; +} +-(void) setSipContactEntry:(Entry *)entry withValue:(NSString*)value { + [self setOrCreateSipContactEntry:entry withValue:value]; +} - (void)addEntry:(UITableView*)tableview section:(NSInteger)section animated:(BOOL)animated { [self addEntry:tableview section:section animated:animated value:@""]; } @@ -287,33 +349,15 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C } CFRelease(lMap); } else if(contactSections[section] == ContactSections_Sip) { - ABMultiValueIdentifier identifier; - ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); - ABMutableMultiValueRef lMap; - if(lcMap != NULL) { - lMap = ABMultiValueCreateMutableCopy(lcMap); - CFRelease(lcMap); - } else { - lMap = ABMultiValueCreateMutable(kABDictionaryPropertyType); - } - CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey }; - CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; - CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 1, NULL, NULL); - CFStringRef label = (CFStringRef)[labelArray objectAtIndex:0]; - if(!ABMultiValueAddValueAndLabel(lMap, lDict, label, &identifier)) { - added = false; - } - CFRelease(lDict); - - if(added && ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, (CFErrorRef*)&error)) { - Entry *entry = [[Entry alloc] initWithData:identifier]; - [sectionArray addObject:entry]; - [entry release]; - } else { - added = false; - [LinphoneLogger log:LinphoneLoggerError format:@"Can't add entry: %@", [error localizedDescription]]; - } - CFRelease(lMap); + Entry *entry = [self setOrCreateSipContactEntry:nil withValue:value]; + if (entry) { + [sectionArray addObject:entry]; + [entry release]; + added=true; + } else { + added=false; + [LinphoneLogger log:LinphoneLoggerError format:@"Can't add entry for value: %@", value]; + } } else if(contactSections[section] == ContactSections_Email) { ABMultiValueIdentifier identifier; ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); @@ -842,39 +886,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C ABRecordSetValue(contact, kABPersonPhoneProperty, lMap, nil); CFRelease(lMap); } else if(contactSections[[path section]] == ContactSections_Sip) { - ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); - ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); - CFRelease(lcMap); - int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); - CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; - CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; - CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); - ABMultiValueReplaceValueAtIndex(lMap, lDict, index); - ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); - CFRelease(lDict); - /*check if message type is kept or not*/ - lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); - lMap = ABMultiValueCreateMutableCopy(lcMap); - CFRelease(lcMap); - index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); - lDict = ABMultiValueCopyValueAtIndex(lMap,index); - if(!CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { - /*too bad probably a gtalk number, storing uri*/ - NSString* username = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); - LinphoneAddress* address = linphone_core_interpret_url([LinphoneManager getLc] - ,[username UTF8String]); - char* uri = linphone_address_as_string_uri_only(address); - CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; - CFTypeRef values[] = { [NSString stringWithCString:uri encoding:[NSString defaultCStringEncoding]], [LinphoneManager instance].contactSipField }; - CFDictionaryRef lDict2 = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); - ABMultiValueReplaceValueAtIndex(lMap, lDict2, index); - ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); - CFRelease(lDict2); - linphone_address_destroy(address); - ms_free(uri); - } - CFRelease(lDict); - CFRelease(lMap); + [self setSipContactEntry:entry withValue:value]; } else if(contactSections[[path section]] == ContactSections_Email) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 882dae154..bd1cdf406 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -842,10 +842,9 @@ static LinphoneCoreVTable linphonec_vtable = { ,self); linphone_core_set_user_agent(theLinphoneCore,"LinphoneIPhone", [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); + [_contactSipField release]; + _contactSipField = [[self lpConfigStringForKey:@"contact_im_type_value" withDefault:@"SIP"] retain]; - _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; - if (_contactSipField == nil) - _contactSipField =@"SIP"; fastAddressBook = [[FastAddressBook alloc] init]; diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index cc6384010..92e740b16 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -49,5 +49,5 @@ stun=stun.linphone.org display_filter_auto_rotate=0 [app] -#contact_display_username_only=1 -#contact_filter_on_default_domain=1 +contact_display_username_only=1 +contact_filter_on_default_domain=1 diff --git a/submodules/linphone b/submodules/linphone index 5355e3775..f1eb0ec07 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5355e37750d8c32fbd978161966ba80390a8bec0 +Subproject commit f1eb0ec07fda4221722ef1de098824299c85fd0a From 54f89df2084a610afa4ef104c9180525d69e61cf Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 16:13:03 +0200 Subject: [PATCH 093/218] fix contact management + update liblinphone --- Classes/ContactDetailsTableViewController.m | 132 +++++++++++--------- Classes/LinphoneManager.m | 5 +- Resources/linphonerc-factory | 4 +- submodules/linphone | 2 +- 4 files changed, 77 insertions(+), 66 deletions(-) diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 7b64c2990..42332e723 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -253,6 +253,68 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C [self.tableView reloadData]; } +-(Entry *) setOrCreateSipContactEntry:(Entry *)entry withValue:(NSString*)value { + ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); + ABMutableMultiValueRef lMap; + if(lcMap != NULL) { + lMap = ABMultiValueCreateMutableCopy(lcMap); + CFRelease(lcMap); + } else { + lMap = ABMultiValueCreateMutable(kABStringPropertyType); + } + ABMultiValueIdentifier index; + NSError* error = NULL; + + CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; + CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; + CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); + if (entry) { + index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); + ABMultiValueReplaceValueAtIndex(lMap, lDict, index); + } else { + + CFStringRef label = (CFStringRef)[labelArray objectAtIndex:0]; + ABMultiValueAddValueAndLabel(lMap, lDict, label, &index); + } + if (!ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, (CFErrorRef*)&error)) { + [LinphoneLogger log:LinphoneLoggerLog format:@"Can't set contact with value [%@] cause [%@]", value,[error localizedDescription]]; + } else { + if (entry == nil) { + entry = [[Entry alloc] initWithData:index]; + } + CFRelease(lDict); + /*check if message type is kept or not*/ + lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); + lMap = ABMultiValueCreateMutableCopy(lcMap); + CFRelease(lcMap); + index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); + lDict = ABMultiValueCopyValueAtIndex(lMap,index); + if(!CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { + /*too bad probably a gtalk number, storing uri*/ + NSString* username = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); + LinphoneAddress* address = linphone_core_interpret_url([LinphoneManager getLc] + ,[username UTF8String]); + char* uri = linphone_address_as_string_uri_only(address); + CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; + CFTypeRef values[] = { [NSString stringWithCString:uri encoding:[NSString defaultCStringEncoding]], [LinphoneManager instance].contactSipField }; + CFDictionaryRef lDict2 = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); + ABMultiValueReplaceValueAtIndex(lMap, lDict2, index); + if (!ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, (CFErrorRef*)&error)) { + [LinphoneLogger log:LinphoneLoggerLog format:@"Can't set contact with value [%@] cause [%@]", value,[error localizedDescription]]; + } + CFRelease(lDict2); + linphone_address_destroy(address); + ms_free(uri); + } + CFRelease(lMap); + } + CFRelease(lDict); + + return entry; +} +-(void) setSipContactEntry:(Entry *)entry withValue:(NSString*)value { + [self setOrCreateSipContactEntry:entry withValue:value]; +} - (void)addEntry:(UITableView*)tableview section:(NSInteger)section animated:(BOOL)animated { [self addEntry:tableview section:section animated:animated value:@""]; } @@ -287,33 +349,15 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C } CFRelease(lMap); } else if(contactSections[section] == ContactSections_Sip) { - ABMultiValueIdentifier identifier; - ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); - ABMutableMultiValueRef lMap; - if(lcMap != NULL) { - lMap = ABMultiValueCreateMutableCopy(lcMap); - CFRelease(lcMap); - } else { - lMap = ABMultiValueCreateMutable(kABDictionaryPropertyType); - } - CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey }; - CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; - CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 1, NULL, NULL); - CFStringRef label = (CFStringRef)[labelArray objectAtIndex:0]; - if(!ABMultiValueAddValueAndLabel(lMap, lDict, label, &identifier)) { - added = false; - } - CFRelease(lDict); - - if(added && ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, (CFErrorRef*)&error)) { - Entry *entry = [[Entry alloc] initWithData:identifier]; - [sectionArray addObject:entry]; - [entry release]; - } else { - added = false; - [LinphoneLogger log:LinphoneLoggerError format:@"Can't add entry: %@", [error localizedDescription]]; - } - CFRelease(lMap); + Entry *entry = [self setOrCreateSipContactEntry:nil withValue:value]; + if (entry) { + [sectionArray addObject:entry]; + [entry release]; + added=true; + } else { + added=false; + [LinphoneLogger log:LinphoneLoggerError format:@"Can't add entry for value: %@", value]; + } } else if(contactSections[section] == ContactSections_Email) { ABMultiValueIdentifier identifier; ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); @@ -842,39 +886,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C ABRecordSetValue(contact, kABPersonPhoneProperty, lMap, nil); CFRelease(lMap); } else if(contactSections[[path section]] == ContactSections_Sip) { - ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); - ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); - CFRelease(lcMap); - int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); - CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; - CFTypeRef values[] = { [value copy], [LinphoneManager instance].contactSipField }; - CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); - ABMultiValueReplaceValueAtIndex(lMap, lDict, index); - ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); - CFRelease(lDict); - /*check if message type is kept or not*/ - lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); - lMap = ABMultiValueCreateMutableCopy(lcMap); - CFRelease(lcMap); - index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]); - lDict = ABMultiValueCopyValueAtIndex(lMap,index); - if(!CFDictionaryContainsKey(lDict, kABPersonInstantMessageServiceKey)) { - /*too bad probably a gtalk number, storing uri*/ - NSString* username = CFDictionaryGetValue(lDict, kABPersonInstantMessageUsernameKey); - LinphoneAddress* address = linphone_core_interpret_url([LinphoneManager getLc] - ,[username UTF8String]); - char* uri = linphone_address_as_string_uri_only(address); - CFStringRef keys[] = { kABPersonInstantMessageUsernameKey, kABPersonInstantMessageServiceKey}; - CFTypeRef values[] = { [NSString stringWithCString:uri encoding:[NSString defaultCStringEncoding]], [LinphoneManager instance].contactSipField }; - CFDictionaryRef lDict2 = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL); - ABMultiValueReplaceValueAtIndex(lMap, lDict2, index); - ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); - CFRelease(lDict2); - linphone_address_destroy(address); - ms_free(uri); - } - CFRelease(lDict); - CFRelease(lMap); + [self setSipContactEntry:entry withValue:value]; } else if(contactSections[[path section]] == ContactSections_Email) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 882dae154..bd1cdf406 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -842,10 +842,9 @@ static LinphoneCoreVTable linphonec_vtable = { ,self); linphone_core_set_user_agent(theLinphoneCore,"LinphoneIPhone", [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); + [_contactSipField release]; + _contactSipField = [[self lpConfigStringForKey:@"contact_im_type_value" withDefault:@"SIP"] retain]; - _contactSipField = [self lpConfigStringForKey:@"contact_im_type_value"]; - if (_contactSipField == nil) - _contactSipField =@"SIP"; fastAddressBook = [[FastAddressBook alloc] init]; diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index cc6384010..92e740b16 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -49,5 +49,5 @@ stun=stun.linphone.org display_filter_auto_rotate=0 [app] -#contact_display_username_only=1 -#contact_filter_on_default_domain=1 +contact_display_username_only=1 +contact_filter_on_default_domain=1 diff --git a/submodules/linphone b/submodules/linphone index 5355e3775..f1eb0ec07 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5355e37750d8c32fbd978161966ba80390a8bec0 +Subproject commit f1eb0ec07fda4221722ef1de098824299c85fd0a From fd20018d6b186e2da54874bebf46fb808470288f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 16:17:19 +0200 Subject: [PATCH 094/218] fix wrong linphonerc-factory --- Resources/linphonerc-factory | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index 92e740b16..cc6384010 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -49,5 +49,5 @@ stun=stun.linphone.org display_filter_auto_rotate=0 [app] -contact_display_username_only=1 -contact_filter_on_default_domain=1 +#contact_display_username_only=1 +#contact_filter_on_default_domain=1 From cd6a69029276f82e38e634bc8442d5ce06137abe Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 16:17:19 +0200 Subject: [PATCH 095/218] fix wrong linphonerc-factory --- Resources/linphonerc-factory | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index 92e740b16..cc6384010 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -49,5 +49,5 @@ stun=stun.linphone.org display_filter_auto_rotate=0 [app] -contact_display_username_only=1 -contact_filter_on_default_domain=1 +#contact_display_username_only=1 +#contact_filter_on_default_domain=1 From 8227e6f49b5a7024c7c8451c1e6d1ac6fec39bb9 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 16:24:24 +0200 Subject: [PATCH 096/218] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index f1eb0ec07..638cff943 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f1eb0ec07fda4221722ef1de098824299c85fd0a +Subproject commit 638cff9433c3787a74b2db79aebc19092d6323b4 From 7112dac9d556c07b5a4aa55c16d252f9e78f93b4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 3 Jun 2013 16:24:24 +0200 Subject: [PATCH 097/218] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index f1eb0ec07..638cff943 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f1eb0ec07fda4221722ef1de098824299c85fd0a +Subproject commit 638cff9433c3787a74b2db79aebc19092d6323b4 From 30e018ef26f3a3a9c5959cf10fba1881ed95df3e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 6 Jun 2013 15:57:00 +0200 Subject: [PATCH 098/218] Update linphone submodule for VP8 fixes. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 638cff943..d1dc89b52 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 638cff9433c3787a74b2db79aebc19092d6323b4 +Subproject commit d1dc89b52078c002eeb2686179d70fe80c6f6ef2 From e5fe5d0e409af80eca01fe345c007f06bf1c0e89 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 6 Jun 2013 22:13:39 +0200 Subject: [PATCH 099/218] update linphone & sipstack (updated info api and new subscribe api) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 89aa5d6a1..fbf2b34da 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 89aa5d6a1b9957b73696f250043b799b462a5c0f +Subproject commit fbf2b34daef2273ebf8c415410f9a2715d85fa6c diff --git a/submodules/linphone b/submodules/linphone index 6e3c6551a..59b86f49c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6e3c6551a9cac6d231910420386e9666a0a30c0b +Subproject commit 59b86f49ccce0c3984e1619886dc192c3c6b504b From 83e8469d0e1da4e27eae22da927212e86936d4a8 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 7 Jun 2013 16:23:29 +0200 Subject: [PATCH 100/218] update linphone with better opus integration --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index d1dc89b52..2cc690382 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d1dc89b52078c002eeb2686179d70fe80c6f6ef2 +Subproject commit 2cc690382793142801ddb7480ee7bb6dd3082de7 From ee5994f0d9ddc06836e98987469ead3576447863 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 11 Jun 2013 10:30:24 +0200 Subject: [PATCH 101/218] update adhoc profile --- linphone.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index a585e11ca..9696f525c 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5568,7 +5568,7 @@ ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; - PROVISIONING_PROFILE = "B0005B58-1160-4269-B1FC-C5BA54ACBA65"; + PROVISIONING_PROFILE = "FF1878F5-E100-4D05-A037-83ADD9D10BC8"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; From a41210d388451133132a83a45cb079caea0e4e3c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 11 Jun 2013 22:39:39 +0200 Subject: [PATCH 102/218] update submodules (add contact in REFER) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index fbf2b34da..bf18b75f1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit fbf2b34daef2273ebf8c415410f9a2715d85fa6c +Subproject commit bf18b75f10bfb50459d916cea614a887bbdc8570 diff --git a/submodules/linphone b/submodules/linphone index 59b86f49c..9e60a96b1 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 59b86f49ccce0c3984e1619886dc192c3c6b504b +Subproject commit 9e60a96b18b385d9a92193abe372a6314765fda5 From 84a8e87c0dd2399394e0fd78dd50e192afb8d43b Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 14 Jun 2013 15:04:09 +0200 Subject: [PATCH 103/218] liblinphone:fix wrong sampling rate at first startup --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2cc690382..4b89219db 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2cc690382793142801ddb7480ee7bb6dd3082de7 +Subproject commit 4b89219dba3706ad4892e848602a52beb79ade96 From 86699c4bb77bdd8d9fb497fc8f9aedd381e63700 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 14 Jun 2013 17:15:11 +0200 Subject: [PATCH 104/218] fix msiounit --- Classes/LinphoneManager.m | 4 +- linphone.xcodeproj/project.pbxproj | 37 +- submodules/belle-sip | 2 +- submodules/build/Makefile | 3 +- .../liblinphone.xcodeproj/project.pbxproj | 794 ++++++++++++++---- submodules/linphone | 2 +- 6 files changed, 621 insertions(+), 221 deletions(-) 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 From 5169e0aeeaa0186eb9b57dd18c5e381365f79cac Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 20 Jun 2013 13:13:52 +0200 Subject: [PATCH 105/218] update liblinphone (allow contact change during call update) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 4b89219db..3bff0cef8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4b89219dba3706ad4892e848602a52beb79ade96 +Subproject commit 3bff0cef821cf8f8c42fc78aa30917469d7bf0b2 From 8d90c785c3857724e954d9ee2cdb018ada3db10b Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 20 Jun 2013 12:02:42 +0200 Subject: [PATCH 106/218] Add libxml2 dependency. --- .gitmodules | 3 +++ submodules/externals/libxml2 | 1 + 2 files changed, 4 insertions(+) create mode 160000 submodules/externals/libxml2 diff --git a/.gitmodules b/.gitmodules index 8fda1e943..be0985f80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -61,3 +61,6 @@ [submodule "submodules/externals/opus"] path = submodules/externals/opus url = git://git.opus-codec.org/opus.git +[submodule "submodules/externals/libxml2"] + path = submodules/externals/libxml2 + url = git://git.gnome.org/libxml2 diff --git a/submodules/externals/libxml2 b/submodules/externals/libxml2 new file mode 160000 index 000000000..c943f708f --- /dev/null +++ b/submodules/externals/libxml2 @@ -0,0 +1 @@ +Subproject commit c943f708f1853de4eb15e5a94cf0b35d108da87a From b7dc49f290878558d041c1e3f71acbd4b4c03f70 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 20 Jun 2013 14:44:29 +0200 Subject: [PATCH 107/218] Compile libxml2. --- submodules/build/builder-iphone-os.mk | 8 +-- submodules/build/builders.d/libxml2.mk | 63 +++++++++++++++++++++++ submodules/build/builders.d/libxml2.patch | 13 +++++ 3 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 submodules/build/builders.d/libxml2.mk create mode 100644 submodules/build/builders.d/libxml2.patch diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 5798a0bb9..d96a92106 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -113,18 +113,18 @@ veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) -.NOTPARALLEL build-linphone: init build-polarssl build-libantlr build-belle-sip build-srtp build-zrtpcpp build-speex build-libgsm build-ffmpeg build-libvpx build-opus detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init build-polarssl build-libantlr build-belle-sip build-srtp build-zrtpcpp build-speex build-libgsm build-ffmpeg build-libvpx build-opus build-libxml2 detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/ -clean-linphone: clean-libantlr clean-polarssl clean-belle-sip clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 clean-opus +clean-linphone: clean-libantlr clean-polarssl clean-belle-sip clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 clean-opus clean-libxml2 cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-libantlr veryclean-polarssl veryclean-belle-sip veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx veryclean-opus +veryclean-linphone: veryclean-libantlr veryclean-polarssl veryclean-belle-sip veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx veryclean-opus veryclean-libxml2 #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-libantlr clean-makefile-polarssl clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk clean-makefile-opus +clean-makefile-linphone: clean-makefile-libantlr clean-makefile-polarssl clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk clean-makefile-opus clean-makefile-libxml2 cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile diff --git a/submodules/build/builders.d/libxml2.mk b/submodules/build/builders.d/libxml2.mk new file mode 100644 index 000000000..8b3e467ef --- /dev/null +++ b/submodules/build/builders.d/libxml2.mk @@ -0,0 +1,63 @@ +############################################################################ +# libxml2.mk +# Copyright (C) 2013 Belledonne Communications,Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################ +libxml2_dir?=externals/libxml2 + +libxml2_configure_options= \ + --enable-static --disable-shared \ + --disable-rebuild-docs --with-python=no + +$(BUILDER_SRC_DIR)/$(libxml2_dir)/patched.stamp: + cd $(BUILDER_SRC_DIR)/$(libxml2_dir) \ + && git apply $(BUILDER_SRC_DIR)/build/builders.d/libxml2.patch \ + && touch $@ + +$(BUILDER_SRC_DIR)/$(libxml2_dir)/configure: $(BUILDER_SRC_DIR)/$(libxml2_dir)/patched.stamp + @echo -e "\033[01;32m Running autogen for libxml2 in $(BUILDER_SRC_DIR)/$(libxml2_dir) \033[0m" + cd $(BUILDER_SRC_DIR)/$(libxml2_dir) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) NOCONFIGURE=1 \ + $(BUILDER_SRC_DIR)/$(libxml2_dir)/autogen.sh -prefix=$(prefix) --host=$(host) ${library_mode} + +$(BUILDER_BUILD_DIR)/$(libxml2_dir)/Makefile: $(BUILDER_SRC_DIR)/$(libxml2_dir)/configure + @echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(libxml2_dir) \033[0m" + mkdir -p $(BUILDER_BUILD_DIR)/$(libxml2_dir) + cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + $(BUILDER_SRC_DIR)/$(libxml2_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} $(libxml2_configure_options) + +build-libxml2: $(BUILDER_BUILD_DIR)/$(libxml2_dir)/Makefile + @echo -e "\033[01;32m building libxml2 \033[0m" + cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) \ + && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + make && make install + +clean-libxml2: + -cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) && make clean + +veryclean-libxml2: + -cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) && make distclean + rm -f $(BUILDER_SRC_DIR)/$(libxml2_dir)/configure + cd $(BUILDER_SRC_DIR)/$(libxml2_dir) \ + && git checkout configure.in \ + && rm -f patched.stamp + +clean-makefile-libxml2: + -cd $(BUILDER_BUILD_DIR)/$(libxml2_dir) && rm -f Makefile diff --git a/submodules/build/builders.d/libxml2.patch b/submodules/build/builders.d/libxml2.patch new file mode 100644 index 000000000..eb2ac3cd9 --- /dev/null +++ b/submodules/build/builders.d/libxml2.patch @@ -0,0 +1,13 @@ +diff --git a/configure.in b/configure.in +index 0fb4983..a5f86ca 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.59) + AC_INIT(entities.c) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST + From 630d881f350baa6b67cb89de3ffcc11bbf63cbe0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 20 Jun 2013 15:43:32 +0200 Subject: [PATCH 108/218] Update belle-sip and linphone submodules. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 8b7546d3b..3d18c79dd 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 8b7546d3bebce04c9c67457bfe44805e0b87caee +Subproject commit 3d18c79dd5c33b748b1952d3743615450e82ae6b diff --git a/submodules/linphone b/submodules/linphone index f55699af8..cc45df485 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f55699af8e9a6a0c595fbbc1adac612f96b48fc9 +Subproject commit cc45df4858dec37c9c9c733bfedc83b825b85e5e From 0f45d11d65ecd47768f4127cc95217b25b4ca19f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 20 Jun 2013 17:31:52 +0200 Subject: [PATCH 109/218] Add libxml2 to xcode project. --- linphone.xcodeproj/project.pbxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 29e3052be..e8ea236f2 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 15017E701773578400784ACB /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15017E6F1773578400784ACB /* libxml2.a */; }; + 15017E71177357C500784ACB /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15017E6F1773578400784ACB /* libxml2.a */; }; 1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; 1599105416F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; 1599105516F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */; }; @@ -1408,6 +1410,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 15017E6F1773578400784ACB /* libxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxml2.a; path = "liblinphone-sdk/apple-darwin/lib/libxml2.a"; sourceTree = ""; }; 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default_landscape.png; path = Resources/route_bluetooth_off_default_landscape.png; sourceTree = ""; }; 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_disabled_landscape.png; path = Resources/route_bluetooth_off_disabled_landscape.png; sourceTree = ""; }; 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_over_landscape.png; path = Resources/route_bluetooth_off_over_landscape.png; sourceTree = ""; }; @@ -2419,6 +2422,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 15017E701773578400784ACB /* libxml2.a in Frameworks */, 22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */, 57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */, 223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */, @@ -2478,6 +2482,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 15017E71177357C500784ACB /* libxml2.a in Frameworks */, 2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */, 2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */, D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */, @@ -2978,6 +2983,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 15017E6F1773578400784ACB /* libxml2.a */, 57B0E35F173C010400A476B8 /* libpolarssl.a */, 223CA7E416D9255800EF1BEC /* libantlr3c.a */, 223CA7E516D9255800EF1BEC /* libbellesip.a */, From d23851a3f1423a3bec47190a87394baf1db9af9f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 20 Jun 2013 17:37:59 +0200 Subject: [PATCH 110/218] Deactivate iconv and zlib to compile libxml2. --- submodules/build/builders.d/libxml2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/build/builders.d/libxml2.mk b/submodules/build/builders.d/libxml2.mk index 8b3e467ef..da3e18cd3 100644 --- a/submodules/build/builders.d/libxml2.mk +++ b/submodules/build/builders.d/libxml2.mk @@ -23,7 +23,7 @@ libxml2_dir?=externals/libxml2 libxml2_configure_options= \ --enable-static --disable-shared \ - --disable-rebuild-docs --with-python=no + --disable-rebuild-docs --with-iconv=no --with-python=no --with-zlib=no $(BUILDER_SRC_DIR)/$(libxml2_dir)/patched.stamp: cd $(BUILDER_SRC_DIR)/$(libxml2_dir) \ From 3c27b5c8f0bd679748032722c0295f88fc2d7f57 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 24 Jun 2013 12:06:18 +0200 Subject: [PATCH 111/218] Update belle-sip submodule for presence fixes. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index cc45df485..96ea72f76 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit cc45df4858dec37c9c9c733bfedc83b825b85e5e +Subproject commit 96ea72f762f093e76ae30eb8b9843b8b6b6586ba From d136ff679732fba7e07a4bd32e4b41335566b82b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 25 Jun 2013 14:16:20 +0200 Subject: [PATCH 112/218] update liblinphone for out of subscribe notify support --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 96ea72f76..fae029b18 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 96ea72f762f093e76ae30eb8b9843b8b6b6586ba +Subproject commit fae029b1874cd341f0a5e5c7886a9dc9db5bbbe9 From 9848b312ce15f9cd951591f80a92ec4f59fd88ac Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 26 Jun 2013 11:26:04 +0200 Subject: [PATCH 113/218] disable amrvs7 build from debug target fix liblinphone.proj --- linphone.xcodeproj/project.pbxproj | 1 + .../liblinphone.xcodeproj/project.pbxproj | 142 ++++++++++-------- 2 files changed, 83 insertions(+), 60 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 29e3052be..fb86b1276 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5442,6 +5442,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = armv7; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ""; diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 812f12d7f..7181d6b5f 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -7,6 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 2206D2D3177AC70900C40726 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2C6177AC70900C40726 /* InfoPlist.strings */; }; + 2206D2D4177AC70900C40726 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2C8177AC70900C40726 /* MainWindow.xib */; }; + 2206D2D5177AC70900C40726 /* mediastreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2CA177AC70900C40726 /* mediastreamViewController.xib */; }; + 2206D2D6177AC70900C40726 /* mediastream-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2CC177AC70900C40726 /* mediastream-Info.plist */; }; + 2206D2D7177AC70900C40726 /* mediastreamAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2206D2CF177AC70900C40726 /* mediastreamAppDelegate.m */; }; + 2206D2D8177AC70900C40726 /* mediastreamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2206D2D1177AC70900C40726 /* mediastreamViewController.m */; }; + 2206D2D9177AC70900C40726 /* mediastream.c in Sources */ = {isa = PBXBuildFile; fileRef = 2206D2D2177AC70900C40726 /* mediastream.c */; }; + 2206D2DE177ACD3800C40726 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22C8D0E91769F8FF00DAFB4E /* libmediastreamer_voip.a */; }; + 2206D2E1177ACF5700C40726 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2E0177ACF5700C40726 /* nowebcamCIF.jpg */; }; 220ED19A13A8F87700AC21E0 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19713A8F87700AC21E0 /* libspeexdsp.a */; }; 220ED19B13A8F87700AC21E0 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19813A8F87700AC21E0 /* libspeex.a */; }; 220ED19C13A8F87700AC21E0 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19913A8F87700AC21E0 /* libortp.a */; }; @@ -556,12 +565,6 @@ 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 */; }; - 22DD19F713A8DFA70018ECD4 /* mediastream.c in Sources */ = {isa = PBXBuildFile; fileRef = 22DD19E713A8D82C0018ECD4 /* mediastream.c */; }; - 22DD21AE13A8E3310018ECD4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A113A8E3310018ECD4 /* InfoPlist.strings */; }; - 22DD21AF13A8E3310018ECD4 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A313A8E3310018ECD4 /* MainWindow.xib */; }; - 22DD21B013A8E3310018ECD4 /* mediastreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */; }; - 22DD21B313A8E3310018ECD4 /* mediastreamAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */; }; - 22DD21B413A8E3310018ECD4 /* mediastreamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */; }; 7014533C13FA7ECA00A01D86 /* zrtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 7014533B13FA7ECA00A01D86 /* zrtp.h */; }; 7066FC0A13E830B800EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0913E830B800EFC6DC /* libvpx.a */; }; 70E542EE13E147C7002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542ED13E147C7002BA2C0 /* OpenGLES.framework */; }; @@ -596,6 +599,13 @@ /* End PBXBuildRule section */ /* Begin PBXContainerItemProxy section */ + 2206D2DA177ACCE400C40726 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 22C8D0401769F8FF00DAFB4E; + remoteInfo = libmediastreamer_voip; + }; 225D65C61521C09D008B2E81 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; @@ -635,6 +645,17 @@ /* Begin PBXFileReference section */ 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; + 2206D2C7177AC70900C40726 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 2206D2C9177AC70900C40726 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = ""; }; + 2206D2CB177AC70900C40726 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/mediastreamViewController.xib; sourceTree = ""; }; + 2206D2CC177AC70900C40726 /* mediastream-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "mediastream-Info.plist"; sourceTree = ""; }; + 2206D2CD177AC70900C40726 /* mediastream-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mediastream-Prefix.pch"; sourceTree = ""; }; + 2206D2CE177AC70900C40726 /* mediastreamAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamAppDelegate.h; sourceTree = ""; }; + 2206D2CF177AC70900C40726 /* mediastreamAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamAppDelegate.m; sourceTree = ""; }; + 2206D2D0177AC70900C40726 /* mediastreamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamViewController.h; sourceTree = ""; }; + 2206D2D1177AC70900C40726 /* mediastreamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamViewController.m; sourceTree = ""; }; + 2206D2D2177AC70900C40726 /* mediastream.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; name = mediastream.c; path = tools/mediastream.c; sourceTree = ""; }; + 2206D2E0177ACF5700C40726 /* nowebcamCIF.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = nowebcamCIF.jpg; path = "../liblinphone-sdk/apple-darwin/share/images/nowebcamCIF.jpg"; sourceTree = ""; }; 220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; 220ED19813A8F87700AC21E0 /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = ""; }; 220ED19913A8F87700AC21E0 /* libortp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libortp.a; path = "../liblinphone-sdk/apple-darwin/lib/libortp.a"; sourceTree = ""; }; @@ -902,16 +923,6 @@ 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; }; 22DD19C313A8D7FA0018ECD4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 22DD19E713A8D82C0018ECD4 /* mediastream.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = mediastream.c; sourceTree = ""; }; - 22DD21A213A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 22DD21A413A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = ""; }; - 22DD21A613A8E3310018ECD4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/mediastreamViewController.xib; sourceTree = ""; }; - 22DD21A813A8E3310018ECD4 /* mediastream-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "mediastream-Info.plist"; sourceTree = ""; }; - 22DD21A913A8E3310018ECD4 /* mediastream-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "mediastream-Prefix.pch"; sourceTree = ""; }; - 22DD21AA13A8E3310018ECD4 /* mediastreamAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamAppDelegate.h; sourceTree = ""; }; - 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamAppDelegate.m; sourceTree = ""; }; - 22DD21AC13A8E3310018ECD4 /* mediastreamViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mediastreamViewController.h; sourceTree = ""; }; - 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mediastreamViewController.m; sourceTree = ""; }; 7014533B13FA7ECA00A01D86 /* zrtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zrtp.h; sourceTree = ""; }; 7014533D13FA841E00A01D86 /* zrtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zrtp.c; sourceTree = ""; }; 7066FC0913E830B800EFC6DC /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "../liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = ""; }; @@ -965,6 +976,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2206D2DE177ACD3800C40726 /* libmediastreamer_voip.a in Frameworks */, 22AF73C01753F3E100BE8398 /* libopus.a in Frameworks */, 225D65CD1521C19A008B2E81 /* libortp.a in Frameworks */, 225D65CC1521C195008B2E81 /* libmediastreamer_base.a in Frameworks */, @@ -1052,6 +1064,7 @@ 32C88DFF0371C24200C91783 /* Other Sources */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, + 2206D2DF177ACF0A00C40726 /* Resources */, ); name = liblinphone; sourceTree = ""; @@ -1073,6 +1086,31 @@ name = Classes; sourceTree = ""; }; + 2206D2C5177AC70900C40726 /* ios */ = { + isa = PBXGroup; + children = ( + 2206D2C6177AC70900C40726 /* InfoPlist.strings */, + 2206D2C8177AC70900C40726 /* MainWindow.xib */, + 2206D2CA177AC70900C40726 /* mediastreamViewController.xib */, + 2206D2CC177AC70900C40726 /* mediastream-Info.plist */, + 2206D2CD177AC70900C40726 /* mediastream-Prefix.pch */, + 2206D2CE177AC70900C40726 /* mediastreamAppDelegate.h */, + 2206D2CF177AC70900C40726 /* mediastreamAppDelegate.m */, + 2206D2D0177AC70900C40726 /* mediastreamViewController.h */, + 2206D2D1177AC70900C40726 /* mediastreamViewController.m */, + ); + name = ios; + path = tools/ios; + sourceTree = ""; + }; + 2206D2DF177ACF0A00C40726 /* Resources */ = { + isa = PBXGroup; + children = ( + 2206D2E0177ACF5700C40726 /* nowebcamCIF.jpg */, + ); + name = Resources; + sourceTree = ""; + }; 222CA4CE11F6CF1900621220 /* oRTP */ = { isa = PBXGroup; children = ( @@ -1086,9 +1124,10 @@ 222CA4CF11F6CF2000621220 /* mediastreamer2 */ = { isa = PBXGroup; children = ( + 2206D2C5177AC70900C40726 /* ios */, + 2206D2D2177AC70900C40726 /* mediastream.c */, 22405EE1160066C700B92522 /* voipdescs.h */, 22405EDC160065C200B92522 /* basedescs.h */, - 22DD19E013A8D82C0018ECD4 /* tests */, 222CA5B811F6CF7600621220 /* include */, 222CA5DC11F6CF7600621220 /* src */, ); @@ -1486,31 +1525,6 @@ path = externals/gsm/inc; sourceTree = ""; }; - 22DD19E013A8D82C0018ECD4 /* tests */ = { - isa = PBXGroup; - children = ( - 22DD21A013A8E3310018ECD4 /* ios */, - 22DD19E713A8D82C0018ECD4 /* mediastream.c */, - ); - path = tests; - sourceTree = ""; - }; - 22DD21A013A8E3310018ECD4 /* ios */ = { - isa = PBXGroup; - children = ( - 22DD21A113A8E3310018ECD4 /* InfoPlist.strings */, - 22DD21A313A8E3310018ECD4 /* MainWindow.xib */, - 22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */, - 22DD21A813A8E3310018ECD4 /* mediastream-Info.plist */, - 22DD21A913A8E3310018ECD4 /* mediastream-Prefix.pch */, - 22DD21AA13A8E3310018ECD4 /* mediastreamAppDelegate.h */, - 22DD21AB13A8E3310018ECD4 /* mediastreamAppDelegate.m */, - 22DD21AC13A8E3310018ECD4 /* mediastreamViewController.h */, - 22DD21AD13A8E3310018ECD4 /* mediastreamViewController.m */, - ); - path = ios; - sourceTree = ""; - }; 32C88DFF0371C24200C91783 /* Other Sources */ = { isa = PBXGroup; children = ( @@ -2002,6 +2016,7 @@ buildRules = ( ); dependencies = ( + 2206D2DB177ACCE400C40726 /* PBXTargetDependency */, 225D65CB1521C181008B2E81 /* PBXTargetDependency */, ); name = mediastream; @@ -2067,9 +2082,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 22DD21AE13A8E3310018ECD4 /* InfoPlist.strings in Resources */, - 22DD21AF13A8E3310018ECD4 /* MainWindow.xib in Resources */, - 22DD21B013A8E3310018ECD4 /* mediastreamViewController.xib in Resources */, + 2206D2D3177AC70900C40726 /* InfoPlist.strings in Resources */, + 2206D2D4177AC70900C40726 /* MainWindow.xib in Resources */, + 2206D2D5177AC70900C40726 /* mediastreamViewController.xib in Resources */, + 2206D2D6177AC70900C40726 /* mediastream-Info.plist in Resources */, + 2206D2E1177ACF5700C40726 /* nowebcamCIF.jpg in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2235,9 +2252,9 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 22DD19F713A8DFA70018ECD4 /* mediastream.c in Sources */, - 22DD21B313A8E3310018ECD4 /* mediastreamAppDelegate.m in Sources */, - 22DD21B413A8E3310018ECD4 /* mediastreamViewController.m in Sources */, + 2206D2D7177AC70900C40726 /* mediastreamAppDelegate.m in Sources */, + 2206D2D8177AC70900C40726 /* mediastreamViewController.m in Sources */, + 2206D2D9177AC70900C40726 /* mediastream.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2285,6 +2302,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 2206D2DB177ACCE400C40726 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 22C8D0401769F8FF00DAFB4E /* libmediastreamer_voip */; + targetProxy = 2206D2DA177ACCE400C40726 /* PBXContainerItemProxy */; + }; 225D65C71521C09D008B2E81 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 225D64FA1521C009008B2E81 /* libortp */; @@ -2313,26 +2335,26 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 22DD21A113A8E3310018ECD4 /* InfoPlist.strings */ = { + 2206D2C6177AC70900C40726 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 22DD21A213A8E3310018ECD4 /* en */, + 2206D2C7177AC70900C40726 /* en */, ); name = InfoPlist.strings; sourceTree = ""; }; - 22DD21A313A8E3310018ECD4 /* MainWindow.xib */ = { + 2206D2C8177AC70900C40726 /* MainWindow.xib */ = { isa = PBXVariantGroup; children = ( - 22DD21A413A8E3310018ECD4 /* en */, + 2206D2C9177AC70900C40726 /* en */, ); name = MainWindow.xib; sourceTree = ""; }; - 22DD21A513A8E3310018ECD4 /* mediastreamViewController.xib */ = { + 2206D2CA177AC70900C40726 /* mediastreamViewController.xib */ = { isa = PBXVariantGroup; children = ( - 22DD21A613A8E3310018ECD4 /* en */, + 2206D2CB177AC70900C40726 /* en */, ); name = mediastreamViewController.xib; sourceTree = ""; @@ -3101,7 +3123,7 @@ COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; + GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", @@ -3127,7 +3149,7 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = com.apple.compilers.llvmgcc42; - INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -3322,7 +3344,7 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; + GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", @@ -3348,7 +3370,7 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = com.apple.compilers.llvmgcc42; - INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -3369,7 +3391,7 @@ COPY_PHASE_STRIP = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "linphone/mediastreamer2/tests/ios/mediastream-Prefix.pch"; + GCC_PREFIX_HEADER = "linphone/mediastreamer2/tools/ios/mediastream-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( HAVE_SILK, "_BYTE_ORDER=_LITTLE_ENDIAN", @@ -3395,7 +3417,7 @@ ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_VERSION = com.apple.compilers.llvmgcc42; - INFOPLIST_FILE = "linphone/mediastreamer2/tests/ios/mediastream-Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", From f582f2e8333d6de4e602766ce8c7e248883340ce Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 26 Jun 2013 13:14:53 +0200 Subject: [PATCH 114/218] Add adaptive rate control setting. --- Classes/LinphoneCoreSettingsStore.m | 5 +++- Classes/SettingsViewController.m | 1 - Settings/InAppSettings.bundle/Audio.plist | 10 +++++++ .../en.lproj/Audio.strings | 5 +++- .../fr.lproj/Audio.strings | 5 +++- .../ru.lproj/Audio.strings | 5 +++- linphone.ldb/Contents.plist | 29 +++++++++++++++++-- .../Audio/1/Audio.strings | 5 +++- 8 files changed, 57 insertions(+), 8 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 3c82e864d..fa433395b 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -182,7 +182,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); { [self transformCodecsToKeys: linphone_core_get_audio_codecs(lc)]; - [self transformCodecsToKeys: linphone_core_get_video_codecs(lc)]; + [self transformCodecsToKeys: linphone_core_get_video_codecs(lc)]; + [self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"]; } { @@ -492,6 +493,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); NSString *pref=[LinphoneManager getPreferenceForCodec:pt->mime_type withRate:pt->clock_rate]; linphone_core_enable_payload_type(lc,pt,[self boolForKey: pref]); } + + linphone_core_enable_adaptive_rate_control(lc, [self boolForKey:@"adaptive_rate_control_preference"]); linphone_core_set_use_info_for_dtmf(lc, [self boolForKey:@"sipinfo_dtmf_preference"]); linphone_core_set_use_rfc2833_for_dtmf(lc, [self boolForKey:@"rfc_dtmf_preference"]); diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 8cb63f9c8..d0eb48067 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -586,7 +586,6 @@ static UICompositeViewDescription *compositeDescription = nil; [hiddenKeys addObject:@"battery_alert_button"]; #endif - [hiddenKeys addObject:@"audio_advanced_group"]; [hiddenKeys addObject:@"playback_gain_preference"]; [hiddenKeys addObject:@"microphone_gain_preference"]; diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index 5fa9900a1..a7d91efac 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -188,6 +188,16 @@ IASKTextAlignment IASKUITextAlignmentRight + + DefaultValue + + Key + adaptive_rate_control_preference + Title + Adaptive rate control + Type + PSToggleSwitchSpecifier + diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings index cf7f76b96..313420848 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings @@ -41,4 +41,7 @@ "Playback gain" = "Playback gain"; /* Microphone gain */ -"Microphone gain" = "Microphone gain"; \ No newline at end of file +"Microphone gain" = "Microphone gain"; + +/* Adaptive rate control */ +"Adaptive rate control" = "Adaptive rate control"; \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings index a86837e4a..2b73797e4 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings @@ -41,4 +41,7 @@ "Playback gain" = "Gain sortie"; /* Microphone gain */ -"Microphone gain" = "Gain microphone"; \ No newline at end of file +"Microphone gain" = "Gain microphone"; + +/* Adaptive rate control */ +"Adaptive rate control" = "Contrôle de débit"; \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings index d1aeb96f3..2bd5ee497 100644 --- a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings @@ -41,4 +41,7 @@ "Playback gain" = "Усиление воспроизведения"; /* Microphone gain */ -"Microphone gain" = "Усиление микрофона"; \ No newline at end of file +"Microphone gain" = "Усиление микрофона"; + +/* Adaptive rate control */ +"Adaptive rate control" = "Adaptive rate control"; \ No newline at end of file diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 170d97bda..9e3fd2fd2 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -17902,7 +17902,7 @@ Raison: %2$s change date - 2012-11-06T09:45:46Z + 2013-06-26T10:38:34Z changed values class @@ -17912,7 +17912,7 @@ Raison: %2$s flags 0 hash - d8b4f45bf8fca397a7f791bd55a61e1c + 3d30b341d7d52a2764e5683a2ca348c1 name Audio.strings @@ -18279,6 +18279,31 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Adaptive rate control + errors + + flags + 0 + key + Adaptive rate control + localizations + + en + Adaptive rate control + fr + Contrôle de débit + + snapshots + + old objects diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings index cf7f76b96..313420848 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings @@ -41,4 +41,7 @@ "Playback gain" = "Playback gain"; /* Microphone gain */ -"Microphone gain" = "Microphone gain"; \ No newline at end of file +"Microphone gain" = "Microphone gain"; + +/* Adaptive rate control */ +"Adaptive rate control" = "Adaptive rate control"; \ No newline at end of file From 74d1bb61821ec4ebb03d95c7d51cd5c50fec3557 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 26 Jun 2013 13:16:58 +0200 Subject: [PATCH 115/218] disable multi thread support for vp8 on IOS simulator --- submodules/liblinphone.xcodeproj/project.pbxproj | 3 +++ submodules/linphone | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 7181d6b5f..59ab81863 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -2389,6 +2389,7 @@ externals/ffmpeg, external/ffmpeg/swscale, "../liblinphone-sdk/apple-darwin/include", + "../liblinphone-sdk/apple-darwin/include/libxml2", ); INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( @@ -2424,6 +2425,7 @@ externals/ffmpeg, external/ffmpeg/swscale, "../liblinphone-sdk/apple-darwin/include", + "../liblinphone-sdk/apple-darwin/include/libxml2", ); INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( @@ -3104,6 +3106,7 @@ externals/ffmpeg, external/ffmpeg/swscale, "../liblinphone-sdk/apple-darwin/include", + "../liblinphone-sdk/apple-darwin/include/libxml2", ); INSTALL_PATH = /usr/local/lib; LIBRARY_SEARCH_PATHS = ( diff --git a/submodules/linphone b/submodules/linphone index fae029b18..30e74df86 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fae029b1874cd341f0a5e5c7886a9dc9db5bbbe9 +Subproject commit 30e74df86b36db4825b7c9d9cfd4357a1d66e642 From 940c46ab3f542c2e5c7859703523b9f75b31a89d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 27 Jun 2013 13:25:32 +0200 Subject: [PATCH 116/218] update liblinphone for 412 PUBLISH error --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 30e74df86..6a033f8a6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 30e74df86b36db4825b7c9d9cfd4357a1d66e642 +Subproject commit 6a033f8a646a9d1621e5e6c0a8886ad687ed77a6 From 41eb3ae95510dc3a9380b2880eb4ea36b68c451e Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 28 Jun 2013 12:03:07 +0200 Subject: [PATCH 117/218] Add audio codec bitrate limit setting. --- Classes/LinphoneCoreSettingsStore.m | 16 ++++++++++ Settings/InAppSettings.bundle/Audio.plist | 28 ++++++++++++++++++ .../en.lproj/Audio.strings | 5 +++- .../fr.lproj/Audio.strings | 5 +++- .../ru.lproj/Audio.strings | 5 +++- linphone.ldb/Contents.plist | 29 +++++++++++++++++-- .../Audio/1/Audio.strings | 5 +++- 7 files changed, 87 insertions(+), 6 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index fa433395b..86f5a5bb0 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -184,6 +184,17 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [self transformCodecsToKeys: linphone_core_get_audio_codecs(lc)]; [self transformCodecsToKeys: linphone_core_get_video_codecs(lc)]; [self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"]; + LpConfig *config = linphone_core_get_config(lc); + [self setInteger:lp_config_get_int(config, "audio", "codec_bitrate_limit", 32) forKey:@"audio_codec_bitrate_limit_preference"]; + + PayloadType *pt; + const MSList *elem; + for (elem=linphone_core_get_audio_codecs(lc);elem!=NULL;elem=elem->next){ + pt=(PayloadType*)elem->data; + if ((strcmp(pt->mime_type, "opus") == 0) || (strcmp(pt->mime_type, "mpeg4-generic") == 0)) { + pt->normal_bitrate = [self integerForKey:@"audio_codec_bitrate_limit_preference"] * 1000; + } + } } { @@ -487,6 +498,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); pt=(PayloadType*)elem->data; NSString *pref=[LinphoneManager getPreferenceForCodec:pt->mime_type withRate:pt->clock_rate]; linphone_core_enable_payload_type(lc,pt,[self boolForKey: pref]); + if ((strcmp(pt->mime_type, "opus") == 0) || (strcmp(pt->mime_type, "mpeg4-generic") == 0)) { + pt->normal_bitrate = [self integerForKey:@"audio_codec_bitrate_limit_preference"] * 1000; + } } for (elem=linphone_core_get_video_codecs(lc);elem!=NULL;elem=elem->next){ pt=(PayloadType*)elem->data; @@ -494,6 +508,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); linphone_core_enable_payload_type(lc,pt,[self boolForKey: pref]); } + LpConfig *config = linphone_core_get_config(lc); + lp_config_set_int(config, "audio", "codec_bitrate_limit", [self integerForKey:@"audio_codec_bitrate_limit_preference"]); linphone_core_enable_adaptive_rate_control(lc, [self boolForKey:@"adaptive_rate_control_preference"]); linphone_core_set_use_info_for_dtmf(lc, [self boolForKey:@"sipinfo_dtmf_preference"]); diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index a7d91efac..6c57f74f1 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -198,6 +198,34 @@ Type PSToggleSwitchSpecifier + + DefaultValue + 32 + Key + audio_codec_bitrate_limit_preference + Title + Codec bitrate limit + Titles + + 10 kbits/s + 15 kbits/s + 20 kbits/s + 32 kbits/s + 64 kbits/s + 128 kbits/s + + Type + PSMultiValueSpecifier + Values + + 10 + 15 + 20 + 32 + 64 + 128 + + diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings index 313420848..4384de768 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings @@ -44,4 +44,7 @@ "Microphone gain" = "Microphone gain"; /* Adaptive rate control */ -"Adaptive rate control" = "Adaptive rate control"; \ No newline at end of file +"Adaptive rate control" = "Adaptive rate control"; + +/* Codec bitrate limit */ +"Codec bitrate limit" = "Codec bitrate limit"; diff --git a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings index 2b73797e4..c90dc9783 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings @@ -44,4 +44,7 @@ "Microphone gain" = "Gain microphone"; /* Adaptive rate control */ -"Adaptive rate control" = "Contrôle de débit"; \ No newline at end of file +"Adaptive rate control" = "Contrôle de débit"; + +/* Codec bitrate limit */ +"Codec bitrate limit" = "Limite de débit du codec"; diff --git a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings index 2bd5ee497..2b325e3ae 100644 --- a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings @@ -44,4 +44,7 @@ "Microphone gain" = "Усиление микрофона"; /* Adaptive rate control */ -"Adaptive rate control" = "Adaptive rate control"; \ No newline at end of file +"Adaptive rate control" = "Adaptive rate control"; + +/* Codec bitrate limit */ +"Codec bitrate limit" = "Codec bitrate limit"; diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 9e3fd2fd2..e0d4ea2f7 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -17902,7 +17902,7 @@ Raison: %2$s change date - 2013-06-26T10:38:34Z + 2013-06-28T12:59:59Z changed values class @@ -17912,7 +17912,7 @@ Raison: %2$s flags 0 hash - 3d30b341d7d52a2764e5683a2ca348c1 + a03adeb7710ae8986354684bdcd69764 name Audio.strings @@ -18304,6 +18304,31 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Codec bitrate limit + errors + + flags + 0 + key + Codec bitrate limit + localizations + + en + Codec bitrate limit + fr + Limite de débit du codec + + snapshots + + old objects diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings index 313420848..4384de768 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings @@ -44,4 +44,7 @@ "Microphone gain" = "Microphone gain"; /* Adaptive rate control */ -"Adaptive rate control" = "Adaptive rate control"; \ No newline at end of file +"Adaptive rate control" = "Adaptive rate control"; + +/* Codec bitrate limit */ +"Codec bitrate limit" = "Codec bitrate limit"; From c4b08b879bf9d61820d8d5113fb9ca73200d785f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 2 Jul 2013 13:01:33 +0200 Subject: [PATCH 118/218] update linphone submodule for SDP bugfix --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 6a033f8a6..7f4646760 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6a033f8a646a9d1621e5e6c0a8886ad687ed77a6 +Subproject commit 7f4646760a4a7f9bd3b41839645bec39f1a8199c From 90270421344c9499f1f69ace79106b3b61c5988f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 3 Jul 2013 18:38:39 +0200 Subject: [PATCH 119/218] add debug option to sdk build --- linphone.xcodeproj/project.pbxproj | 289 +++++++++++++++++++++++++- submodules/build/Makefile | 3 +- submodules/build/builder-iphone-os.mk | 18 +- submodules/linphone | 2 +- 4 files changed, 304 insertions(+), 8 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index a7f6e6c16..4636f6a60 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1704,6 +1704,101 @@ 22F2508B107141E100AC9B3F /* DialerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DialerViewController.h; sourceTree = ""; }; 22F2508C107141E100AC9B3F /* DialerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DialerViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = Resources/ringback.wav; sourceTree = ""; }; + 22F9B0891784711500E0212F /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; + 22F9B08A1784711500E0212F /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; + 22F9B08B1784711500E0212F /* Makefile.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; + 22F9B08C1784711500E0212F /* TunnelManager.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TunnelManager.cc; sourceTree = ""; }; + 22F9B08D1784711500E0212F /* TunnelManager.hh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = TunnelManager.hh; sourceTree = ""; }; + 22F9B08E1784711500E0212F /* address.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = address.c; sourceTree = ""; }; + 22F9B08F1784711500E0212F /* authentication.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = authentication.c; sourceTree = ""; }; + 22F9B0911784711500E0212F /* sal_address_impl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_address_impl.c; sourceTree = ""; }; + 22F9B0921784711500E0212F /* sal_impl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_impl.c; sourceTree = ""; }; + 22F9B0931784711500E0212F /* sal_impl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sal_impl.h; sourceTree = ""; }; + 22F9B0941784711500E0212F /* sal_op_call.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_call.c; sourceTree = ""; }; + 22F9B0951784711500E0212F /* sal_op_call_transfer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_call_transfer.c; sourceTree = ""; }; + 22F9B0961784711500E0212F /* sal_op_events.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_events.c; sourceTree = ""; }; + 22F9B0971784711500E0212F /* sal_op_impl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_impl.c; sourceTree = ""; }; + 22F9B0981784711500E0212F /* sal_op_info.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_info.c; sourceTree = ""; }; + 22F9B0991784711500E0212F /* sal_op_message.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_message.c; sourceTree = ""; }; + 22F9B09A1784711500E0212F /* sal_op_presence.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_presence.c; sourceTree = ""; }; + 22F9B09B1784711500E0212F /* sal_op_publish.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_publish.c; sourceTree = ""; }; + 22F9B09C1784711500E0212F /* sal_op_registration.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_op_registration.c; sourceTree = ""; }; + 22F9B09D1784711500E0212F /* sal_sdp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_sdp.c; sourceTree = ""; }; + 22F9B09E1784711500E0212F /* callbacks.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = callbacks.c; sourceTree = ""; }; + 22F9B09F1784711500E0212F /* callbacks.c.orig */ = {isa = PBXFileReference; lastKnownFileType = text; path = callbacks.c.orig; sourceTree = ""; }; + 22F9B0A01784711500E0212F /* chat.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = chat.c; sourceTree = ""; }; + 22F9B0A11784711500E0212F /* conference.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = conference.c; sourceTree = ""; }; + 22F9B0A21784711500E0212F /* eXosip_transport_hook.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = eXosip_transport_hook.h; sourceTree = ""; }; + 22F9B0A31784711500E0212F /* ec-calibrator.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "ec-calibrator.c"; sourceTree = ""; }; + 22F9B0A41784711500E0212F /* enum.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = enum.c; sourceTree = ""; }; + 22F9B0A51784711500E0212F /* enum.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = enum.h; sourceTree = ""; }; + 22F9B0A61784711500E0212F /* event.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = event.c; sourceTree = ""; }; + 22F9B0A71784711500E0212F /* event.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = ""; }; + 22F9B0A81784711500E0212F /* fonis.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fonis.c; sourceTree = ""; }; + 22F9B0A91784711500E0212F /* friend.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = friend.c; sourceTree = ""; }; + 22F9B0AB1784711500E0212F /* Doxyfile.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = Doxyfile.in; sourceTree = ""; }; + 22F9B0AC1784711500E0212F /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; + 22F9B0AD1784711500E0212F /* Makefile.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; + 22F9B0AE1784711500E0212F /* buddy_status.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = buddy_status.c; sourceTree = ""; }; + 22F9B0AF1784711500E0212F /* chatroom.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = chatroom.c; sourceTree = ""; }; + 22F9B0B01784711500E0212F /* doxygen.dox */ = {isa = PBXFileReference; lastKnownFileType = text; path = doxygen.dox; sourceTree = ""; }; + 22F9B0B11784711500E0212F /* helloworld.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = helloworld.c; sourceTree = ""; }; + 22F9B0B71784711500E0212F /* TutorialBuddyStatus.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = TutorialBuddyStatus.java; sourceTree = ""; }; + 22F9B0B81784711500E0212F /* TutorialChatRoom.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = TutorialChatRoom.java; sourceTree = ""; }; + 22F9B0B91784711500E0212F /* TutorialHelloWorld.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = TutorialHelloWorld.java; sourceTree = ""; }; + 22F9B0BA1784711500E0212F /* TutorialNotifier.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = TutorialNotifier.java; sourceTree = ""; }; + 22F9B0BB1784711500E0212F /* TutorialRegistration.java */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.java; path = TutorialRegistration.java; sourceTree = ""; }; + 22F9B0BC1784711500E0212F /* notify.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = notify.c; sourceTree = ""; }; + 22F9B0BD1784711500E0212F /* registration.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = registration.c; sourceTree = ""; }; + 22F9B0BE1784711500E0212F /* info.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = info.c; sourceTree = ""; }; + 22F9B0BF1784711500E0212F /* liblinphone_gitversion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = liblinphone_gitversion.h; sourceTree = ""; }; + 22F9B0C01784711500E0212F /* linphone_tunnel.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = linphone_tunnel.cc; sourceTree = ""; }; + 22F9B0C11784711500E0212F /* linphone_tunnel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = linphone_tunnel.h; sourceTree = ""; }; + 22F9B0C21784711500E0212F /* linphone_tunnel_config.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = linphone_tunnel_config.c; sourceTree = ""; }; + 22F9B0C31784711500E0212F /* linphone_tunnel_stubs.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = linphone_tunnel_stubs.c; sourceTree = ""; }; + 22F9B0C41784711500E0212F /* linphonecall.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = linphonecall.c; sourceTree = ""; }; + 22F9B0C51784711500E0212F /* linphonecore.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = linphonecore.c; sourceTree = ""; }; + 22F9B0C61784711500E0212F /* linphonecore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = linphonecore.h; sourceTree = ""; }; + 22F9B0C71784711500E0212F /* linphonecore_jni.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = linphonecore_jni.cc; sourceTree = ""; }; + 22F9B0C81784711500E0212F /* linphonecore_utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = linphonecore_utils.h; sourceTree = ""; }; + 22F9B0C91784711500E0212F /* linphonefriend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = linphonefriend.h; sourceTree = ""; }; + 22F9B0CA1784711500E0212F /* linphonepresence.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = linphonepresence.h; sourceTree = ""; }; + 22F9B0CB1784711500E0212F /* lpconfig.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = lpconfig.c; sourceTree = ""; }; + 22F9B0CC1784711500E0212F /* lpconfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lpconfig.h; sourceTree = ""; }; + 22F9B0CD1784711500E0212F /* lsd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = lsd.c; sourceTree = ""; }; + 22F9B0CE1784711500E0212F /* message_storage.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = message_storage.c; sourceTree = ""; }; + 22F9B0CF1784711500E0212F /* misc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = ""; }; + 22F9B0D01784711500E0212F /* offeranswer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = offeranswer.c; sourceTree = ""; }; + 22F9B0D11784711500E0212F /* offeranswer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = offeranswer.h; sourceTree = ""; }; + 22F9B0D41784711500E0212F /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; path = AUTHORS; sourceTree = ""; }; + 22F9B0D51784711500E0212F /* COPYING */ = {isa = PBXFileReference; lastKnownFileType = text; path = COPYING; sourceTree = ""; }; + 22F9B0D61784711500E0212F /* ChangeLog */ = {isa = PBXFileReference; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; }; + 22F9B0D71784711500E0212F /* INSTALL */ = {isa = PBXFileReference; lastKnownFileType = text; path = INSTALL; sourceTree = ""; }; + 22F9B0D81784711500E0212F /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; + 22F9B0D91784711500E0212F /* NEWS */ = {isa = PBXFileReference; lastKnownFileType = text; path = NEWS; sourceTree = ""; }; + 22F9B0DA1784711500E0212F /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = ""; }; + 22F9B0DB1784711500E0212F /* autogen.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = autogen.sh; sourceTree = ""; }; + 22F9B0DC1784711500E0212F /* configure.ac */ = {isa = PBXFileReference; lastKnownFileType = text; path = configure.ac; sourceTree = ""; }; + 22F9B0DE1784711500E0212F /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; + 22F9B0DF1784711500E0212F /* lookup.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = lookup.c; sourceTree = ""; }; + 22F9B0E01784711500E0212F /* presence.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = presence.c; sourceTree = ""; }; + 22F9B0E11784711500E0212F /* private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = private.h; sourceTree = ""; }; + 22F9B0E21784711500E0212F /* proxy.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = proxy.c; sourceTree = ""; }; + 22F9B0E31784711500E0212F /* sal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal.c; sourceTree = ""; }; + 22F9B0E41784711500E0212F /* sal.h.orig */ = {isa = PBXFileReference; lastKnownFileType = text; path = sal.h.orig; sourceTree = ""; }; + 22F9B0E51784711500E0212F /* sal_eXosip2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2.c; sourceTree = ""; }; + 22F9B0E61784711500E0212F /* sal_eXosip2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sal_eXosip2.h; sourceTree = ""; }; + 22F9B0E71784711500E0212F /* sal_eXosip2_presence.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2_presence.c; sourceTree = ""; }; + 22F9B0E81784711500E0212F /* sal_eXosip2_sdp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sal_eXosip2_sdp.c; sourceTree = ""; }; + 22F9B0E91784711500E0212F /* siplogin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = siplogin.c; sourceTree = ""; }; + 22F9B0EA1784711500E0212F /* sipsetup.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sipsetup.c; sourceTree = ""; }; + 22F9B0EB1784711500E0212F /* sipsetup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sipsetup.h; sourceTree = ""; }; + 22F9B0EC1784711500E0212F /* sipwizard.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = sipwizard.c; sourceTree = ""; }; + 22F9B0ED1784711500E0212F /* test_ecc.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = test_ecc.c; sourceTree = ""; }; + 22F9B0EE1784711500E0212F /* test_lsd.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = test_lsd.c; sourceTree = ""; }; + 22F9B0EF1784711500E0212F /* test_numbers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = test_numbers.c; sourceTree = ""; }; + 22F9B0F01784711500E0212F /* upnp.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = upnp.c; sourceTree = ""; }; + 22F9B0F11784711500E0212F /* upnp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = upnp.h; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* linphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphone_Prefix.pch; sourceTree = ""; }; @@ -2980,6 +3075,197 @@ path = openssl; sourceTree = ""; }; + 22F9B087178470F400E0212F /* liblinphone */ = { + isa = PBXGroup; + children = ( + 22F9B0881784711500E0212F /* coreapi */, + ); + name = liblinphone; + sourceTree = ""; + }; + 22F9B0881784711500E0212F /* coreapi */ = { + isa = PBXGroup; + children = ( + 22F9B0891784711500E0212F /* .gitignore */, + 22F9B08A1784711500E0212F /* Makefile.am */, + 22F9B08B1784711500E0212F /* Makefile.in */, + 22F9B08C1784711500E0212F /* TunnelManager.cc */, + 22F9B08D1784711500E0212F /* TunnelManager.hh */, + 22F9B08E1784711500E0212F /* address.c */, + 22F9B08F1784711500E0212F /* authentication.c */, + 22F9B0901784711500E0212F /* bellesip_sal */, + 22F9B09E1784711500E0212F /* callbacks.c */, + 22F9B09F1784711500E0212F /* callbacks.c.orig */, + 22F9B0A01784711500E0212F /* chat.c */, + 22F9B0A11784711500E0212F /* conference.c */, + 22F9B0A21784711500E0212F /* eXosip_transport_hook.h */, + 22F9B0A31784711500E0212F /* ec-calibrator.c */, + 22F9B0A41784711500E0212F /* enum.c */, + 22F9B0A51784711500E0212F /* enum.h */, + 22F9B0A61784711500E0212F /* event.c */, + 22F9B0A71784711500E0212F /* event.h */, + 22F9B0A81784711500E0212F /* fonis.c */, + 22F9B0A91784711500E0212F /* friend.c */, + 22F9B0AA1784711500E0212F /* help */, + 22F9B0BE1784711500E0212F /* info.c */, + 22F9B0BF1784711500E0212F /* liblinphone_gitversion.h */, + 22F9B0C01784711500E0212F /* linphone_tunnel.cc */, + 22F9B0C11784711500E0212F /* linphone_tunnel.h */, + 22F9B0C21784711500E0212F /* linphone_tunnel_config.c */, + 22F9B0C31784711500E0212F /* linphone_tunnel_stubs.c */, + 22F9B0C41784711500E0212F /* linphonecall.c */, + 22F9B0C51784711500E0212F /* linphonecore.c */, + 22F9B0C61784711500E0212F /* linphonecore.h */, + 22F9B0C71784711500E0212F /* linphonecore_jni.cc */, + 22F9B0C81784711500E0212F /* linphonecore_utils.h */, + 22F9B0C91784711500E0212F /* linphonefriend.h */, + 22F9B0CA1784711500E0212F /* linphonepresence.h */, + 22F9B0CB1784711500E0212F /* lpconfig.c */, + 22F9B0CC1784711500E0212F /* lpconfig.h */, + 22F9B0CD1784711500E0212F /* lsd.c */, + 22F9B0CE1784711500E0212F /* message_storage.c */, + 22F9B0CF1784711500E0212F /* misc.c */, + 22F9B0D01784711500E0212F /* offeranswer.c */, + 22F9B0D11784711500E0212F /* offeranswer.h */, + 22F9B0D21784711500E0212F /* plugins */, + 22F9B0E01784711500E0212F /* presence.c */, + 22F9B0E11784711500E0212F /* private.h */, + 22F9B0E21784711500E0212F /* proxy.c */, + 22F9B0E31784711500E0212F /* sal.c */, + 22F9B0E41784711500E0212F /* sal.h.orig */, + 22F9B0E51784711500E0212F /* sal_eXosip2.c */, + 22F9B0E61784711500E0212F /* sal_eXosip2.h */, + 22F9B0E71784711500E0212F /* sal_eXosip2_presence.c */, + 22F9B0E81784711500E0212F /* sal_eXosip2_sdp.c */, + 22F9B0E91784711500E0212F /* siplogin.c */, + 22F9B0EA1784711500E0212F /* sipsetup.c */, + 22F9B0EB1784711500E0212F /* sipsetup.h */, + 22F9B0EC1784711500E0212F /* sipwizard.c */, + 22F9B0ED1784711500E0212F /* test_ecc.c */, + 22F9B0EE1784711500E0212F /* test_lsd.c */, + 22F9B0EF1784711500E0212F /* test_numbers.c */, + 22F9B0F01784711500E0212F /* upnp.c */, + 22F9B0F11784711500E0212F /* upnp.h */, + ); + name = coreapi; + path = submodules/linphone/coreapi; + sourceTree = ""; + }; + 22F9B0901784711500E0212F /* bellesip_sal */ = { + isa = PBXGroup; + children = ( + 22F9B0911784711500E0212F /* sal_address_impl.c */, + 22F9B0921784711500E0212F /* sal_impl.c */, + 22F9B0931784711500E0212F /* sal_impl.h */, + 22F9B0941784711500E0212F /* sal_op_call.c */, + 22F9B0951784711500E0212F /* sal_op_call_transfer.c */, + 22F9B0961784711500E0212F /* sal_op_events.c */, + 22F9B0971784711500E0212F /* sal_op_impl.c */, + 22F9B0981784711500E0212F /* sal_op_info.c */, + 22F9B0991784711500E0212F /* sal_op_message.c */, + 22F9B09A1784711500E0212F /* sal_op_presence.c */, + 22F9B09B1784711500E0212F /* sal_op_publish.c */, + 22F9B09C1784711500E0212F /* sal_op_registration.c */, + 22F9B09D1784711500E0212F /* sal_sdp.c */, + ); + path = bellesip_sal; + sourceTree = ""; + }; + 22F9B0AA1784711500E0212F /* help */ = { + isa = PBXGroup; + children = ( + 22F9B0AB1784711500E0212F /* Doxyfile.in */, + 22F9B0AC1784711500E0212F /* Makefile.am */, + 22F9B0AD1784711500E0212F /* Makefile.in */, + 22F9B0AE1784711500E0212F /* buddy_status.c */, + 22F9B0AF1784711500E0212F /* chatroom.c */, + 22F9B0B01784711500E0212F /* doxygen.dox */, + 22F9B0B11784711500E0212F /* helloworld.c */, + 22F9B0B21784711500E0212F /* java */, + 22F9B0BC1784711500E0212F /* notify.c */, + 22F9B0BD1784711500E0212F /* registration.c */, + ); + path = help; + sourceTree = ""; + }; + 22F9B0B21784711500E0212F /* java */ = { + isa = PBXGroup; + children = ( + 22F9B0B31784711500E0212F /* org */, + ); + path = java; + sourceTree = ""; + }; + 22F9B0B31784711500E0212F /* org */ = { + isa = PBXGroup; + children = ( + 22F9B0B41784711500E0212F /* linphone */, + ); + path = org; + sourceTree = ""; + }; + 22F9B0B41784711500E0212F /* linphone */ = { + isa = PBXGroup; + children = ( + 22F9B0B51784711500E0212F /* core */, + ); + path = linphone; + sourceTree = ""; + }; + 22F9B0B51784711500E0212F /* core */ = { + isa = PBXGroup; + children = ( + 22F9B0B61784711500E0212F /* tutorials */, + ); + path = core; + sourceTree = ""; + }; + 22F9B0B61784711500E0212F /* tutorials */ = { + isa = PBXGroup; + children = ( + 22F9B0B71784711500E0212F /* TutorialBuddyStatus.java */, + 22F9B0B81784711500E0212F /* TutorialChatRoom.java */, + 22F9B0B91784711500E0212F /* TutorialHelloWorld.java */, + 22F9B0BA1784711500E0212F /* TutorialNotifier.java */, + 22F9B0BB1784711500E0212F /* TutorialRegistration.java */, + ); + path = tutorials; + sourceTree = ""; + }; + 22F9B0D21784711500E0212F /* plugins */ = { + isa = PBXGroup; + children = ( + 22F9B0D31784711500E0212F /* buddylookup */, + ); + path = plugins; + sourceTree = ""; + }; + 22F9B0D31784711500E0212F /* buddylookup */ = { + isa = PBXGroup; + children = ( + 22F9B0D41784711500E0212F /* AUTHORS */, + 22F9B0D51784711500E0212F /* COPYING */, + 22F9B0D61784711500E0212F /* ChangeLog */, + 22F9B0D71784711500E0212F /* INSTALL */, + 22F9B0D81784711500E0212F /* Makefile.am */, + 22F9B0D91784711500E0212F /* NEWS */, + 22F9B0DA1784711500E0212F /* README */, + 22F9B0DB1784711500E0212F /* autogen.sh */, + 22F9B0DC1784711500E0212F /* configure.ac */, + 22F9B0DD1784711500E0212F /* src */, + ); + path = buddylookup; + sourceTree = ""; + }; + 22F9B0DD1784711500E0212F /* src */ = { + isa = PBXGroup; + children = ( + 22F9B0DE1784711500E0212F /* Makefile.am */, + 22F9B0DF1784711500E0212F /* lookup.c */, + ); + path = src; + sourceTree = ""; + }; 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( @@ -3017,6 +3303,7 @@ 22D1B68012A3E0BE001AE361 /* libresolv.dylib */, D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */, 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */, + 22F9B087178470F400E0212F /* liblinphone */, 22B5F03410CE6B2F00777D97 /* AddressBook.framework */, 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */, 22405EED1600B4E400B92522 /* AssetsLibrary.framework */, @@ -5546,7 +5833,7 @@ ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; - PROVISIONING_PROFILE = "B0005B58-1160-4269-B1FC-C5BA54ACBA65"; + PROVISIONING_PROFILE = "906D0BA7-CD8F-470C-A060-F0752867FC5D"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 3c118704b..d078f0ac2 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -22,6 +22,7 @@ enable_gpl_third_parties=yes enable_zrtp=no enable_opus=yes +enable_debug=no .NOTPARALLEL all: check_options build warning ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) @@ -58,7 +59,7 @@ warning: @echo "*****************************************************************" endif -LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) enable_opus=$(enable_opus) +LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) enable_opus=$(enable_opus) enable_debug=$(enable_debug) build: make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index d96a92106..7c8d07380 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -40,7 +40,8 @@ linphone_configure_controls= \ --disable-tests \ --with-srtp=$(prefix) \ --with-antlr=$(prefix) \ - --disable-msg-storage + --disable-msg-storage + ifeq ($(enable_zrtp),yes) linphone_configure_controls+= --enable-zrtp @@ -50,7 +51,14 @@ endif #path BUILDER_SRC_DIR?=$(shell pwd)/../ +ifeq ($(enable_debug),yes) +BUILDER_BUILD_DIR?=$(shell pwd)/../build-$(host)-debug +linphone_configure_controls += CFLAGS="-g" +prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host)-debug +else BUILDER_BUILD_DIR?=$(shell pwd)/../build-$(host) +prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host) +endif LINPHONE_SRC_DIR=$(BUILDER_SRC_DIR)/linphone LINPHONE_BUILD_DIR=$(BUILDER_BUILD_DIR)/linphone @@ -100,7 +108,6 @@ ifneq (,$(findstring armv7,$(host))) SPEEX_CONFIGURE_OPTION += --enable-armv7neon-asm endif -prefix?=$(BUILDER_SRC_DIR)/../liblinphone-sdk/$(host) clean-makefile: clean-makefile-linphone clean-makefile-msbcg729 @@ -124,7 +131,7 @@ veryclean-linphone: veryclean-libantlr veryclean-polarssl veryclean-belle-sip ve #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-libantlr clean-makefile-polarssl clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk clean-makefile-opus clean-makefile-libxml2 +clean-makefile-linphone: clean-makefile-libantlr clean-makefile-polarssl clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk clean-makefile-opus clean-makefile-libxml2 cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile @@ -138,7 +145,7 @@ $(LINPHONE_BUILD_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure ${linphone_configure_controls}\033[0m" cd $(LINPHONE_BUILD_DIR) && \ PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - CFLAGS="$(CFLAGS) -DMS2_MINIMAL_SIZE" $(LINPHONE_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ + $(LINPHONE_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ ${linphone_configure_controls} @@ -267,7 +274,8 @@ multi-arch: if test ! -f "$$armv7s_path"; then \ armv7s_path= ; \ fi; \ - destpath=`echo $$archive | sed -e "s/armv7-//"` ;\ + destpath=`echo $$archive | sed -e "s/-debug//"` ;\ + destpath=`echo $$destpath | sed -e "s/armv7-//"` ;\ if test -f "$$i386_path"; then \ echo "Mixing $$archive into $$destpath"; \ mkdir -p `dirname $$destpath` ; \ diff --git a/submodules/linphone b/submodules/linphone index 8b674d05e..370dff2ad 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8b674d05e33a80261dde28930591ff37dc8938b4 +Subproject commit 370dff2ad6891c5c857e3ada4bcf58dcbae38981 From 9d3ce840d2d5ec320f7fce334a73ce57847aa1aa Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 5 Jul 2013 23:13:48 +0200 Subject: [PATCH 120/218] update belle-sip and linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 3d18c79dd..dc04f9f97 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 3d18c79dd5c33b748b1952d3743615450e82ae6b +Subproject commit dc04f9f970157bd2de57676aa9fb6cfbbea084a6 diff --git a/submodules/linphone b/submodules/linphone index 370dff2ad..0b2d04d62 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 370dff2ad6891c5c857e3ada4bcf58dcbae38981 +Subproject commit 0b2d04d624b93c861d8487573164e98cb4ccf713 From 82b9f39529074e8a4a54e29819dc931d1891920a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 8 Jul 2013 10:40:56 +0200 Subject: [PATCH 121/218] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 0b2d04d62..bdd9839de 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0b2d04d624b93c861d8487573164e98cb4ccf713 +Subproject commit bdd9839dea820ec38171b3a6a8ea14358bf9210b From 2e20371b192dc7769d598b83ce930d970cd5989a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 9 Jul 2013 14:57:14 +0200 Subject: [PATCH 122/218] fix REAME + case where message delivery display is wrong --- Classes/LinphoneUI/UIChatRoomCell.m | 25 ++++++++++++------------- README | 18 +++++++++++++++--- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index 067cd5c78..5344fc135 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -93,19 +93,18 @@ static UIFont *CELL_FONT = nil; #pragma mark - - (void)setChat:(ChatModel *)achat { - if(chat == achat) { - return; - } - - if(chat != nil) { - [chat release]; - chat = nil; - } - - if(achat != nil) { - chat = [achat retain]; - [self update]; - } + if(chat != achat) { + if(chat != nil) { + [chat release]; + chat = nil; + } + + if(achat != nil) { + chat = [achat retain]; + } + } + [self update]; + } - (void)update { diff --git a/README b/README index c2a2e4502..87e863590 100644 --- a/README +++ b/README @@ -45,8 +45,8 @@ BUILDING THE SDK $ cd submodules/build $ make all - ALTERNATIVELY, you can force liblinphone to use only non GPL code except for liblinphone, mediastremer2, ortp, exosip, osip. - If you choose this flavor, your final application is still subject to GPL except if you have a commercial license for liblinphone, mediastremer2, ortp, exosip, osip. + ALTERNATIVELY, you can force liblinphone to use only non GPL code except for liblinphone, mediastremer2, ortp, belle-sip. + If you choose this flavor, your final application is still subject to GPL except if you have a commercial license for liblinphone, mediastremer2, ortp, belle-sip. To generate the liblinphone multi arch sdkin non GPL mode, do: $ cd submodules/build @@ -89,7 +89,19 @@ LIMITATIONS, KNOWN BUGS *********************** * Video capture does not work in simulator (not implemented by simulator ?). -* Sound does not work well (or at all) in simulator +DEBUGING THE SDK +**************** +Sometime it can be usefull to step into liblinphone SDK funtions. To allow xcode to enable breakpoint whithin liblinphone, SDK must be built with debug symbols. +To add debug symbol to liblinphone SDK, add make option "enable_debug=yes". + $ make make all enable_gpl_third_parties=no enable_debug=yes + + +DEBUGING MEDIASTREMMER2 +*********************** +For IOS specicific media development like audio video capture/playback it may be interresting to use mediastream test tool. +The project submodule/liblinphone.xcodeproj can be used for this purpose. + +**************** From 4dce4d3d060adb3f969419e36fd96253d1767364 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 10 Jul 2013 14:26:25 +0200 Subject: [PATCH 123/218] Add configuration option to override domain with the default one for outgoing calls. --- Classes/LinphoneManager.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 1c2c7f9c2..08e6ddc47 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -1286,6 +1286,8 @@ static void audioRouteChangeListenerCallback ( if(displayName!=nil) { linphone_address_set_display_name(linphoneAddress,[displayName cStringUsingEncoding:[NSString defaultCStringEncoding]]); } + if ([[LinphoneManager instance] lpConfigBoolForKey:@"override_domain_with_default_one"]) + linphone_address_set_domain(linphoneAddress, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] cStringUsingEncoding:[NSString defaultCStringEncoding]]); if(transfer) { linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), [address cStringUsingEncoding:[NSString defaultCStringEncoding]]); } else { @@ -1308,6 +1310,8 @@ static void audioRouteChangeListenerCallback ( if(displayName!=nil) { linphone_address_set_display_name(linphoneAddress, [displayName cStringUsingEncoding:[NSString defaultCStringEncoding]]); } + if ([[LinphoneManager instance] lpConfigBoolForKey:@"override_domain_with_default_one"]) + linphone_address_set_domain(linphoneAddress, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] cStringUsingEncoding:[NSString defaultCStringEncoding]]); if(transfer) { linphone_core_transfer_call(theLinphoneCore, linphone_core_get_current_call(theLinphoneCore), linphone_address_as_string_uri_only(linphoneAddress)); } else { From 1a34f508b09d73ebc8d3310ff17503579b6f86a7 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 11 Jul 2013 17:47:59 +0200 Subject: [PATCH 124/218] Update linphone and msx264 submodules for HD video. --- submodules/linphone | 2 +- submodules/msx264 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index bdd9839de..0386daaec 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bdd9839dea820ec38171b3a6a8ea14358bf9210b +Subproject commit 0386daaecffda23471d160218da36f3f09c80964 diff --git a/submodules/msx264 b/submodules/msx264 index f1fd3d6be..ec2da46e0 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit f1fd3d6be817dd5c1b8a46f68de04421f75cf056 +Subproject commit ec2da46e0f43dcd7116b8ce9253deae1cd120c48 From 30c5c4b08d2ba6d7c21f7deb3811dd93b041ebef Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 11 Jul 2013 17:48:25 +0200 Subject: [PATCH 125/218] Add compilation of ioshardware.m file. --- submodules/liblinphone.xcodeproj/project.pbxproj | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 378e612f0..a557e7a66 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 1561A554178D9C68006B4B2F /* ioshardware.h in Headers */ = {isa = PBXBuildFile; fileRef = 1561A553178D9C68006B4B2F /* ioshardware.h */; }; + 1561A555178D9C71006B4B2F /* ioshardware.m in Sources */ = {isa = PBXBuildFile; fileRef = 1561A551178D98E2006B4B2F /* ioshardware.m */; }; 2206D2D3177AC70900C40726 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2C6177AC70900C40726 /* InfoPlist.strings */; }; 2206D2D4177AC70900C40726 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2C8177AC70900C40726 /* MainWindow.xib */; }; 2206D2D5177AC70900C40726 /* mediastreamViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2206D2CA177AC70900C40726 /* mediastreamViewController.xib */; }; @@ -391,7 +393,6 @@ 225D65B81521C009008B2E81 /* netsim.c in Sources */ = {isa = PBXBuildFile; fileRef = F4D9F23D145710540035B0D0 /* netsim.c */; }; 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_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 */; }; @@ -644,6 +645,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 1561A551178D98E2006B4B2F /* ioshardware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioshardware.m; sourceTree = ""; }; + 1561A553178D9C68006B4B2F /* ioshardware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioshardware.h; sourceTree = ""; }; 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; 2206D2C7177AC70900C40726 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 2206D2C9177AC70900C40726 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainWindow.xib; sourceTree = ""; }; @@ -959,7 +962,6 @@ buildActionMask = 2147483647; files = ( 225D65BF1521C009008B2E81 /* Foundation.framework in Frameworks */, - 225D65C01521C009008B2E81 /* libSKP_SILK_SDK.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1452,6 +1454,8 @@ 223CA85116D9268D00EF1BEC /* bitratecontrol.c */, 223CA85216D9268D00EF1BEC /* bitratedriver.c */, 223CA85316D9268D00EF1BEC /* ice.c */, + 1561A553178D9C68006B4B2F /* ioshardware.h */, + 1561A551178D98E2006B4B2F /* ioshardware.m */, 223CA85416D9268D00EF1BEC /* layouts.c */, 223CA85516D9268D00EF1BEC /* layouts.h */, 223CA85616D9268D00EF1BEC /* mediastream.c */, @@ -1855,6 +1859,7 @@ 22C8D0951769F8FF00DAFB4E /* private.h in Headers */, 22C8D0961769F8FF00DAFB4E /* rfc2429.h in Headers */, 22C8D0971769F8FF00DAFB4E /* scaler.h in Headers */, + 1561A554178D9C68006B4B2F /* ioshardware.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2245,6 +2250,7 @@ 22C8D0DF1769F8FF00DAFB4E /* speexec.c in Sources */, 22C8D0E01769F8FF00DAFB4E /* msopus.c in Sources */, 22C8D0ED176A079600DAFB4E /* aac-eld.c in Sources */, + 1561A555178D9C71006B4B2F /* ioshardware.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3151,7 +3157,7 @@ "TARGET_OS_IPHONE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( @@ -3369,7 +3375,7 @@ "TARGET_OS_IPHONE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( @@ -3416,7 +3422,7 @@ "TARGET_OS_IPHONE=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "$(SRCROOT)/linphone/mediastreamer2/tools/ios/mediastream-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ( From c9035d911bac8fef20d2013896b9c210a5cefa16 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 12 Jul 2013 11:04:42 +0200 Subject: [PATCH 126/218] fix abusive display name in history --- Classes/HistoryTableViewController.m | 5 +---- submodules/belle-sip | 2 +- submodules/build/builder-iphone-os.mk | 2 ++ submodules/linphone | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Classes/HistoryTableViewController.m b/Classes/HistoryTableViewController.m index 6091ab727..5ffe5addb 100644 --- a/Classes/HistoryTableViewController.m +++ b/Classes/HistoryTableViewController.m @@ -185,11 +185,8 @@ } if(useLinphoneAddress) { const char* lDisplayName = linphone_address_get_display_name(addr); - const char* lUserName = linphone_address_get_username(addr); - if (lDisplayName) + if (lDisplayName) displayName = [NSString stringWithUTF8String:lDisplayName]; - else if(lUserName) - displayName = [NSString stringWithUTF8String:lUserName]; } } diff --git a/submodules/belle-sip b/submodules/belle-sip index dc04f9f97..8e571e5f6 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit dc04f9f970157bd2de57676aa9fb6cfbbea084a6 +Subproject commit 8e571e5f641c0bd673ce191d237d3cb2f0eac63c diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 7c8d07380..d5dc92075 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -77,6 +77,8 @@ $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties: rm -f $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile +enable_gpl_third_parties?=yes + ifeq ($(enable_gpl_third_parties),yes) linphone_configure_controls+= --enable-ffmpeg detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties diff --git a/submodules/linphone b/submodules/linphone index bdd9839de..89f3e2ced 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bdd9839dea820ec38171b3a6a8ea14358bf9210b +Subproject commit 89f3e2ceda901574092b14bd37a5079e9d95ed84 From eb9958044b090ce325ef437af07b2580ac804289 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 12 Jul 2013 23:54:32 +0200 Subject: [PATCH 127/218] update to newer ffmpeg --- submodules/build/builders.d/ffmpeg.mk | 7 ++++--- submodules/externals/ffmpeg | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk index c47fd5fe4..7f8023bc6 100644 --- a/submodules/build/builders.d/ffmpeg.mk +++ b/submodules/build/builders.d/ffmpeg.mk @@ -4,13 +4,14 @@ ffmpeg_configure_options=\ --disable-ffprobe --disable-ffserver --disable-avdevice \ --disable-avfilter --disable-network \ --disable-everything --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 \ - --enable-decoder=h264 --disable-avformat --enable-armv5te --enable-armv6 --enable-armv6t2 \ - --enable-armvfp \ + --enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 \ --cross-prefix=$$SDK_BIN_PATH/ \ --sysroot=$$SYSROOT_PATH --arch=$$ARCH \ --enable-static --disable-shared --target-os=darwin \ --extra-cflags="-arch $$ARCH " --extra-ldflags="-arch $$ARCH -Wl,-syslibroot,$$SYSROOT_PATH " \ - --source-path=$(BUILDER_SRC_DIR)/$(ffmpeg_dir) + --disable-iconv \ + --disable-armv5te + # --as=$(BUILDER_SRC_DIR)/externals/x264/extras/gas-preprocessor.pl #--sysinclude=PATH location of cross-build system headers diff --git a/submodules/externals/ffmpeg b/submodules/externals/ffmpeg index 907783f22..2b8b2ba19 160000 --- a/submodules/externals/ffmpeg +++ b/submodules/externals/ffmpeg @@ -1 +1 @@ -Subproject commit 907783f221ad9594a528681e30777705f11bf0b5 +Subproject commit 2b8b2ba19fe0ca6594cb09439b9ead2c328a79d8 From 7b6190247776a163a58c339845b4328718e6822b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sat, 13 Jul 2013 10:23:02 +0200 Subject: [PATCH 128/218] remove ffmpeg patch, no longer necessary --- submodules/build/builders.d/ffmpeg.mk | 2 +- submodules/build/builders.d/ffmpeg.patch | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 submodules/build/builders.d/ffmpeg.patch diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk index 7f8023bc6..7c02560ed 100644 --- a/submodules/build/builders.d/ffmpeg.mk +++ b/submodules/build/builders.d/ffmpeg.mk @@ -28,7 +28,7 @@ $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/patched : && git apply $(BUILDER_SRC_DIR)/build/builders.d/ffmpeg.patch \ && touch $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/patched -$(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak: $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/patched +$(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak: mkdir -p $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/ \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ diff --git a/submodules/build/builders.d/ffmpeg.patch b/submodules/build/builders.d/ffmpeg.patch deleted file mode 100644 index 05e080905..000000000 --- a/submodules/build/builders.d/ffmpeg.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h -index 8f03d4b..0504b95 100644 ---- a/libavutil/arm/intmath.h -+++ b/libavutil/arm/intmath.h -@@ -91,10 +91,12 @@ static av_always_inline av_const int FASTDIV(int a, int b) - static av_always_inline av_const int32_t av_clipl_int32_arm(int64_t a) - { - int x, y; -- __asm__ volatile ("adds %1, %R2, %Q2, lsr #31 \n\t" -+ union { uint64_t a; uint32_t hl[2]; } tmp_a; -+ tmp_a.a=a; -+ __asm__ volatile ("adds %1, %2, %3, lsr #31 \n\t" - "mvnne %1, #1<<31 \n\t" -- "eorne %0, %1, %R2, asr #31 \n\t" -- : "=r"(x), "=&r"(y) : "r"(a)); -+ "eorne %0, %1, %2, asr #31 \n\t" -+ : "=r"(x), "=&r"(y) : "r"(tmp_a.hl[0]),"r"(tmp_a.hl[1])); - return x; - } - From c93c6ba9559d0fa0cdf5bc89c372ade480241012 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 14 Jul 2013 12:46:51 +0200 Subject: [PATCH 129/218] update belle-sip for fix for requests created within dialog, they should keep via parameters. --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 8e571e5f6..fcf533457 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 8e571e5f641c0bd673ce191d237d3cb2f0eac63c +Subproject commit fcf533457b3eceaaf48eb4aa397c3b7165a6ae71 From 991676c2a5126fdf3e17cf13681e2423f024a6da Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 14 Jul 2013 14:31:28 +0200 Subject: [PATCH 130/218] update belle-sip (fix outgoing via in refreshed requests) --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index fcf533457..1911434d7 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit fcf533457b3eceaaf48eb4aa397c3b7165a6ae71 +Subproject commit 1911434d7e9c2125cd38ee94078c375bfb115944 From f5fb96ad85c03d5668db8c43d279d49c208959bf Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 15 Jul 2013 09:57:57 +0200 Subject: [PATCH 131/218] update linphone submodule for bugfix of RTP recv buffer size --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 89f3e2ced..d37169c73 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 89f3e2ceda901574092b14bd37a5079e9d95ed84 +Subproject commit d37169c73faa186c41eaf8aa397c3b55730123a9 From 29ee7dfbd40fe7902b487cc7ff8141f8d0fd42e6 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 16 Jul 2013 11:07:37 +0200 Subject: [PATCH 132/218] fix crash in belle-sip when message are not parsed --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 1911434d7..1ac993594 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 1911434d7e9c2125cd38ee94078c375bfb115944 +Subproject commit 1ac993594fbc92adda2901b87d40c9c1ee026fe3 From fa7a05047f808e7fa979a54786263ca38e889b47 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 16 Jul 2013 19:32:02 +0200 Subject: [PATCH 133/218] update belle-sip for better refresher mangement in case of io error, update linphone to avoid multiple running stream --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 1ac993594..981b55eeb 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 1ac993594fbc92adda2901b87d40c9c1ee026fe3 +Subproject commit 981b55eeb29b1d1e85c85c0485230bf0fd752164 diff --git a/submodules/linphone b/submodules/linphone index d37169c73..7a6d1c294 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d37169c73faa186c41eaf8aa397c3b55730123a9 +Subproject commit 7a6d1c2946925520c30c8108acfb58631a7fc624 From 5828fb9a60a95d6c48d7b6f1da46c6598d220fa1 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 16 Jul 2013 22:12:10 +0200 Subject: [PATCH 134/218] linphone:only repport call error for negative answer to INVITE transaction --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7a6d1c294..60334f9d2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7a6d1c2946925520c30c8108acfb58631a7fc624 +Subproject commit 60334f9d213173554dcc8edaa7aa6309039b6c0b From b2b3b9d15c3fffd518ee50051605ae52fcf32007 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 17 Jul 2013 10:33:59 +0200 Subject: [PATCH 135/218] Support X509 alternate name --- submodules/externals/exosip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/exosip b/submodules/externals/exosip index ea5d69281..b42d2eb4f 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit ea5d692816953ac506464a53238f2103cda8cfee +Subproject commit b42d2eb4f137386c35c3226616e0cca213b94629 From 069b15eac53a770fb8e87f182905efae69df9cd1 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 17 Jul 2013 15:53:52 +0200 Subject: [PATCH 136/218] update belle-sip to better handle NOTIFY arriving during SUBSCRIBE transaction in state trying --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 981b55eeb..6fae7e1b1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 981b55eeb29b1d1e85c85c0485230bf0fd752164 +Subproject commit 6fae7e1b1478c56726c1c329189bcec5923baf28 From 465862dbcbb4afbfb07029268bbaabfb4d78e01a Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 18 Jul 2013 15:37:02 +0200 Subject: [PATCH 137/218] update belle-sip for PRACK --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 6fae7e1b1..00e90cef1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 6fae7e1b1478c56726c1c329189bcec5923baf28 +Subproject commit 00e90cef1c472fe252976030973aa1db88173079 From c811ba6a6577dad1f8092ab744941dd52c3c2975 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 19 Jul 2013 11:49:15 +0200 Subject: [PATCH 138/218] update belle sip with better channel parser --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 00e90cef1..e71922838 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 00e90cef1c472fe252976030973aa1db88173079 +Subproject commit e7192283803fc44148459502cdbeb739d8c355b9 From 2346b41235732a722114836ebe082c726a5d2c8d Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 22 Jul 2013 12:08:01 +0200 Subject: [PATCH 139/218] Add HD video configuration in the settings. --- Classes/LinphoneCoreSettingsStore.m | 30 +++++++++++++++++++ Resources/linphonerc | 2 ++ Resources/linphonerc-factory | 2 -- Resources/linphonerc-factory~ipad | 2 -- Resources/linphonerc~ipad | 2 ++ Settings/InAppSettings.bundle/Video.plist | 22 ++++++++++++++ .../en.lproj/Video.strings | 3 ++ .../fr.lproj/Video.strings | 3 ++ .../ru.lproj/Video.strings | 3 ++ .../Video/1/Video.strings | 3 ++ 10 files changed, 68 insertions(+), 4 deletions(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 0d423dd85..a703e3bb0 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -245,6 +245,16 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [self setBool:(pol->automatically_accept) forKey:@"accept_video_preference"]; [self setBool:linphone_core_self_view_enabled(lc) forKey:@"self_video_preference"]; [self setBool:linphone_core_video_preview_enabled(lc) forKey:@"preview_preference"]; + MSVideoSize vsize = linphone_core_get_preferred_video_size(lc); + int index; + if ((vsize.width == MS_VIDEO_SIZE_720P_W) && (vsize.height == MS_VIDEO_SIZE_720P_H)) { + index = 0; + } else if ((vsize.width == MS_VIDEO_SIZE_VGA_W) && (vsize.height == MS_VIDEO_SIZE_VGA_H)) { + index = 1; + } else { + index = 2; + } + [self setInteger:index forKey:@"video_preferred_size_preference"]; } { [self setBool:linphone_core_get_use_info_for_dtmf(lc) forKey:@"sipinfo_dtmf_preference"]; @@ -548,6 +558,26 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); linphone_core_set_video_policy(lc, &policy); linphone_core_enable_self_view(lc, [self boolForKey:@"self_video_preference"]); linphone_core_enable_video_preview(lc, [self boolForKey:@"preview_preference"]); + MSVideoSize vsize; + int bw; + switch ([self integerForKey:@"video_preferred_size_preference"]) { + case 0: + MS_VIDEO_SIZE_ASSIGN(vsize, 720P); + bw = 1024 * 1024; + break; + case 1: + MS_VIDEO_SIZE_ASSIGN(vsize, VGA); + bw = 512 * 1024; + break; + case 2: + default: + MS_VIDEO_SIZE_ASSIGN(vsize, QVGA); + bw = 380 * 1024; + break; + } + linphone_core_set_preferred_video_size(lc, vsize); + [self setInteger: bw forKey:@"upload_bandwidth_preference"]; + [self setInteger: bw forKey:@"download_bandwidth_preference"]; // Primary contact NSString* displayname = [self stringForKey:@"primary_displayname_preference"]; diff --git a/Resources/linphonerc b/Resources/linphonerc index 560a9780a..992f3b19c 100644 --- a/Resources/linphonerc +++ b/Resources/linphonerc @@ -19,6 +19,8 @@ automatically_accept=0 [net] firewall_policy=0 +download_bw=380 +upload_bw=380 [app] rotation_preference=auto diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index cc6384010..8cc8260f8 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -1,6 +1,4 @@ [net] -download_bw=380 -upload_bw=380 mtu=1300 activate_edge_workarounds=0 edge_ping_time=10 diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad index 80aa4e891..aa00ecfe4 100644 --- a/Resources/linphonerc-factory~ipad +++ b/Resources/linphonerc-factory~ipad @@ -1,6 +1,4 @@ [net] -download_bw=512 -upload_bw=512 mtu=1300 activate_edge_workarounds=0 edge_ping_time=200 diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index 4efe5a33e..cf9188553 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -19,6 +19,8 @@ automatically_accept=0 [net] firewall_policy=0 +download_bw=512 +upload_bw=512 [app] rotation_preference=auto diff --git a/Settings/InAppSettings.bundle/Video.plist b/Settings/InAppSettings.bundle/Video.plist index 77aa2e894..dfcd404b4 100644 --- a/Settings/InAppSettings.bundle/Video.plist +++ b/Settings/InAppSettings.bundle/Video.plist @@ -40,6 +40,28 @@ Key preview_preference + + DefaultValue + 1 + Key + video_preferred_size_preference + Title + Preferred video size + Titles + + HD (960x720) + VGA (640x480) + QVGA (320x240) + + Type + PSMultiValueSpecifier + Values + + 0 + 1 + 2 + + Title Codecs diff --git a/Settings/InAppSettings.bundle/en.lproj/Video.strings b/Settings/InAppSettings.bundle/en.lproj/Video.strings index 9ef83a74b..3d8acf107 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Video.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Video.strings @@ -10,6 +10,9 @@ /* Show preview */ "Show preview" = "Show preview"; +/* Preferred video size */ +"Preferred video size" = "Preferred video size"; + /* Codecs */ "Codecs" = "Codecs"; diff --git a/Settings/InAppSettings.bundle/fr.lproj/Video.strings b/Settings/InAppSettings.bundle/fr.lproj/Video.strings index 1bb62cc49..0109509a5 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Video.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Video.strings @@ -10,6 +10,9 @@ /* Show preview */ "Show preview" = "Activer la prévisualisation"; +/* Preferred video size */ +"Preferred video size" = "Taille de vidéo préférée"; + /* Codecs */ "Codecs" = "Codecs"; diff --git a/Settings/InAppSettings.bundle/ru.lproj/Video.strings b/Settings/InAppSettings.bundle/ru.lproj/Video.strings index 529d88d98..1e5d2b36e 100644 --- a/Settings/InAppSettings.bundle/ru.lproj/Video.strings +++ b/Settings/InAppSettings.bundle/ru.lproj/Video.strings @@ -10,6 +10,9 @@ /* Show preview */ "Show preview" = "Предварительный просмотр"; +/* Preferred video size */ +"Preferred video size" = "Preferred video size"; + /* Codecs */ "Codecs" = "Кодеки"; diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings b/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings index 9ef83a74b..3d8acf107 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings @@ -10,6 +10,9 @@ /* Show preview */ "Show preview" = "Show preview"; +/* Preferred video size */ +"Preferred video size" = "Preferred video size"; + /* Codecs */ "Codecs" = "Codecs"; From 0a8a0166452f21cceedbea2c4d7a158ebf3828ce Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 22 Jul 2013 13:26:22 +0200 Subject: [PATCH 140/218] Fix display of video preview with 720p capture. --- Classes/en.lproj/InCallViewController.xib | 139 +++++++++++++++-- Classes/fr.lproj/InCallViewController.xib | 145 ++++++++++++++++-- Classes/ru.lproj/InCallViewController.xib | 131 ++++++++++++++-- linphone.ldb/Contents.plist | 43 ++++-- .../{5 => 6}/InCallViewController.xib | 139 +++++++++++++++-- 5 files changed, 545 insertions(+), 52 deletions(-) rename linphone.ldb/Resources/Classes/InCallViewController/{5 => 6}/InCallViewController.xib (78%) diff --git a/Classes/en.lproj/InCallViewController.xib b/Classes/en.lproj/InCallViewController.xib index a35dfab43..91506d255 100644 --- a/Classes/en.lproj/InCallViewController.xib +++ b/Classes/en.lproj/InCallViewController.xib @@ -2,13 +2,13 @@ 784 - 11E53 - 2840 - 1138.47 - 569.00 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 YES @@ -52,6 +52,7 @@ 301 {{-1000, -1000}, {2000, 2000}} + _NS:9 @@ -65,6 +66,7 @@ 274 {320, 460} + _NS:196 @@ -76,11 +78,12 @@ 283 - {{220, 360}, {100, 100}} + {{216, 324}, {96, 128}} + - 1 + 2 IBCocoaTouchFramework @@ -88,6 +91,7 @@ 301 {{141, 212}, {37, 37}} + _NS:1030 NO @@ -99,6 +103,7 @@ {320, 460} + _NS:196 @@ -109,6 +114,7 @@ 274 {{0, -10}, {320, 480}} + _NS:418 @@ -139,6 +145,7 @@ -2147483356 {{20, 40}, {85, 33}} + _NS:9 NO @@ -174,6 +181,7 @@ {320, 460} + NO @@ -440,7 +448,120 @@ 173 - + + + YES + + InCallTableViewController + UITableViewController + + IBProjectSource + ./Classes/InCallTableViewController.h + + + + InCallViewController + UIViewController + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + InCallTableViewController + UITableView + UIView + UICamSwitch + UIView + UIView + UIView + UIActivityIndicatorView + + + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + + callTableController + InCallTableViewController + + + callTableView + UITableView + + + testVideoView + UIView + + + videoCameraSwitch + UICamSwitch + + + videoGroup + UIView + + + videoPreview + UIView + + + videoView + UIView + + + videoWaitingForFirstImage + UIActivityIndicatorView + + + + + IBProjectSource + ./Classes/InCallViewController.h + + + + UICamSwitch + UIButton + + preview + UIView + + + preview + + preview + UIView + + + + IBProjectSource + ./Classes/UICamSwitch.h + + + + 0 IBCocoaTouchFramework @@ -466,6 +587,6 @@ {151, 51} - 1926 + 2083 diff --git a/Classes/fr.lproj/InCallViewController.xib b/Classes/fr.lproj/InCallViewController.xib index e5a97fb30..fc534158d 100644 --- a/Classes/fr.lproj/InCallViewController.xib +++ b/Classes/fr.lproj/InCallViewController.xib @@ -2,22 +2,22 @@ 784 - 11E53 - 1938 - 1138.47 - 569.00 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 2083 YES - IBUITableView - IBUIButton - IBUIActivityIndicatorView - IBUIView - IBUITableViewController IBProxyObject + IBUIActivityIndicatorView + IBUIButton + IBUITableView + IBUITableViewController + IBUIView YES @@ -76,11 +76,11 @@ 283 - {{220, 360}, {100, 100}} + {{216, 324}, {96, 128}} - 1 + 2 IBCocoaTouchFramework @@ -405,7 +405,7 @@ 173.IBPluginDependency 9.IBPluginDependency - + YES InCallViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -439,7 +439,120 @@ 173 - + + + YES + + InCallTableViewController + UITableViewController + + IBProjectSource + ./Classes/InCallTableViewController.h + + + + InCallViewController + UIViewController + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + InCallTableViewController + UITableView + UIView + UICamSwitch + UIView + UIView + UIView + UIActivityIndicatorView + + + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + + callTableController + InCallTableViewController + + + callTableView + UITableView + + + testVideoView + UIView + + + videoCameraSwitch + UICamSwitch + + + videoGroup + UIView + + + videoPreview + UIView + + + videoView + UIView + + + videoWaitingForFirstImage + UIActivityIndicatorView + + + + + IBProjectSource + ./Classes/InCallViewController.h + + + + UICamSwitch + UIButton + + preview + UIView + + + preview + + preview + UIView + + + + IBProjectSource + ./Classes/UICamSwitch.h + + + + 0 IBCocoaTouchFramework @@ -459,12 +572,12 @@ switch_camera_default.png switch_camera_over.png - + YES {151, 51} {151, 51} - 933 + 2083 diff --git a/Classes/ru.lproj/InCallViewController.xib b/Classes/ru.lproj/InCallViewController.xib index 8ed22898e..df9b92da6 100644 --- a/Classes/ru.lproj/InCallViewController.xib +++ b/Classes/ru.lproj/InCallViewController.xib @@ -2,13 +2,13 @@ 784 - 12C60 - 2844 - 1187.34 - 625.00 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1930 + 2083 YES @@ -76,11 +76,11 @@ 283 - {{220, 360}, {100, 100}} + {{216, 324}, {96, 128}} - 1 + 2 IBCocoaTouchFramework @@ -439,7 +439,120 @@ 173 - + + + YES + + InCallTableViewController + UITableViewController + + IBProjectSource + ./Classes/InCallTableViewController.h + + + + InCallViewController + UIViewController + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + InCallTableViewController + UITableView + UIView + UICamSwitch + UIView + UIView + UIView + UIActivityIndicatorView + + + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + + callTableController + InCallTableViewController + + + callTableView + UITableView + + + testVideoView + UIView + + + videoCameraSwitch + UICamSwitch + + + videoGroup + UIView + + + videoPreview + UIView + + + videoView + UIView + + + videoWaitingForFirstImage + UIActivityIndicatorView + + + + + IBProjectSource + ./Classes/InCallViewController.h + + + + UICamSwitch + UIButton + + preview + UIView + + + preview + + preview + UIView + + + + IBProjectSource + ./Classes/UICamSwitch.h + + + + 0 IBCocoaTouchFramework @@ -465,6 +578,6 @@ {151, 51} - 1930 + 2083 diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index e0d4ea2f7..335cdec55 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -3741,17 +3741,17 @@ backup - 5 + 6 class BLWrapperHandle name - Classes/InCallViewController/5/InCallViewController.xib + Classes/InCallViewController/6/InCallViewController.xib change date - 2012-09-25T09:16:20Z + 2013-07-22T11:10:50Z changed values class @@ -3761,7 +3761,7 @@ flags 0 hash - 7f214a2ef7edff45568215c89af0ece4 + 8c081a9b0433d4932659d8da7064bcbe name InCallViewController.xib @@ -3802,11 +3802,11 @@ versions en - 5 + 6 fr - 5 + 6 ru - 5 + 6 @@ -18611,7 +18611,7 @@ Raison: %2$s change date - 2012-09-17T13:29:57Z + 2013-07-22T11:22:00Z changed values class @@ -18621,7 +18621,7 @@ Raison: %2$s flags 0 hash - b7297749603f255583f59fcea3174690 + 9da839864b9c883ec66e9863c5d94ced name Video.strings @@ -18735,6 +18735,31 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Preferred video size + errors + + flags + 0 + key + Preferred video size + localizations + + en + Preferred video size + fr + Taille de vidéo préférée + + snapshots + + change date 2001-01-01T00:00:00Z diff --git a/linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib b/linphone.ldb/Resources/Classes/InCallViewController/6/InCallViewController.xib similarity index 78% rename from linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib rename to linphone.ldb/Resources/Classes/InCallViewController/6/InCallViewController.xib index a35dfab43..91506d255 100644 --- a/linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib +++ b/linphone.ldb/Resources/Classes/InCallViewController/6/InCallViewController.xib @@ -2,13 +2,13 @@ 784 - 11E53 - 2840 - 1138.47 - 569.00 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 YES @@ -52,6 +52,7 @@ 301 {{-1000, -1000}, {2000, 2000}} + _NS:9 @@ -65,6 +66,7 @@ 274 {320, 460} + _NS:196 @@ -76,11 +78,12 @@ 283 - {{220, 360}, {100, 100}} + {{216, 324}, {96, 128}} + - 1 + 2 IBCocoaTouchFramework @@ -88,6 +91,7 @@ 301 {{141, 212}, {37, 37}} + _NS:1030 NO @@ -99,6 +103,7 @@ {320, 460} + _NS:196 @@ -109,6 +114,7 @@ 274 {{0, -10}, {320, 480}} + _NS:418 @@ -139,6 +145,7 @@ -2147483356 {{20, 40}, {85, 33}} + _NS:9 NO @@ -174,6 +181,7 @@ {320, 460} + NO @@ -440,7 +448,120 @@ 173 - + + + YES + + InCallTableViewController + UITableViewController + + IBProjectSource + ./Classes/InCallTableViewController.h + + + + InCallViewController + UIViewController + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + InCallTableViewController + UITableView + UIView + UICamSwitch + UIView + UIView + UIView + UIActivityIndicatorView + + + + YES + + YES + callTableController + callTableView + testVideoView + videoCameraSwitch + videoGroup + videoPreview + videoView + videoWaitingForFirstImage + + + YES + + callTableController + InCallTableViewController + + + callTableView + UITableView + + + testVideoView + UIView + + + videoCameraSwitch + UICamSwitch + + + videoGroup + UIView + + + videoPreview + UIView + + + videoView + UIView + + + videoWaitingForFirstImage + UIActivityIndicatorView + + + + + IBProjectSource + ./Classes/InCallViewController.h + + + + UICamSwitch + UIButton + + preview + UIView + + + preview + + preview + UIView + + + + IBProjectSource + ./Classes/UICamSwitch.h + + + + 0 IBCocoaTouchFramework @@ -466,6 +587,6 @@ {151, 51} - 1926 + 2083 From 81ef41876bf4225912c2105867e57db8b565d61b Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 23 Jul 2013 21:39:58 +0200 Subject: [PATCH 141/218] update linphone with various presence fixes --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 60334f9d2..7c2740020 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 60334f9d213173554dcc8edaa7aa6309039b6c0b +Subproject commit 7c274002039a697c917fc87aa4d2af9e81920aae From 60fd0cad0ceebcee806ec80d048e1e4fbf25fa3f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 24 Jul 2013 22:58:08 +0200 Subject: [PATCH 142/218] update belle-sip for reseting contact in case of io error, update linphone for making sure subscription are refreshed in case of network reconnection --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index e71922838..86e813107 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e7192283803fc44148459502cdbeb739d8c355b9 +Subproject commit 86e813107462b5df4e1eefc09b161bd31c0cd928 diff --git a/submodules/linphone b/submodules/linphone index 7c2740020..ab6027703 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7c274002039a697c917fc87aa4d2af9e81920aae +Subproject commit ab6027703b899f8ac0a79ee6cb730b7dcd2ebb69 From 087fe5660adaf78fa9e99c4e8b8c4671a6cd90b9 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 25 Jul 2013 10:32:54 +0200 Subject: [PATCH 143/218] update linphone to fix a vfu crash --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ab6027703..c76dab412 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ab6027703b899f8ac0a79ee6cb730b7dcd2ebb69 +Subproject commit c76dab4120c4c3a4b01455578cd443439db92282 From 0f8cd47b25cc3d4f427822665d21e8d4fedcce55 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sat, 27 Jul 2013 00:37:19 +0200 Subject: [PATCH 144/218] update linphone with subscription fixes --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 86e813107..863dd52dd 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 86e813107462b5df4e1eefc09b161bd31c0cd928 +Subproject commit 863dd52dd4cc65bc01705efbdeff898359065f9c diff --git a/submodules/linphone b/submodules/linphone index c76dab412..af0df9b19 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c76dab4120c4c3a4b01455578cd443439db92282 +Subproject commit af0df9b19b40aa1e46d7135c809db4f694218790 From a23d44ac11004a4c44404d339568c8e282579d20 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sat, 27 Jul 2013 00:55:17 +0200 Subject: [PATCH 145/218] update gitmodule to use public repo --- .gitmodules | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index be0985f80..24bc79d42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,6 @@ [submodule "submodules/linphone"] path = submodules/linphone - url = gitosis@git.linphone.org:linphone-private -[submodule "submodules/externals/osip"] - path = submodules/externals/osip - url = git://git.linphone.org/osip.git -[submodule "submodules/externals/exosip"] - path = submodules/externals/exosip - url = git://git.linphone.org/exosip.git + url = git://git.linphone.org/linphone [submodule "submodules/externals/gsm"] path = submodules/externals/gsm url = git://git.linphone.org/gsm.git @@ -51,7 +45,7 @@ url = git://git.linphone.org/bcg729.git [submodule "submodules/belle-sip"] path = submodules/belle-sip - url = gitosis@git.linphone.org:belle-sip + url = git://git.linphone.org/belle-sip [submodule "submodules/externals/antlr3"] path = submodules/externals/antlr3 url = git://git.linphone.org/antlr3.git From 5824dff9e7d6081bb6655ede44f2bbb149b01eae Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 29 Jul 2013 16:54:16 +0200 Subject: [PATCH 146/218] update README --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 87e863590..2dca42667 100644 --- a/README +++ b/README @@ -15,7 +15,7 @@ Once xcode and macports are installed, open a terminal and install the required $ sudo port install coreutils automake autoconf libtool intltool wget pkgconfig cmake gmake yasm grep doxygen ImageMagick optipng antlr3 -Install gas-preprosessor.pl (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : +Install gas-preprosessor.pl version above Jully 2013 (http://github.com/yuvi/gas-preprocessor/ ) to be copied into /opt/local/bin : $ wget --no-check-certificate https://raw.github.com/yuvi/gas-preprocessor/master/gas-preprocessor.pl $ sudo mv gas-preprocessor.pl /opt/local/bin/. From 7000ecef8ff75e5bf4c9d81690864f6cc5051147 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 30 Jul 2013 17:23:27 +0200 Subject: [PATCH 147/218] update linphone & belle-sip (for call-release robustification) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 863dd52dd..c043253b6 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 863dd52dd4cc65bc01705efbdeff898359065f9c +Subproject commit c043253b691fe63752800d2c628ecd09c0736b29 diff --git a/submodules/linphone b/submodules/linphone index af0df9b19..6e6e33ae2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit af0df9b19b40aa1e46d7135c809db4f694218790 +Subproject commit 6e6e33ae23ff7fade0091621cccdf309617d3828 From 6bea239ca19059c58b132db264c68576424ab3dc Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 30 Jul 2013 22:02:23 +0200 Subject: [PATCH 148/218] update linphone submodule for crash fix in mediastreamer2 --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 6e6e33ae2..a7255768a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6e6e33ae23ff7fade0091621cccdf309617d3828 +Subproject commit a7255768a7638b9307259f792b8f1a8a832676c5 From a5a63d3969c88222db8c266a550ecbb7b4f43646 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 1 Aug 2013 00:28:33 +0200 Subject: [PATCH 149/218] update belle-sip and linphone for bug fixes --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 863dd52dd..92336dbd1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 863dd52dd4cc65bc01705efbdeff898359065f9c +Subproject commit 92336dbd15713958f2fa37a2be323263fd7c5ab8 diff --git a/submodules/linphone b/submodules/linphone index af0df9b19..c19925c0d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit af0df9b19b40aa1e46d7135c809db4f694218790 +Subproject commit c19925c0d95312263d07e14ce021c8ffd7e01d32 From d278fa540d99c19daebef7e0499cef365cec7f6e Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sun, 4 Aug 2013 13:21:32 +0200 Subject: [PATCH 150/218] update linphone to fix file sharing --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index c19925c0d..eb37b082a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c19925c0d95312263d07e14ce021c8ffd7e01d32 +Subproject commit eb37b082a0cd81a12e01f2a0a1a736b67c638ccd From a6a6db78e7557cd000cfdcf7675542b2ee596232 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 4 Aug 2013 15:35:37 +0200 Subject: [PATCH 151/218] update linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 92336dbd1..44bd1668d 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 92336dbd15713958f2fa37a2be323263fd7c5ab8 +Subproject commit 44bd1668d510b6311442703ecf6a88eb0e821f1a diff --git a/submodules/linphone b/submodules/linphone index eb37b082a..0942ba67a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit eb37b082a0cd81a12e01f2a0a1a736b67c638ccd +Subproject commit 0942ba67a61ba1b47647d1610ade2f4537906b40 From 8c7434130b56e98e4d8e9511ab76cc40fdc460e2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 7 Aug 2013 00:58:19 +0200 Subject: [PATCH 152/218] update linphone submodule for early cancelled call fix. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 0942ba67a..491294b27 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0942ba67a61ba1b47647d1610ade2f4537906b40 +Subproject commit 491294b2794bfa6f60e80169fb44d028b3818c2a From 9e5b4b6377d7d97a3421d16f6081a69b0ee3ae2a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 8 Aug 2013 12:41:01 +0200 Subject: [PATCH 153/218] update zrtpcpp for security fixes --- submodules/externals/zrtpcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/zrtpcpp b/submodules/externals/zrtpcpp index 9cac07ec1..bfbfcab72 160000 --- a/submodules/externals/zrtpcpp +++ b/submodules/externals/zrtpcpp @@ -1 +1 @@ -Subproject commit 9cac07ec1a1f57bfd0198c0895fae42a79a62a9f +Subproject commit bfbfcab72dfa27862b05607d18bb24b6f8395fcf From 92f770ed159e441659d95b52fb44ebc4b63b555c Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 14 Aug 2013 16:14:14 +0200 Subject: [PATCH 154/218] update linphone & belle-sip (for transfer related functions) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 44bd1668d..274ee4488 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 44bd1668d510b6311442703ecf6a88eb0e821f1a +Subproject commit 274ee44882abdda62914a09cc9f2df38892ca336 diff --git a/submodules/linphone b/submodules/linphone index 491294b27..01d35e5b5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 491294b2794bfa6f60e80169fb44d028b3818c2a +Subproject commit 01d35e5b53fca8358e2b9b8dc67d47b4cca4327f From dfe1f1ac7235af93ca76dd90972a96f41e30be40 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 19 Aug 2013 12:02:49 +0200 Subject: [PATCH 155/218] Update msx264 submodule to fix compilation with updated ms2. --- submodules/msx264 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/msx264 b/submodules/msx264 index ec2da46e0..dfa98d491 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit ec2da46e0f43dcd7116b8ce9253deae1cd120c48 +Subproject commit dfa98d491f9760b9a540197c43d3fccc13bc5ce7 From e1362e10f33bb80f1779e970fc083f7dcc3aceb7 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 21 Aug 2013 10:56:14 +0200 Subject: [PATCH 156/218] Fix compilation after update of zrtp. --- linphone.xcodeproj/project.pbxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 4636f6a60..cc71ba333 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 15017E701773578400784ACB /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15017E6F1773578400784ACB /* libxml2.a */; }; 15017E71177357C500784ACB /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15017E6F1773578400784ACB /* libxml2.a */; }; + 154227D117BA81CE005E686A /* libzrtpcppcore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154227D017BA81CE005E686A /* libzrtpcppcore.a */; }; 1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; 1599105416F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; }; 1599105516F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */; }; @@ -192,7 +193,6 @@ 340751E8150F38FD00B89C47 /* UIVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIVideoButton.m */; }; 34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; }; 34216F411547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; }; - 344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDE71484E723007420B6 /* libzrtpcpp.a */; }; 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */; }; @@ -1411,6 +1411,7 @@ /* Begin PBXFileReference section */ 15017E6F1773578400784ACB /* libxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxml2.a; path = "liblinphone-sdk/apple-darwin/lib/libxml2.a"; sourceTree = ""; }; + 154227D017BA81CE005E686A /* libzrtpcppcore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzrtpcppcore.a; path = "liblinphone-sdk/apple-darwin/lib/libzrtpcppcore.a"; sourceTree = ""; }; 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default_landscape.png; path = Resources/route_bluetooth_off_default_landscape.png; sourceTree = ""; }; 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_disabled_landscape.png; path = Resources/route_bluetooth_off_disabled_landscape.png; sourceTree = ""; }; 1599104516F746B2007BF52B /* route_bluetooth_off_over_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_over_landscape.png; path = Resources/route_bluetooth_off_over_landscape.png; sourceTree = ""; }; @@ -2517,6 +2518,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 154227D117BA81CE005E686A /* libzrtpcppcore.a in Frameworks */, 15017E701773578400784ACB /* libxml2.a in Frameworks */, 22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */, 57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */, @@ -2569,7 +2571,6 @@ 22276E8513C73D3100210156 /* libswscale.a in Frameworks */, 7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */, 22AA8AFD13D7125600B30535 /* libx264.a in Frameworks */, - 344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3269,6 +3270,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 154227D017BA81CE005E686A /* libzrtpcppcore.a */, 15017E6F1773578400784ACB /* libxml2.a */, 57B0E35F173C010400A476B8 /* libpolarssl.a */, 223CA7E416D9255800EF1BEC /* libantlr3c.a */, From 1ef6bf2fc7bb35a0ba282123c383ca2115898510 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 26 Aug 2013 11:03:03 +0200 Subject: [PATCH 157/218] only repport registration error due to bad credential --- Classes/PhoneMainView.m | 44 +++++++++--------------------- linphone.xcodeproj/project.pbxproj | 4 +-- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 50fd131d6..d219b99f5 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -211,42 +211,24 @@ static PhoneMainView* phoneMainViewInstance=nil; [self updateApplicationBadgeNumber]; } -- (void)registrationUpdate:(NSNotification*)notif { +- (void)registrationUpdate:(NSNotification*)notif { LinphoneRegistrationState state = [[notif.userInfo objectForKey: @"state"] intValue]; LinphoneProxyConfig *cfg = [[notif.userInfo objectForKey: @"cfg"] pointerValue]; - // Show error - if (state == LinphoneRegistrationFailed) { - NSString* lErrorMessage = nil; - LinphoneReason reason = linphone_proxy_config_get_error(cfg); - if (reason == LinphoneReasonBadCredentials) { - lErrorMessage = NSLocalizedString(@"Bad credentials, check your account settings", nil); - } else if (reason == LinphoneReasonNoResponse) { - lErrorMessage = NSLocalizedString(@"SIP server unreachable", nil); - } else { - lErrorMessage = NSLocalizedString(@"Unknown error", nil); - } - - if (lErrorMessage != nil && linphone_proxy_config_get_error(cfg) != LinphoneReasonNoResponse) { - //do not report network connection issue on registration - //default behavior if no registration delegates - UIApplicationState s = [UIApplication sharedApplication].applicationState; - - // do not stack error message when going to backgroud - if (s != UIApplicationStateBackground) { - UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Registration failure",nil) - message:lErrorMessage - delegate:nil - cancelButtonTitle:NSLocalizedString(@"Continue",nil) - otherButtonTitles:nil,nil]; - [error show]; - [error release]; - } - } - + //Only report bad credential issue + if (state == LinphoneRegistrationFailed + &&[UIApplication sharedApplication].applicationState != UIApplicationStateBackground + && linphone_proxy_config_get_error(cfg) == LinphoneReasonBadCredentials ) { + UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Registration failure",nil) + message:NSLocalizedString(@"Bad credentials, check your account settings", nil) + delegate:nil + cancelButtonTitle:NSLocalizedString(@"Continue",nil) + otherButtonTitles:nil,nil]; + [error show]; + [error release]; } } -- (void)callUpdate:(NSNotification*)notif { +- (void)callUpdate:(NSNotification*)notif { LinphoneCall *call = [[notif.userInfo objectForKey: @"call"] pointerValue]; LinphoneCallState state = [[notif.userInfo objectForKey: @"state"] intValue]; NSString *message = [notif.userInfo objectForKey: @"message"]; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 4636f6a60..dd056dab3 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -5789,7 +5789,7 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.3; LIBRARY_SEARCH_PATHS = ""; - PROVISIONING_PROFILE = "BB7E624F-8CD6-448B-A235-CE8DBB401F92"; + PROVISIONING_PROFILE = "0636A6EA-90EB-4D92-B707-19FC32F9A7CF"; SDKROOT = iphoneos; STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5801,7 +5801,6 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CODE_SIGN_ENTITLEMENTS = ""; - CODE_SIGN_IDENTITY = "iPhone Distribution: jehan monnier"; COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ""; @@ -5833,7 +5832,6 @@ ORDER_FILE = ""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; - PROVISIONING_PROFILE = "906D0BA7-CD8F-470C-A060-F0752867FC5D"; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/submodules/belle-sip b/submodules/belle-sip index 274ee4488..f10b5b4eb 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 274ee44882abdda62914a09cc9f2df38892ca336 +Subproject commit f10b5b4eb8dd5afc075d006f4cea108d662f5f41 diff --git a/submodules/linphone b/submodules/linphone index 01d35e5b5..6d0e4f352 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 01d35e5b53fca8358e2b9b8dc67d47b4cca4327f +Subproject commit 6d0e4f3525a56577cd3b0d2b48856e81227c7529 From 27a6fa39f9ef12c10b63c9a5d79d81adc0b329e1 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 27 Aug 2013 16:27:53 +0200 Subject: [PATCH 158/218] update linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 274ee4488..45b9b96be 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 274ee44882abdda62914a09cc9f2df38892ca336 +Subproject commit 45b9b96bee1fa6b9b4adc09419708e889fa0a021 diff --git a/submodules/linphone b/submodules/linphone index 01d35e5b5..094eea00e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 01d35e5b53fca8358e2b9b8dc67d47b4cca4327f +Subproject commit 094eea00e943bf38b8dd9384cb4457e4916e8e3c From 3f0f82b6eae1313ce6a4eb805bb79118bfb7f997 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 27 Aug 2013 17:43:23 +0200 Subject: [PATCH 159/218] add --disable-tutorial to sdk --- submodules/build/builder-iphone-os.mk | 1 + submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index d5dc92075..5b7bf798f 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -38,6 +38,7 @@ linphone_configure_controls= \ --enable-bellesip \ --with-gsm=$(prefix) \ --disable-tests \ + --disable-tutorials \ --with-srtp=$(prefix) \ --with-antlr=$(prefix) \ --disable-msg-storage diff --git a/submodules/linphone b/submodules/linphone index 094eea00e..88add42eb 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 094eea00e943bf38b8dd9384cb4457e4916e8e3c +Subproject commit 88add42eb56c4c01d708720773e3b484f9c2a346 From 5248743e8d60510c0cf33a2f2f505080c0caaa31 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 28 Aug 2013 12:55:49 +0200 Subject: [PATCH 160/218] update linphone & belle-sip for bugfixes --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 45b9b96be..0d818b6ad 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 45b9b96bee1fa6b9b4adc09419708e889fa0a021 +Subproject commit 0d818b6ad4f2155ccfbacb951997742d6aac2631 diff --git a/submodules/linphone b/submodules/linphone index 88add42eb..50469413f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 88add42eb56c4c01d708720773e3b484f9c2a346 +Subproject commit 50469413f014b67c8bc0c667070d7d0a5b8fd98d From 7762f45313ed58c07329ead86229f1a48b970efc Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 28 Aug 2013 17:11:16 +0200 Subject: [PATCH 161/218] update belle-sip (bugfix) --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 0d818b6ad..7faa117c9 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 0d818b6ad4f2155ccfbacb951997742d6aac2631 +Subproject commit 7faa117c9264a659b3899d080d72bbcca8b73376 From b7bacd766fb2da27d9f6571722f1c241e78ee410 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 2 Sep 2013 16:35:24 +0200 Subject: [PATCH 162/218] update linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 7faa117c9..1aaa1067f 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7faa117c9264a659b3899d080d72bbcca8b73376 +Subproject commit 1aaa1067fad91975939dc6c5263f705fa5547ff3 diff --git a/submodules/linphone b/submodules/linphone index 50469413f..e1c0e1aa4 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 50469413f014b67c8bc0c667070d7d0a5b8fd98d +Subproject commit e1c0e1aa4fefcdd1d4099f6bc87edea397fb5885 From e30232bcf0cd12521326fa47dcafe5640619107f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 3 Sep 2013 22:40:25 +0200 Subject: [PATCH 163/218] update belle-sip and linphone for bugfixes around transfer scenarios. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 1aaa1067f..e43c0000f 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 1aaa1067fad91975939dc6c5263f705fa5547ff3 +Subproject commit e43c0000fc5b891eaf5685026cafdab18bffe89b diff --git a/submodules/linphone b/submodules/linphone index e1c0e1aa4..9a671657c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e1c0e1aa4fefcdd1d4099f6bc87edea397fb5885 +Subproject commit 9a671657c6edb30c188450ff257cb3dd88d839ee From b385211a151b5c4ec3df44312c1f68aa0683d7c3 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 4 Sep 2013 09:24:45 +0200 Subject: [PATCH 164/218] Update git urls from sourceforge. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 24bc79d42..376e5dfa6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,7 +15,7 @@ url = git://git.linphone.org/libilbc-rfc3951.git [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr - url = git://opencore-amr.git.sourceforge.net/gitroot/opencore-amr/opencore-amr + url = git://git.code.sf.net/p/opencore-amr/code [submodule "submodules/msamr"] path = submodules/msamr url = git://git.linphone.org/msamr.git From d944513a3e45186dc11ae572cb4b9906a5627ba1 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 4 Sep 2013 18:32:08 +0200 Subject: [PATCH 165/218] update bellesip for potential bugfix --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index e43c0000f..491ba6f26 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e43c0000fc5b891eaf5685026cafdab18bffe89b +Subproject commit 491ba6f26fb44cea03f5e9632dd220db1691f97f From 8a717d493725585933bee9b339205fbe5aaffa65 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 9 Sep 2013 17:57:59 +0200 Subject: [PATCH 166/218] update linphone & belle-sip (bugfixes) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 491ba6f26..eb0e151ee 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 491ba6f26fb44cea03f5e9632dd220db1691f97f +Subproject commit eb0e151eeaa5e8d0a4bebdb4d931234f8b0df0e1 diff --git a/submodules/linphone b/submodules/linphone index 9a671657c..5dea3b42f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9a671657c6edb30c188450ff257cb3dd88d839ee +Subproject commit 5dea3b42f09c3eb3b023a55a844c475576906bd6 From ec24b328c975e656653a1e6ef1e3823c58aa44ce Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 10 Sep 2013 17:12:22 +0200 Subject: [PATCH 167/218] update linphone and belle-sip (bugfixes) --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index eb0e151ee..53c84a87f 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit eb0e151eeaa5e8d0a4bebdb4d931234f8b0df0e1 +Subproject commit 53c84a87f165e91181a65cd1954a9bac0a84133e diff --git a/submodules/linphone b/submodules/linphone index 5dea3b42f..3a69a548d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5dea3b42f09c3eb3b023a55a844c475576906bd6 +Subproject commit 3a69a548dfd963eb34323d66761564cca74d771e From df1e9a731df4aec80900770cfd43c4f45599fbaa Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 10 Sep 2013 22:40:34 +0200 Subject: [PATCH 168/218] update belle-sip & linphone to fix build problems --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 53c84a87f..81b9e1b4e 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 53c84a87f165e91181a65cd1954a9bac0a84133e +Subproject commit 81b9e1b4e2264989d260b4dcd0969877ce7d7324 diff --git a/submodules/linphone b/submodules/linphone index 3a69a548d..adef4bdb1 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3a69a548dfd963eb34323d66761564cca74d771e +Subproject commit adef4bdb1233ecd2edcfd300dca20bf2533e68d8 From 3f46069b11b24dc834b069f070f5959117ba7ca1 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 11 Sep 2013 16:20:37 +0200 Subject: [PATCH 169/218] update linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 81b9e1b4e..a9ab01ca8 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 81b9e1b4e2264989d260b4dcd0969877ce7d7324 +Subproject commit a9ab01ca87d0c4dfa3e602bbf0018d435557e225 diff --git a/submodules/linphone b/submodules/linphone index adef4bdb1..ab2b7d0e3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit adef4bdb1233ecd2edcfd300dca20bf2533e68d8 +Subproject commit ab2b7d0e38e40c362015ed04e699f8c4286e064b From 5f0cf05dc9ba65723ac336d08668df1c5fdf54e2 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 13 Sep 2013 15:16:46 +0200 Subject: [PATCH 170/218] update linphone submodules (missing unSUBSCRIBEs and contact without username in publish) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ab2b7d0e3..16da9c1b3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ab2b7d0e38e40c362015ed04e699f8c4286e064b +Subproject commit 16da9c1b3bf76fa74f97fec1029f217c4fb68ecc From dfc3ff0aa90195d706088f219b58cf0e4157c8de Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 13 Sep 2013 16:49:44 +0200 Subject: [PATCH 171/218] update linphone (fixes in event api implementation) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 16da9c1b3..bbedbf765 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 16da9c1b3bf76fa74f97fec1029f217c4fb68ecc +Subproject commit bbedbf76523d76851b0026a45da4ba7b00905fdf From 2c408c88acb5718dcbcca7971fb1c3544055cd15 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 13 Sep 2013 18:40:06 +0200 Subject: [PATCH 172/218] update liblinphone (crash when presence unsubscription) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index bbedbf765..26a522902 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bbedbf76523d76851b0026a45da4ba7b00905fdf +Subproject commit 26a522902e38b825ce85fe07f34e3b504a4f05b8 From 3220b46c27e0646b58df3f533e25987bc25f3389 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 13 Sep 2013 21:52:36 +0200 Subject: [PATCH 173/218] update linphone submodule (bugfix for crash with null LinphoneContent) --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 26a522902..bce40f377 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 26a522902e38b825ce85fe07f34e3b504a4f05b8 +Subproject commit bce40f37753f6c1264fc9422e77ebac2629b75e7 From 41678a2f17abdbc1922accdbc04d47f9d9e1b765 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 17 Sep 2013 17:09:13 +0200 Subject: [PATCH 174/218] update belle-sip and linphone, for enhancements around generic publish --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index a9ab01ca8..a0f4af1ab 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit a9ab01ca87d0c4dfa3e602bbf0018d435557e225 +Subproject commit a0f4af1abdb1b85fef44cc037ff5013ed68fd3b6 diff --git a/submodules/linphone b/submodules/linphone index bce40f377..fed415507 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bce40f37753f6c1264fc9422e77ebac2629b75e7 +Subproject commit fed415507fddb794d2110c3a4e022c12018229e5 From 467091c6f4a21cf96f44ac8400b0655cd4a690e5 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 18 Sep 2013 10:20:56 +0200 Subject: [PATCH 175/218] update belle-sip for compile bugfix --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index a0f4af1ab..326aa5d54 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit a0f4af1abdb1b85fef44cc037ff5013ed68fd3b6 +Subproject commit 326aa5d540cfeeecdae56ef1bf8fe7dc7823d146 From 95c9a6fb59054260ea88bdb48468b48f632068f0 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 25 Sep 2013 12:09:28 +0200 Subject: [PATCH 176/218] update belle-sip and linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 326aa5d54..f3f343c3a 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 326aa5d540cfeeecdae56ef1bf8fe7dc7823d146 +Subproject commit f3f343c3ac5307a8f14effe253f8eaf3e85c4cd0 diff --git a/submodules/linphone b/submodules/linphone index fed415507..a6afcf99f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fed415507fddb794d2110c3a4e022c12018229e5 +Subproject commit a6afcf99fb2fa6dbf1a2a040767fba99ad7e35e3 From 488020498d51e6d77578465dd2bb463da83d921a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 26 Sep 2013 14:43:45 +0200 Subject: [PATCH 177/218] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a6afcf99f..643dc7f9f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a6afcf99fb2fa6dbf1a2a040767fba99ad7e35e3 +Subproject commit 643dc7f9f6c6b7d542a6e1724f943f97e0c0a9ca From 39a827344e22787fb59fc76347cecd1f77c4b9a4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 27 Sep 2013 08:49:23 +0200 Subject: [PATCH 178/218] fix linphone_address_get_port_int replaced by linphone_address_get_port --- Classes/LinphoneCoreSettingsStore.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index a703e3bb0..f0ca03b67 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -82,7 +82,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); if (addr){ const char *proxy=linphone_proxy_config_get_addr(cfg); LinphoneAddress *proxy_addr=linphone_address_new(proxy); - int port=linphone_address_get_port_int(proxy_addr); + int port=linphone_address_get_port(proxy_addr); [self setString: linphone_address_get_username(addr) forKey:@"username_preference"]; [self setString: linphone_address_get_domain(addr) forKey:@"domain_preference"]; From f9a64f6e4837e17381f8f74318b33f10945cb9cf Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 30 Sep 2013 16:52:20 +0200 Subject: [PATCH 179/218] Fix iOS7 cell transparency problems --- Classes/LinphoneUI/UICallCell.h | 3 +- Classes/LinphoneUI/UIChatCell.h | 4 +- Classes/LinphoneUI/UIChatRoomCell.h | 3 +- Classes/LinphoneUI/UIContactCell.h | 3 +- Classes/LinphoneUI/UIEditableTableViewCell.h | 3 +- Classes/LinphoneUI/UIHistoryCell.h | 3 +- Classes/LinphoneUI/UITransparentTVCell.h | 24 ++++++++++++ Classes/LinphoneUI/UITransparentTVCell.m | 39 ++++++++++++++++++++ linphone.xcodeproj/project.pbxproj | 8 ++++ 9 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 Classes/LinphoneUI/UITransparentTVCell.h create mode 100644 Classes/LinphoneUI/UITransparentTVCell.m diff --git a/Classes/LinphoneUI/UICallCell.h b/Classes/LinphoneUI/UICallCell.h index 8621ba4bc..b23867634 100644 --- a/Classes/LinphoneUI/UICallCell.h +++ b/Classes/LinphoneUI/UICallCell.h @@ -21,6 +21,7 @@ #include "linphonecore.h" #include "UIPauseButton.h" +#import "UITransparentTVCell.h" typedef enum _UICallCellOtherView { UICallCellOtherView_Avatar = 0, @@ -43,7 +44,7 @@ typedef enum _UICallCellOtherView { @end -@interface UICallCell : UITableViewCell { +@interface UICallCell : UITransparentTVCell { } @property (nonatomic, retain) UICallCellData *data; diff --git a/Classes/LinphoneUI/UIChatCell.h b/Classes/LinphoneUI/UIChatCell.h index 1cc731e93..49d370c5b 100644 --- a/Classes/LinphoneUI/UIChatCell.h +++ b/Classes/LinphoneUI/UIChatCell.h @@ -19,9 +19,11 @@ #import +#import "UITransparentTVCell.h" #import "ChatModel.h" -@interface UIChatCell : UITableViewCell { + +@interface UIChatCell : UITransparentTVCell { } @property (nonatomic, retain) ChatModel *chat; diff --git a/Classes/LinphoneUI/UIChatRoomCell.h b/Classes/LinphoneUI/UIChatRoomCell.h index 37b4a51e4..e043cc3d7 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.h +++ b/Classes/LinphoneUI/UIChatRoomCell.h @@ -22,9 +22,10 @@ #import "ChatModel.h" #import "ChatRoomTableViewController.h" #import "UILoadingImageView.h" +#import "UITransparentTVCell.h" -@interface UIChatRoomCell : UITableViewCell { +@interface UIChatRoomCell : UITransparentTVCell { } @property (nonatomic, retain) ChatModel *chat; diff --git a/Classes/LinphoneUI/UIContactCell.h b/Classes/LinphoneUI/UIContactCell.h index c94782949..a5ecc54d7 100644 --- a/Classes/LinphoneUI/UIContactCell.h +++ b/Classes/LinphoneUI/UIContactCell.h @@ -19,8 +19,9 @@ #import #import +#import "UITransparentTVCell.h" -@interface UIContactCell : UITableViewCell { +@interface UIContactCell : UITransparentTVCell { } @property (nonatomic, retain) IBOutlet UILabel* firstNameLabel; diff --git a/Classes/LinphoneUI/UIEditableTableViewCell.h b/Classes/LinphoneUI/UIEditableTableViewCell.h index d4ac998c5..5434eeb1e 100644 --- a/Classes/LinphoneUI/UIEditableTableViewCell.h +++ b/Classes/LinphoneUI/UIEditableTableViewCell.h @@ -18,8 +18,9 @@ */ #import +#import "UITransparentTVCell.h" -@interface UIEditableTableViewCell : UITableViewCell { +@interface UIEditableTableViewCell : UITransparentTVCell { } @property (nonatomic, retain) IBOutlet UITextField *detailTextField; diff --git a/Classes/LinphoneUI/UIHistoryCell.h b/Classes/LinphoneUI/UIHistoryCell.h index 574f84484..cc1891831 100644 --- a/Classes/LinphoneUI/UIHistoryCell.h +++ b/Classes/LinphoneUI/UIHistoryCell.h @@ -19,9 +19,10 @@ #import +#import "UITransparentTVCell.h" #include "linphonecore.h" -@interface UIHistoryCell : UITableViewCell { +@interface UIHistoryCell : UITransparentTVCell { } @property (nonatomic, assign) LinphoneCallLog *callLog; diff --git a/Classes/LinphoneUI/UITransparentTVCell.h b/Classes/LinphoneUI/UITransparentTVCell.h new file mode 100644 index 000000000..a0318cbd4 --- /dev/null +++ b/Classes/LinphoneUI/UITransparentTVCell.h @@ -0,0 +1,24 @@ +/* UITransparentTVCell.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import + +@interface UITransparentTVCell : UITableViewCell + +@end diff --git a/Classes/LinphoneUI/UITransparentTVCell.m b/Classes/LinphoneUI/UITransparentTVCell.m new file mode 100644 index 000000000..b027a3a07 --- /dev/null +++ b/Classes/LinphoneUI/UITransparentTVCell.m @@ -0,0 +1,39 @@ +/* UITransparentTVCell.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "UITransparentTVCell.h" + +@implementation UITransparentTVCell + +- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; + if (self) { + // Set transparent background + [self setBackgroundColor:[UIColor clearColor]]; + } + return self; +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated +{ + [super setSelected:selected animated:animated]; +} + +@end diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 1d2e15f42..892caba82 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1340,6 +1340,8 @@ D3F9A9DB15AEEB940045320F /* history_notification.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9DA15AEEB940045320F /* history_notification.png */; }; D3F9A9EE15AF277E0045320F /* UACellBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */; }; D3F9A9EF15AF277E0045320F /* UACellBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */; }; + F066515517F9A02E0064280C /* UITransparentTVCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F066515417F9A02E0064280C /* UITransparentTVCell.m */; }; + F066515617F9A02E0064280C /* UITransparentTVCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F066515417F9A02E0064280C /* UITransparentTVCell.m */; }; F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; }; /* End PBXBuildFile section */ @@ -2485,6 +2487,8 @@ D3F9A9DA15AEEB940045320F /* history_notification.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = history_notification.png; path = Resources/history_notification.png; sourceTree = ""; }; D3F9A9EC15AF277D0045320F /* UACellBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UACellBackgroundView.h; path = Utils/UACellBackgroundView/UACellBackgroundView.h; sourceTree = ""; }; D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UACellBackgroundView.m; path = Utils/UACellBackgroundView/UACellBackgroundView.m; sourceTree = ""; }; + F066515317F9A02E0064280C /* UITransparentTVCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransparentTVCell.h; sourceTree = ""; }; + F066515417F9A02E0064280C /* UITransparentTVCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransparentTVCell.m; sourceTree = ""; }; FD61C851169EAC63001AA2D6 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/ChatRoomViewController.xib; sourceTree = ""; }; FD61C853169FBBB6001AA2D6 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/ChatViewController.xib; sourceTree = ""; }; FD61C855169FBD1C001AA2D6 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/ContactDetailsLabelViewController.xib; sourceTree = ""; }; @@ -2994,6 +2998,8 @@ D32460E5159D9AAD00BA7F3A /* UITransparentView.m */, 340751E5150F38FC00B89C47 /* UIVideoButton.h */, 340751E6150F38FD00B89C47 /* UIVideoButton.m */, + F066515317F9A02E0064280C /* UITransparentTVCell.h */, + F066515417F9A02E0064280C /* UITransparentTVCell.m */, ); path = LinphoneUI; sourceTree = ""; @@ -5310,6 +5316,7 @@ D378906515AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */, D3E8F68615ADE05B0065A226 /* UIContactDetailsFooter.m in Sources */, C90FAA7915AF54E6002091CB /* HistoryDetailsViewController.m in Sources */, + F066515517F9A02E0064280C /* UITransparentTVCell.m in Sources */, D3F9A9EE15AF277E0045320F /* UACellBackgroundView.m in Sources */, D35860D615B549B500513429 /* Utils.m in Sources */, D3F7998115BD32370018C273 /* TPMultiLayoutViewController.m in Sources */, @@ -5408,6 +5415,7 @@ D378906615AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */, D3E8F68715ADE05B0065A226 /* UIContactDetailsFooter.m in Sources */, C90FAA7A15AF54E6002091CB /* HistoryDetailsViewController.m in Sources */, + F066515617F9A02E0064280C /* UITransparentTVCell.m in Sources */, D3F9A9EF15AF277E0045320F /* UACellBackgroundView.m in Sources */, D35860D715B549B500513429 /* Utils.m in Sources */, D3F7998215BD32370018C273 /* TPMultiLayoutViewController.m in Sources */, From e053a0ee19d17ad2039920ee3e00086d6414d5e0 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 30 Sep 2013 17:32:46 +0200 Subject: [PATCH 180/218] Fix compilation process for XCode 5 and following. Transitioned to using Clang instead of GCC everywhere possible, including x264 (some ASM was modified for that) --- submodules/build/builders.d/ffmpeg.mk | 13 +- submodules/build/builders.d/libvpx.mk | 11 +- submodules/build/builders.d/libvpx.patch | 43 +++++-- submodules/build/builders.d/mssilk.mk | 4 +- submodules/build/builders.d/opencore-amr.mk | 3 - submodules/build/builders.d/x264.mk | 20 ++- submodules/build/builders.d/x264.patch | 136 ++++++++++++++++++++ submodules/build/builders.d/zrtp.mk | 2 +- submodules/build/iphone-config-gcc.site | 51 -------- submodules/build/iphone-config.site | 2 + 10 files changed, 200 insertions(+), 85 deletions(-) delete mode 100644 submodules/build/iphone-config-gcc.site diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk index 7c02560ed..efc195970 100644 --- a/submodules/build/builders.d/ffmpeg.mk +++ b/submodules/build/builders.d/ffmpeg.mk @@ -8,9 +8,12 @@ ffmpeg_configure_options=\ --cross-prefix=$$SDK_BIN_PATH/ \ --sysroot=$$SYSROOT_PATH --arch=$$ARCH \ --enable-static --disable-shared --target-os=darwin \ - --extra-cflags="-arch $$ARCH " --extra-ldflags="-arch $$ARCH -Wl,-syslibroot,$$SYSROOT_PATH " \ + --extra-cflags="$$COMMON_FLAGS" --extra-ldflags="$$COMMON_FLAGS" \ --disable-iconv \ - --disable-armv5te + --disable-armv5te \ + --ar="$$AR" \ + --nm="$$NM" \ + --cc="$$CC" # --as=$(BUILDER_SRC_DIR)/externals/x264/extras/gas-preprocessor.pl @@ -32,10 +35,12 @@ $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak: mkdir -p $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/ \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/configure --prefix=$(prefix) $(ffmpeg_configure_options) + && $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/configure --prefix=$(prefix) $(ffmpeg_configure_options) build-ffmpeg: $(BUILDER_BUILD_DIR)/$(ffmpeg_dir)/config.mak - cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) \ + && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig make RANLIB="$$RANLIB" && make RANLIB="$$RANLIB" install clean-ffmpeg: cd $(BUILDER_BUILD_DIR)/$(ffmpeg_dir) && make clean diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 7623bbe11..2ceac8a0a 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -7,12 +7,13 @@ libvpx_configure_options=\ ifneq (,$(findstring armv6,$(host))) libvpx_configure_options+= --target=armv6-darwin-gcc --cpu=arm1176jzf-s else ifneq (,$(findstring armv7s,$(host))) - libvpx_configure_options+= --target=armv7s-darwin-gcc --cpu=cortex-a8 + libvpx_configure_options+= --target=armv7s-darwin-gcc else ifneq (,$(findstring armv7,$(host))) - libvpx_configure_options+= --target=armv7-darwin-gcc --cpu=cortex-a8 + libvpx_configure_options+= --target=armv7-darwin-gcc else libvpx_configure_options+= --target=x86-darwin10-gcc endif + libvpx_dir?=externals/libvpx all_p=armv6-darwin-gcc #neon Cortex-A8 all_p+=armv7-darwin-gcc #neon Cortex-A8 @@ -27,10 +28,12 @@ $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk: $(BUILDER_SRC_DIR)/$(libvpx_dir)/p mkdir -p $(BUILDER_BUILD_DIR)/$(libvpx_dir) cd $(BUILDER_BUILD_DIR)/$(libvpx_dir)/ \ && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && export all_platforms="${all_p}" && $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) --sdk-path=$$SDK_BIN_PATH/../../ --libc=$$SYSROOT_PATH $(libvpx_configure_options) + && export all_platforms="${all_p}" && $(BUILDER_SRC_DIR)/$(libvpx_dir)/configure --prefix=$(prefix) --sdk-path=$$SDK_BIN_PATH/../../ --libc=$$SYSROOT_PATH $(libvpx_configure_options) build-libvpx: $(BUILDER_BUILD_DIR)/$(libvpx_dir)/config.mk - cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install + cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) \ + && host_alias=${host} . $(BUILDER_SRC_DIR)/build/$(config_site) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-libvpx: cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make clean diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch index 0cd793f5f..d36f2be87 100644 --- a/submodules/build/builders.d/libvpx.patch +++ b/submodules/build/builders.d/libvpx.patch @@ -1,16 +1,28 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index c99a01c..48f8876 100755 +index c99a01c..f7f54c6 100755 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -892,7 +892,7 @@ process_common_toolchain() { - CXX=${TOOLCHAIN_PATH}/g++ - CC=${TOOLCHAIN_PATH}/gcc - AR=${TOOLCHAIN_PATH}/ar +@@ -889,13 +889,13 @@ process_common_toolchain() { + SDK_PATH=${sdk_path} + fi + TOOLCHAIN_PATH=${SDK_PATH}/usr/bin +- CXX=${TOOLCHAIN_PATH}/g++ +- CC=${TOOLCHAIN_PATH}/gcc +- AR=${TOOLCHAIN_PATH}/ar - LD=${TOOLCHAIN_PATH}/arm-apple-darwin10-llvm-gcc-4.2 -+ LD=${TOOLCHAIN_PATH}/gcc - AS=${TOOLCHAIN_PATH}/as - STRIP=${TOOLCHAIN_PATH}/strip - NM=${TOOLCHAIN_PATH}/nm +- AS=${TOOLCHAIN_PATH}/as +- STRIP=${TOOLCHAIN_PATH}/strip +- NM=${TOOLCHAIN_PATH}/nm ++ CXX=`xcrun --find g++` ++ CC=`xcrun --find gcc` ++ AR=`xcrun --find ar` ++ LD=`xcrun --find ld` ++ AS=`xcrun --find as` ++ STRIP=`xcrun --find strip` ++ NM=`xcrun --find nm` + AS_SFX=.s + + # ASFLAGS is written here instead of using check_add_asflags @@ -904,7 +904,7 @@ process_common_toolchain() { ASFLAGS="-version -arch ${tgt_isa} -g" @@ -20,3 +32,16 @@ index c99a01c..48f8876 100755 if [ -z "${alt_libc}" ]; then alt_libc=${SDK_PATH}/SDKs/iPhoneOS5.1.sdk +diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c +index a4a00f6..72d0b6d 100644 +--- a/vp8/decoder/decodframe.c ++++ b/vp8/decoder/decodframe.c +@@ -92,7 +92,7 @@ void vp8_mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) + } + } + +-static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ++void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, + unsigned int mb_idx) + { + MB_PREDICTION_MODE mode; diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk index d6dcda448..9a51ee5a6 100644 --- a/submodules/build/builders.d/mssilk.mk +++ b/submodules/build/builders.d/mssilk.mk @@ -30,7 +30,7 @@ $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/co echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir) cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \ - && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ + && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ --enable-static @@ -40,7 +40,7 @@ build-mssilk: $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile echo -e "\033[01;32m building silk \033[0m" cd $(BUILDER_BUILD_DIR)/$(mssilk_dir) \ && PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig \ - CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ + CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ make -j1 && make install diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk index d701283a7..a0fecedf3 100644 --- a/submodules/build/builders.d/opencore-amr.mk +++ b/submodules/build/builders.d/opencore-amr.mk @@ -19,9 +19,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # ############################################################################ -ifneq (,$(findstring arm,$(host))) - opencore-amr-configure-option=--enable-gcc-armv5 -endif opencore-amr_dir?=externals/opencore-amr diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index 3db77bc3f..1488b6960 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -26,22 +26,18 @@ x264-configure-option= \ --host=$(host)\ --enable-static \ --cross-prefix=$$SDK_BIN_PATH/ \ - --extra-ldflags="-arch $$ARCH -isysroot $$SYSROOT_PATH" + --extra-ldflags="$$COMMON_FLAGS" +XCFLAGS:=$$COMMON_FLAGS -ifneq (,$(findstring i386,$(host))) - x264-configure-option+= --extra-cflags="-arch $$ARCH -isysroot $$SYSROOT_PATH" -endif -ifneq (,$(findstring armv6,$(host))) - x264-configure-option+= --extra-cflags="-arch $$ARCH -mcpu=arm1176jzf-s -marm -isysroot $$SYSROOT_PATH" - x264-configure-option+= --disable-asm -endif ifneq (,$(findstring armv7,$(host))) - x264-configure-option+= --extra-cflags="-arch $$ARCH -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -isysroot $$SYSROOT_PATH" + XCFLAGS+= -mfpu=neon -mfloat-abi=softfp endif +x264-configure-option+= --extra-cflags="${XCFLAGS}" + x264_dir?=externals/x264 #$(BUILDER_SRC_DIR)/$(x264_dir)/patched : # cd $(BUILDER_SRC_DIR)/$(x264_dir) \ @@ -56,10 +52,12 @@ $(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak: $(BUILDER_BUILD_DIR)/$(x264_dir)/configure cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \ && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && ./configure --prefix=$(prefix) ${x264-configure-option} + && CC="$$CC" ./configure --prefix=$(prefix) $(x264-configure-option) build-x264: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak - cd $(BUILDER_BUILD_DIR)/$(x264_dir) make && make install + cd $(BUILDER_BUILD_DIR)/$(x264_dir) \ + && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ + && make STRIP="$$STRIP" AR="$$AR -r " RANLIB="$$RANLIB" CC="$$CC" && make STRIP="$$STRIP" AR="$$AR" RANLIB="$$RANLIB" install clean-x264: cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make clean diff --git a/submodules/build/builders.d/x264.patch b/submodules/build/builders.d/x264.patch index e6781e304..74bd49a01 100644 --- a/submodules/build/builders.d/x264.patch +++ b/submodules/build/builders.d/x264.patch @@ -10,3 +10,139 @@ index 8e70403..259bb92 100644 .global EXTERN_ASM\name EXTERN_ASM\name: ELF .hidden \name +diff --git a/common/arm/cpu-a.S b/common/arm/cpu-a.S +index a459553..bc91505 100644 +--- a/common/arm/cpu-a.S ++++ b/common/arm/cpu-a.S +@@ -26,7 +26,7 @@ + #include "asm.S" + + .fpu neon +-.align ++// .align + + // done in gas because .fpu neon overrides the refusal to assemble + // instructions the selected -march/-mcpu doesn't support +@@ -95,7 +95,7 @@ average_loop: + sub r2, r2, r1 + cmpgt r2, #30 << 3 // assume context switch if it took over 30 cycles + addle r3, r3, r2 +- subles ip, ip, #1 ++ suble ip, ip, #1 + bgt average_loop + + // disable counters if we enabled them +diff --git a/common/arm/mc-a.S b/common/arm/mc-a.S +index 507bbba..d5554be 100644 +--- a/common/arm/mc-a.S ++++ b/common/arm/mc-a.S +@@ -166,7 +166,7 @@ function x264_pixel_avg_\w\()x\h\()_neon + ldr ip, [sp, #8] + push {r4-r6,lr} + cmp ip, #32 +- ldrd r4, [sp, #16] ++ ldrd r4, r5, [sp, #16] + mov lr, #\h + beq x264_pixel_avg_w\w\()_neon + rsbs r6, ip, #64 +@@ -446,7 +446,7 @@ avg2_w20_loop: + .ifc \type, full + ldr lr, [r4, #32] // denom + .endif +- ldrd r4, [r4, #32+4] // scale, offset ++ ldrd r4, r5, [r4, #32+4] // scale, offset + vdup.16 q0, r4 + vdup.16 q1, r5 + .ifc \type, full +@@ -815,7 +815,7 @@ copy_w16_aligned_loop: + // int dx, int dy, int i_width, int i_height ); + function x264_mc_chroma_neon + push {r4-r6, lr} +- ldrd r4, [sp, #16] ++ ldrd r4, r5, [sp, #16] + ldr r6, [sp, #24] + + asr lr, r5, #3 +@@ -1271,8 +1271,8 @@ filter_h_loop: + function x264_frame_init_lowres_core_neon + push {r4-r10,lr} + vpush {d8-d15} +- ldrd r4, [sp, #96] +- ldrd r6, [sp, #104] ++ ldrd r4, r5, [sp, #96] ++ ldrd r6, r7, [sp, #104] + ldr lr, [sp, #112] + sub r10, r6, r7 // dst_stride - width + and r10, r10, #~15 +diff --git a/common/arm/pixel-a.S b/common/arm/pixel-a.S +index 8bce3b6..0784ae6 100644 +--- a/common/arm/pixel-a.S ++++ b/common/arm/pixel-a.S +@@ -328,9 +328,9 @@ SAD_FUNC_DUAL 16, 16 + function x264_pixel_sad_x\x\()_\w\()x\h\()_neon + push {r6-r7,lr} + .if \x == 3 +- ldrd r6, [sp, #12] ++ ldrd r6, r7, [sp, #12] + .else +- ldrd r6, [sp, #16] ++ ldrd r6, r7, [sp, #16] + ldr r12, [sp, #12] + .endif + mov lr, #FENC_STRIDE +@@ -596,7 +596,7 @@ function x264_pixel_var2_8x8_neon + vadd.s32 d1, d2, d3 + vpadd.s32 d0, d0, d1 + +- vmov.32 r0, r1, d0 ++ vmov r0, r1, d0 + vst1.32 {d0[1]}, [ip,:32] + mul r0, r0, r0 + sub r0, r1, r0, lsr #6 +diff --git a/common/arm/predict-a.S b/common/arm/predict-a.S +index af65bd7..8cdaf50 100644 +--- a/common/arm/predict-a.S ++++ b/common/arm/predict-a.S +@@ -181,9 +181,9 @@ function x264_predict_4x4_ddl_neon + + function x264_predict_8x8_dc_neon + mov ip, #0 +- ldrd r2, [r1, #8] ++ ldrd r2, r3, [r1, #8] + push {r4-r5,lr} +- ldrd r4, [r1, #16] ++ ldrd r4, r5, [r1, #16] + lsl r3, r3, #8 + ldrb lr, [r1, #7] + usad8 r2, r2, ip +diff --git a/common/arm/quant-a.S b/common/arm/quant-a.S +index e851562..c159f9e 100644 +--- a/common/arm/quant-a.S ++++ b/common/arm/quant-a.S +@@ -271,7 +271,7 @@ dequant_4x4_dc_rshift: + + // int coeff_last( int16_t *l ) + function x264_coeff_last4_arm +- ldrd r2, [r0] ++ ldrd r2, r3, [r0] + subs r0, r3, #0 + movne r0, #2 + movne r2, r3 +@@ -300,7 +300,7 @@ function x264_coeff_last\size\()_neon + + subs r1, ip, r1, lsr #2 + addge r0, r1, #\size - 8 +- sublts r0, r3, r0, lsr #2 ++ sublt r0, r3, r0, lsr #2 + movlt r0, #0 + bx lr + .endfunc +@@ -349,7 +349,7 @@ function x264_coeff_last64_neon + + subs r1, ip, r1 + addge r0, r1, #32 +- sublts r0, ip, r0 ++ sublt r0, ip, r0 + movlt r0, #0 + bx lr + .endfunc \ No newline at end of file diff --git a/submodules/build/builders.d/zrtp.mk b/submodules/build/builders.d/zrtp.mk index 6dff4c4d2..f41b2f5d6 100644 --- a/submodules/build/builders.d/zrtp.mk +++ b/submodules/build/builders.d/zrtp.mk @@ -4,7 +4,7 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile: cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\ && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake \ - -LH -Wdev -DCMAKE_C_COMPILER=$$SDK_BIN_PATH/gcc -DCMAKE_CXX_COMPILER=$$SDK_BIN_PATH/g++ \ + -LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find gcc` -DCMAKE_CXX_COMPILER=`xcrun --find g++` \ -DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \ -DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix) -DBUILD_STATIC=ON " # Used toolchain: $(TC) diff --git a/submodules/build/iphone-config-gcc.site b/submodules/build/iphone-config-gcc.site deleted file mode 100644 index 125bdebcd..000000000 --- a/submodules/build/iphone-config-gcc.site +++ /dev/null @@ -1,51 +0,0 @@ -# -*- shell-script -*- - -SDK_VERSION_MAJOR=4 -SDK_VERSION=4.0 -MCPU="" -if test "${host_alias}" = "i386-apple-darwin" ; then - PLATFORM=Simulator - ARCH=i386 - CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=i386" - MCPU="" -elif test "${host_alias}" = "armv6-apple-darwin" ; then - ARCH=armv6 - PLATFORM=OS - CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" - MCPU="-mcpu=arm1176jzf-s" -elif test "${host_alias}" = "armv7-apple-darwin" ; then - ARCH=armv7 - PLATFORM=OS - CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" - MCPU="-mcpu=cortex-a8" -elif test "${host_alias}" = "armv7s-apple-darwin" ; then - ARCH=armv7s - PLATFORM=OS - CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=arm" -else - echo "bad host ${host_alias} must be either i386-apple-darwin or armv6-apple-darwin" - exit -fi -echo "Loading config.site for iPhone platform=${PLATFORM} version=${SDK_VERSION}" -XCODE_DEV_PATH=`xcode-select -print-path` -#new path with Xcode 4.3: -if test -d ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs ; then - SDK_PATH_LIST=`ls -drt ${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` - SDK_BIN_PATH=${XCODE_DEV_PATH}/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin -else - SDK_PATH_LIST=`ls -drt /Developer/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}*` - SDK_BIN_PATH=/Developer/Platforms/iPhone${PLATFORM}.platform/Developer/usr/bin -fi - -for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; -echo "Selecting SDK path = ${SYSROOT_PATH}" -COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS" -CC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" -OBJC="${SDK_BIN_PATH}/gcc -std=c99 $COMMON_FLAGS" -CXX="${SDK_BIN_PATH}/g++ $COMMON_FLAGS" -LD="${SDK_BIN_PATH}/ld -arch ${ARCH}" -AR=${SDK_BIN_PATH}/ar -RANLIB=${SDK_BIN_PATH}/ranlib - -CPPFLAGS="-Dasm=__asm" -OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index e3bd5000c..1e8a74b95 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -39,6 +39,7 @@ fi for SYSROOT_PATH in $SDK_PATH_LIST ; do echo $SYSROOT_PATH ; done ; echo "Selecting SDK path = ${SYSROOT_PATH}" + COMMON_FLAGS=" -arch ${ARCH} ${MCPU} -isysroot ${SYSROOT_PATH} -miphoneos-version-min=${SDK_VERSION} -DTARGET_OS_IPHONE=1 -D__IOS -fms-extensions" CC="xcrun clang -std=c99 $COMMON_FLAGS" OBJC="xcrun clang -std=c99 $COMMON_FLAGS" @@ -46,6 +47,7 @@ CXX="xcrun clang++ $COMMON_FLAGS" LD="xcrun ld -arch ${ARCH}" AR="xcrun ar" RANLIB="xcrun ranlib" +STRIP="xcrun strip" CPPFLAGS="-Dasm=__asm" OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" From ce17708a34aed56628577059e14b44c01e130ea2 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 1 Oct 2013 08:58:14 +0200 Subject: [PATCH 181/218] Re-enable x264 patching and fix patch file. --- submodules/build/builders.d/x264.mk | 8 ++++---- submodules/build/builders.d/x264.patch | 14 +------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index 1488b6960..e84bed136 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -39,10 +39,10 @@ endif x264-configure-option+= --extra-cflags="${XCFLAGS}" x264_dir?=externals/x264 -#$(BUILDER_SRC_DIR)/$(x264_dir)/patched : -# cd $(BUILDER_SRC_DIR)/$(x264_dir) \ -# && git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \ -# && touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched +$(BUILDER_SRC_DIR)/$(x264_dir)/patched: + cd $(BUILDER_SRC_DIR)/$(x264_dir) \ + && git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \ + && touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched $(BUILDER_BUILD_DIR)/$(x264_dir)/configure: mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir) diff --git a/submodules/build/builders.d/x264.patch b/submodules/build/builders.d/x264.patch index 74bd49a01..60ffc6701 100644 --- a/submodules/build/builders.d/x264.patch +++ b/submodules/build/builders.d/x264.patch @@ -1,15 +1,3 @@ -diff --git a/common/arm/asm.S b/common/arm/asm.S -index 8e70403..259bb92 100644 ---- a/common/arm/asm.S -+++ b/common/arm/asm.S -@@ -47,6 +47,7 @@ ELF .eabi_attribute 25, \val - .endm - - .macro function name -+ .align 2 - .global EXTERN_ASM\name - EXTERN_ASM\name: - ELF .hidden \name diff --git a/common/arm/cpu-a.S b/common/arm/cpu-a.S index a459553..bc91505 100644 --- a/common/arm/cpu-a.S @@ -145,4 +133,4 @@ index e851562..c159f9e 100644 + sublt r0, ip, r0 movlt r0, #0 bx lr - .endfunc \ No newline at end of file + .endfunc From cc6074ad339dc90154e549ca4cfd67c2df646620 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 1 Oct 2013 17:41:37 +0200 Subject: [PATCH 182/218] + Fix x264 patch not applied after a clean + Fix libvpx and zrtp compilation for XCode 4.x Overall, we transition from using gcc to using clang all the way. This solves some tricky problems with -mtune options and architecture-dependant configure issues. --- submodules/build/builders.d/libvpx.mk | 2 +- submodules/build/builders.d/libvpx.patch | 6 +++--- submodules/build/builders.d/x264.mk | 8 ++++---- submodules/build/builders.d/zrtp.mk | 6 ++++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 2ceac8a0a..562d1869d 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -41,7 +41,7 @@ clean-libvpx: veryclean-libvpx: -cd $(BUILDER_BUILD_DIR)/$(libvpx_dir) && make distclean cd $(BUILDER_SRC_DIR)/$(libvpx_dir) \ - && git checkout build/make/configure.sh configure\ + && git clean -f && git reset --hard \ && rm -f patched.stamp rm -rf $(BUILDER_BUILD_DIR)/$(libvpx_dir) diff --git a/submodules/build/builders.d/libvpx.patch b/submodules/build/builders.d/libvpx.patch index d36f2be87..7824f7f11 100644 --- a/submodules/build/builders.d/libvpx.patch +++ b/submodules/build/builders.d/libvpx.patch @@ -13,10 +13,10 @@ index c99a01c..f7f54c6 100755 - AS=${TOOLCHAIN_PATH}/as - STRIP=${TOOLCHAIN_PATH}/strip - NM=${TOOLCHAIN_PATH}/nm -+ CXX=`xcrun --find g++` -+ CC=`xcrun --find gcc` ++ CXX=`xcrun --find clang++` ++ CC=`xcrun --find clang` + AR=`xcrun --find ar` -+ LD=`xcrun --find ld` ++ LD=`xcrun --find clang` + AS=`xcrun --find as` + STRIP=`xcrun --find strip` + NM=`xcrun --find nm` diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index e84bed136..8937c8d01 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -44,7 +44,7 @@ $(BUILDER_SRC_DIR)/$(x264_dir)/patched: && git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \ && touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched -$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: +$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_SRC_DIR)/$(x264_dir)/patched mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir) cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \ && rsync -rvLpgoc --exclude ".git" $(BUILDER_SRC_DIR)/$(x264_dir)/* . @@ -52,12 +52,12 @@ $(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak: $(BUILDER_BUILD_DIR)/$(x264_dir)/configure cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \ && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && CC="$$CC" ./configure --prefix=$(prefix) $(x264-configure-option) + && CC="$$CC" STRINGS="$$STRINGS" ./configure --prefix=$(prefix) $(x264-configure-option) build-x264: $(BUILDER_BUILD_DIR)/$(x264_dir)/config.mak cd $(BUILDER_BUILD_DIR)/$(x264_dir) \ && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ - && make STRIP="$$STRIP" AR="$$AR -r " RANLIB="$$RANLIB" CC="$$CC" && make STRIP="$$STRIP" AR="$$AR" RANLIB="$$RANLIB" install + && make STRIP="$$STRIP" AR="$$AR -r " RANLIB="$$RANLIB" CC="$$CC" STRINGS="$$STRINGS" && make STRIP="$$STRIP" AR="$$AR" RANLIB="$$RANLIB" STRINGS="$$STRINGS" install clean-x264: cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make clean @@ -65,7 +65,7 @@ clean-x264: veryclean-x264: -cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make distclean cd $(BUILDER_SRC_DIR)/$(x264_dir)/ \ - && git checkout common/arm/asm.S \ + && git clean -f && git reset --hard \ && rm -f patched rm -rf $(BUILDER_BUILD_DIR)/$(x264_dir) diff --git a/submodules/build/builders.d/zrtp.mk b/submodules/build/builders.d/zrtp.mk index f41b2f5d6..4a9ae96c7 100644 --- a/submodules/build/builders.d/zrtp.mk +++ b/submodules/build/builders.d/zrtp.mk @@ -4,7 +4,7 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile: cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/\ && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ && cmake $(BUILDER_SRC_DIR)/$(zrtpcpp_dir) -Denable-ccrtp=false -DCMAKE_TOOLCHAIN_FILE=$(BUILDER_SRC_DIR)build/iphone-toolchain.cmake \ - -LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find gcc` -DCMAKE_CXX_COMPILER=`xcrun --find g++` \ + -LH -Wdev -DCMAKE_C_COMPILER=`xcrun --find clang` -DCMAKE_CXX_COMPILER=`xcrun --find clang` \ -DCMAKE_SYSTEM_PROCESSOR=$$ARCH -DCMAKE_C_FLAGS="$$COMMON_FLAGS" -DCMAKE_CXX_FLAGS="$$COMMON_FLAGS" \ -DCMAKE_INSTALL_PREFIX=$(prefix) -DCMAKE_FIND_ROOT_PATH="$(prefix) -DBUILD_STATIC=ON " # Used toolchain: $(TC) @@ -12,7 +12,9 @@ $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile: build-zrtpcpp: $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir)/Makefile @echo "Build ZRTP - prefix $(prefix)" - cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make VERBOSE=1 && make install + cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) \ + && host_alias=$(host) . $(BUILDER_SRC_DIR)/build/$(config_site) \ + && make VERBOSE=1 && make install clean-zrtpcpp: -cd $(BUILDER_BUILD_DIR)/$(zrtpcpp_dir) && make clean From 2c246cba5e8203b1a40a35886b58baee116be7ec Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Tue, 1 Oct 2013 17:47:29 +0200 Subject: [PATCH 183/218] Update mssilk commit hash to fix ARM compilation. --- submodules/mssilk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mssilk b/submodules/mssilk index 49f89d0cb..ab300b6e9 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit 49f89d0cb2aaf676249c1b7cb0e545df78d2bf85 +Subproject commit ab300b6e98eeede557346b76fbc7c2860ebd55bd From 929aa2fac323114b6b5464347e40e03aeb0b88cd Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 09:27:44 +0200 Subject: [PATCH 184/218] Fix iOS7 introducing new sub-widgets in the widget tree, which broke a whole lot of 'superview' calls. --- Classes/ContactDetailsTableViewController.m | 2 +- Classes/LinphoneUI/UICallCell.m | 5 ++++- Classes/LinphoneUI/UIChatCell.m | 2 +- Classes/LinphoneUI/UIChatRoomCell.m | 2 +- Classes/LinphoneUI/UIContactDetailsHeader.m | 3 ++- Classes/LinphoneUI/UIHistoryCell.m | 2 +- .../Utils/UACellBackgroundView/UACellBackgroundView.m | 10 +++++----- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 42332e723..4bf5a1c3a 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -870,7 +870,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C - (BOOL)textFieldShouldEndEditing:(UITextField *)textField { UIView *view = [textField superview]; // Find TableViewCell - if(view != nil && ![view isKindOfClass:[UIEditableTableViewCell class]]) view = [view superview]; + while(view != nil && ![view isKindOfClass:[UIEditableTableViewCell class]]) view = [view superview]; if(view != nil) { UIEditableTableViewCell *cell = (UIEditableTableViewCell*)view; NSIndexPath *path = [self.tableView indexPathForCell:cell]; diff --git a/Classes/LinphoneUI/UICallCell.m b/Classes/LinphoneUI/UICallCell.m index 8d69976d7..4fe64cdc2 100644 --- a/Classes/LinphoneUI/UICallCell.m +++ b/Classes/LinphoneUI/UICallCell.m @@ -495,7 +495,10 @@ - (void)selfUpdate { UITableView *parentTable = (UITableView *)self.superview; - if(parentTable) { + + while( parentTable != nil && ![parentTable isKindOfClass:[UITableView class]] ) parentTable = (UITableView *)[parentTable superview]; + + if(parentTable != nil) { NSIndexPath *index= [parentTable indexPathForCell:self]; if(index != nil) { [parentTable reloadRowsAtIndexPaths:[[NSArray alloc] initWithObjects:index, nil] withRowAnimation:false]; diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m index 1ecac8e96..f731ca490 100644 --- a/Classes/LinphoneUI/UIChatCell.m +++ b/Classes/LinphoneUI/UIChatCell.m @@ -156,7 +156,7 @@ if(chat != NULL) { UIView *view = [self superview]; // Find TableViewCell - if(view != nil && ![view isKindOfClass:[UITableView class]]) view = [view superview]; + while( view != nil && ![view isKindOfClass:[UITableView class]]) view = [view superview]; if(view != nil) { UITableView *tableView = (UITableView*) view; NSIndexPath *indexPath = [tableView indexPathForCell:self]; diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index 5344fc135..25d5e2115 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -261,7 +261,7 @@ static UIFont *CELL_FONT = nil; if(chat != NULL) { UIView *view = [self superview]; // Find TableViewCell - if(view != nil && ![view isKindOfClass:[UITableView class]]) view = [view superview]; + while(view != nil && ![view isKindOfClass:[UITableView class]]) view = [view superview]; if(view != nil) { UITableView *tableView = (UITableView*) view; NSIndexPath *indexPath = [tableView indexPathForCell:self]; diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m index 71538cffa..87fd448bb 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.m +++ b/Classes/LinphoneUI/UIContactDetailsHeader.m @@ -340,7 +340,8 @@ - (BOOL)textFieldShouldEndEditing:(UITextField *)textField { UIView *view = [textField superview]; // Find TableViewCell - if(view != nil && ![view isKindOfClass:[UIEditableTableViewCell class]]) view = [view superview]; + while(view != nil && ![view isKindOfClass:[UIEditableTableViewCell class]]) view = [view superview]; + if(view != nil) { UIEditableTableViewCell *cell = (UIEditableTableViewCell*)view; NSIndexPath *indexPath = [self.tableView indexPathForCell:cell]; diff --git a/Classes/LinphoneUI/UIHistoryCell.m b/Classes/LinphoneUI/UIHistoryCell.m index 948894570..752fe178a 100644 --- a/Classes/LinphoneUI/UIHistoryCell.m +++ b/Classes/LinphoneUI/UIHistoryCell.m @@ -81,7 +81,7 @@ if(callLog != NULL) { UIView *view = [self superview]; // Find TableViewCell - if(view != nil && ![view isKindOfClass:[UITableView class]]) view = [view superview]; + while(view != nil && ![view isKindOfClass:[UITableView class]]) view = [view superview]; if(view != nil) { UITableView *tableView = (UITableView*) view; NSIndexPath *indexPath = [tableView indexPathForCell:self]; diff --git a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m index f5b043489..feb901710 100644 --- a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m +++ b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m @@ -83,16 +83,16 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi // Auto found position // - UIView *view = [self superview]; // Find TableViewCell - if(view != nil && ![view isKindOfClass:[UITableView class]]) view = [view superview]; + UIView *view = [self superview]; + while( view != nil && ![view isKindOfClass:[UITableView class]] ) view = [view superview]; - UIView *cellView = [self superview]; // Find TableViewCell - if(cellView != nil && ![cellView isKindOfClass:[UITableViewCell class]]) cellView = [cellView superview]; + UIView *cellView = [self superview]; + while( cellView != nil && ![cellView isKindOfClass:[UITableViewCell class]] ) cellView = [cellView superview]; if(view != nil && cellView != nil) { - UITableViewCell *cell = (UITableViewCell*)cellView; + UITableViewCell *cell = (UITableViewCell*)cellView; UITableView *tableView = (UITableView*)view; if([tableView style] == UITableViewStyleGrouped) { From 70ad68906f0b4ff5436cae81ffa9fb4f323b8c83 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 09:39:27 +0200 Subject: [PATCH 185/218] Fix the statusbar color in iOS7. --- Classes/LinphoneAppDelegate.m | 6 ++++++ linphone-Info.plist | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 4dc2e9923..2ce201919 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -144,6 +144,12 @@ [LinphoneLogger log:LinphoneLoggerLog format:@"PushNotification from launch received."]; [self processRemoteNotification:remoteNotif]; } + + // fix status bar color in iOS7 + if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) { + [application setStatusBarStyle:UIStatusBarStyleLightContent]; + } + return YES; } diff --git a/linphone-Info.plist b/linphone-Info.plist index 6118fb186..cae2d426b 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -98,5 +98,7 @@ UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationPortrait + UIViewControllerBasedStatusBarAppearance + From 3eec08773cd316369b9c570a234f77233274d50a Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 11:24:21 +0200 Subject: [PATCH 186/218] =?UTF-8?q?Disable=20the=20gcc=20in=20opencore-amr?= =?UTF-8?q?,=20which=20fixes=20compiler=20issue=20(was=20producing=20x86?= =?UTF-8?q?=20versions=20even=20for=20arm=20targets=E2=80=A6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- submodules/build/builder-iphone-os.mk | 1 - submodules/build/builders.d/opencore-amr.mk | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 5b7bf798f..7cf34c9fb 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -22,7 +22,6 @@ host?=armv7-apple-darwin config_site:=iphone-config.site -config_site_gcc:=iphone-config-gcc.site library_mode:= --disable-shared --enable-static linphone_configure_controls= \ --disable-strict \ diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk index a0fecedf3..2c68920fa 100644 --- a/submodules/build/builders.d/opencore-amr.mk +++ b/submodules/build/builders.d/opencore-amr.mk @@ -28,11 +28,11 @@ $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure: $(BUILDER_SRC_DIR)/$(opencore- $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile: $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure mkdir -p $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/ \ - && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) \ + && CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(BUILDER_SRC_DIR)/$(opencore-amr_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode} ${opencore-amr-configure-option} build-opencore-amr: $(BUILDER_BUILD_DIR)/$(opencore-amr_dir)/Makefile - cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site_gcc) make && make install + cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install clean-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean From b189297839e6ea7a451938e0d068041d1d38423b Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 12:06:17 +0200 Subject: [PATCH 187/218] Shorten long messages in chat view, so that they stay readable. --- Classes/LinphoneUI/UIChatCell.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m index f731ca490..785be72e4 100644 --- a/Classes/LinphoneUI/UIChatCell.m +++ b/Classes/LinphoneUI/UIChatCell.m @@ -116,7 +116,12 @@ if([chat isExternalImage] || [chat isInternalImage]) { [chatContentLabel setText:@""]; } else { - [chatContentLabel setText:[chat message]]; + NSString *message = [chat message]; + // shorten long messages + if([message length] > 50) + message = [[message substringToIndex:50] stringByAppendingString:@"[...]"]; + + [chatContentLabel setText:message]; } int count = [ChatModel unreadMessages:[chat remoteContact]]; From 78f9dc3ef77ad5737b86835edddde704f06a906a Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 12:08:37 +0200 Subject: [PATCH 188/218] Import commits from the InAppSettingsKit to fix rendering issues in iOS7. - https://github.com/futuretap/InAppSettingsKit/commit/66d95030cfac84f17f800056140523742b49957e - https://github.com/futuretap/InAppSettingsKit/commit/3dab71a7e4c6745f0ceca97bf2473f2354474df1 --- .../Controllers/IASKAppSettingsViewController.m | 8 ++++++-- .../Utils/InAppSettingsKit/Models/IASKSettingsReader.h | 8 +++++++- .../Views/IASKPSTitleValueSpecifierViewCell.m | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m index a6c143136..f9d7afc19 100755 --- a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m +++ b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m @@ -155,7 +155,11 @@ CGRect IASKCGRectSwap(CGRect rect); - (void) viewDidLoad { [super viewDidLoad]; if ([self isPad]) { - self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLineEtched; + // patch for iOS7 from https://github.com/futuretap/InAppSettingsKit/commit/66d95030cfac84f17f800056140523742b49957e +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 + if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_6_1) // don't use etched style on iOS 7 +#endif + self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLineEtched; } UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapToEndEdit:)]; tapGesture.cancelsTouchesInView = NO; @@ -446,7 +450,7 @@ CGRect IASKCGRectSwap(CGRect rect); if ((title = [self tableView:tableView titleForHeaderInSection:section])) { CGSize size = [title sizeWithFont:[UIFont boldSystemFontOfSize:[UIFont labelFontSize]] constrainedToSize:CGSizeMake(tableView.frame.size.width - 2*kIASKHorizontalPaddingGroupTitles, INFINITY) - lineBreakMode:UILineBreakModeWordWrap]; + lineBreakMode:NSLineBreakByWordWrapping]; return size.height+kIASKVerticalPaddingGroupTitles; } return 0; diff --git a/Classes/Utils/InAppSettingsKit/Models/IASKSettingsReader.h b/Classes/Utils/InAppSettingsKit/Models/IASKSettingsReader.h index 761de7546..a05ddb202 100755 --- a/Classes/Utils/InAppSettingsKit/Models/IASKSettingsReader.h +++ b/Classes/Utils/InAppSettingsKit/Models/IASKSettingsReader.h @@ -97,7 +97,13 @@ #define kIASKMinLabelWidth 97 #define kIASKMaxLabelWidth 240 #define kIASKMinValueWidth 35 -#define kIASKPaddingLeft 9 + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 + #define kIASKPaddingLeft (floor(NSFoundationVersionNumber) > NSFoundationVersionNumber_iOS_6_1 ? 14 : 9) +#else + #define kIASKPaddingLeft 9 +#endif + #define kIASKPaddingRight 10 #define kIASKHorizontalPaddingGroupTitles 19 #define kIASKVerticalPaddingGroupTitles 15 diff --git a/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m b/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m index 1b7cd98a3..1af806879 100755 --- a/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m +++ b/Classes/Utils/InAppSettingsKit/Views/IASKPSTitleValueSpecifierViewCell.m @@ -32,16 +32,16 @@ CGFloat labelWidth = [self.textLabel sizeThatFits:CGSizeZero].width; CGFloat minValueWidth = (self.detailTextLabel.text.length) ? kIASKMinValueWidth + kIASKSpacing : 0; labelWidth = MIN(labelWidth, viewSize.width - minValueWidth - kIASKPaddingLeft -kIASKPaddingRight - imageOffset); - CGRect labelFrame = CGRectMake(kIASKPaddingLeft + imageOffset, 0, labelWidth, viewSize.height -2); + CGRect labelFrame = CGRectMake(kIASKPaddingLeft + imageOffset, 0, labelWidth, viewSize.height); if (!self.detailTextLabel.text.length) { - labelFrame = CGRectMake(kIASKPaddingLeft + imageOffset, 0, viewSize.width - kIASKPaddingLeft - kIASKPaddingRight - imageOffset, viewSize.height -2); + labelFrame = CGRectMake(kIASKPaddingLeft + imageOffset, 0, viewSize.width - kIASKPaddingLeft - kIASKPaddingRight - imageOffset, viewSize.height); } self.textLabel.frame = labelFrame; // set the right value label frame if (!self.textLabel.text.length) { viewSize = [self.detailTextLabel superview].frame.size; - self.detailTextLabel.frame = CGRectMake(kIASKPaddingLeft + imageOffset, 0, viewSize.width - kIASKPaddingLeft - kIASKPaddingRight - imageOffset, viewSize.height -2); + self.detailTextLabel.frame = CGRectMake(kIASKPaddingLeft + imageOffset, 0, viewSize.width - kIASKPaddingLeft - kIASKPaddingRight - imageOffset, viewSize.height); } else if (self.detailTextLabel.textAlignment == UITextAlignmentLeft) { CGRect valueFrame = self.detailTextLabel.frame; valueFrame.origin.x = labelFrame.origin.x + MAX(kIASKMinLabelWidth - imageOffset, labelWidth) + kIASKSpacing; From 81fe7d6bf9b0bbf64ff8be6761c18ad9e1d365d2 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 12:28:19 +0200 Subject: [PATCH 189/218] Fix compatibility with older Xcode version --- Classes/LinphoneAppDelegate.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 2ce201919..66363f518 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -145,10 +145,12 @@ [self processRemoteNotification:remoteNotif]; } +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 // fix status bar color in iOS7 if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) { [application setStatusBarStyle:UIStatusBarStyleLightContent]; } +#endif return YES; } From 1d082b4f63eac0b4d6215e87375d50e2f6476cf4 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 12:33:58 +0200 Subject: [PATCH 190/218] Migrate from deprecated UITextAlign* to NSTextAlign* --- Classes/LinphoneUI/UIChatRoomCell.m | 2 +- Classes/Utils/GrowingTextView/HPGrowingTextView.h | 4 ++-- Classes/Utils/GrowingTextView/HPGrowingTextView.m | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index 25d5e2115..484120e04 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -204,7 +204,7 @@ static UIFont *CELL_FONT = nil; } messageSize = [[chat message] sizeWithFont: CELL_FONT constrainedToSize: CGSizeMake(width - CELL_MESSAGE_X_MARGIN, 10000.0f) - lineBreakMode: UILineBreakModeTailTruncation]; + lineBreakMode: NSLineBreakByTruncatingTail]; } else { messageSize = CGSizeMake(CELL_IMAGE_WIDTH, CELL_IMAGE_HEIGHT); } diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.h b/Classes/Utils/GrowingTextView/HPGrowingTextView.h index 56fc70ca5..f381d1b39 100755 --- a/Classes/Utils/GrowingTextView/HPGrowingTextView.h +++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.h @@ -63,7 +63,7 @@ //uitextview properties NSObject *__unsafe_unretained delegate; - UITextAlignment textAlignment; + NSTextAlignment textAlignment; NSRange selectedRange; BOOL editable; UIDataDetectorTypes dataDetectorTypes; @@ -84,7 +84,7 @@ @property(nonatomic,strong) NSString *text; @property(nonatomic,strong) UIFont *font; @property(nonatomic,strong) UIColor *textColor; -@property(nonatomic) UITextAlignment textAlignment; // default is UITextAlignmentLeft +@property(nonatomic) NSTextAlignment textAlignment; // default is UITextAlignmentLeft @property(nonatomic) NSRange selectedRange; // only ranges of length 0 are supported @property(nonatomic,getter=isEditable) BOOL editable; @property(nonatomic) UIDataDetectorTypes dataDetectorTypes __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_3_0); diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.m b/Classes/Utils/GrowingTextView/HPGrowingTextView.m index 625a17f62..a594818b7 100755 --- a/Classes/Utils/GrowingTextView/HPGrowingTextView.m +++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.m @@ -377,12 +377,12 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// --(void)setTextAlignment:(UITextAlignment)aligment +-(void)setTextAlignment:(NSTextAlignment)aligment { internalTextView.textAlignment = aligment; } --(UITextAlignment)textAlignment +-(NSTextAlignment)textAlignment { return internalTextView.textAlignment; } From 817f9c35b6f3873b6b5e9a4344e1e736edff5406 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 14:05:57 +0200 Subject: [PATCH 191/218] Adjust chat cell size for iOS7 compatibility. --- Classes/LinphoneUI/UIChatRoomCell.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m index 484120e04..fb8dcbcc8 100644 --- a/Classes/LinphoneUI/UIChatRoomCell.m +++ b/Classes/LinphoneUI/UIChatRoomCell.m @@ -64,6 +64,13 @@ static UIFont *CELL_FONT = nil; [messageImageView addGestureRecognizer:imageTapGestureRecognizer]; [self addSubview:innerView]; [deleteButton setAlpha:0.0f]; + + // shift message box, otherwise it will collide with the bubble + CGRect messageCoords = [messageText frame]; + messageCoords.origin.x += 5; + messageCoords.origin.y += 2; + messageCoords.size.width -= 5; + [messageText setFrame:messageCoords]; } return self; } From 626c280b092ba8b9b106965ee6be1ef9a938e604 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 14:41:24 +0200 Subject: [PATCH 192/218] Fix placeholder color for iOS7 --- Classes/DialerViewController.m | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m index cb28fefaa..a3a399688 100644 --- a/Classes/DialerViewController.m +++ b/Classes/DialerViewController.m @@ -153,6 +153,17 @@ static UICompositeViewDescription *compositeDescription = nil; [videoCameraSwitch setHidden:TRUE]; } } + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_6_0 // attributed string only available since iOS6 + if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) { + // fix placeholder bar color in iOS7 + UIColor *color = [UIColor grayColor]; + addressField.attributedPlaceholder = [[NSAttributedString alloc] + initWithString:addressField.placeholder + attributes:@{NSForegroundColorAttributeName: color}]; + } +#endif + } } From 7e8b6315d7209430b7e584e98e47a11e17f037a4 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 15:08:28 +0200 Subject: [PATCH 193/218] New icon resources for iOS7 --- Resources/linphone_icon_120.png | Bin 0 -> 7065 bytes Resources/linphone_icon_152.png | Bin 0 -> 9214 bytes Resources/linphone_icon_76.png | Bin 0 -> 4365 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/linphone_icon_120.png create mode 100644 Resources/linphone_icon_152.png create mode 100644 Resources/linphone_icon_76.png diff --git a/Resources/linphone_icon_120.png b/Resources/linphone_icon_120.png new file mode 100644 index 0000000000000000000000000000000000000000..eb43effe4df910ac78ba61b306aecce1dd6d3930 GIT binary patch literal 7065 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 literal 0 HcmV?d00001 diff --git a/Resources/linphone_icon_152.png b/Resources/linphone_icon_152.png new file mode 100644 index 0000000000000000000000000000000000000000..2cd0dc749735986f6794aa74ff2eff17fb8359c0 GIT binary patch literal 9214 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 literal 0 HcmV?d00001 diff --git a/Resources/linphone_icon_76.png b/Resources/linphone_icon_76.png new file mode 100644 index 0000000000000000000000000000000000000000..c324627c1bf26fb29ab295efdbfacaee7bdbb909 GIT binary patch literal 4365 zcmV+o5%TVdP)}$F9&RAD+x;sR00ppSXZ*OZK2rq$KEA{tAQ>2oh*oOu%(5QD54{*Wn^u+1d3e_xTSTZ z37V$0+N{G|&Lc|@(c4ndSyNDhe!^ZCir?2)tycmQW~?i5=~@bY!(~L4Ac~kqnplND%H5euA zSzNFT_;XL6VZb1W*eB0LXSNZnt0GiaMcC&;4Fw^AYm_u(1lDoWu#TIKwQw57%$%6} z!I}zcHoi;UwvSMQfv#$Cx3Fh%!G8ij>h%K+au_nQNuP5oL;mrf(OK-#^023gnvL&L zz5Y!!Rq3pmUr7&-%lKDdM1LyV*U(w)B#+3)I$~$?)ghh zdD`5CjDGT!s9WMbvX^5oJV2s2d(aW4x2G}cvDMhGx)z8SWzW%lcuyR}S9Ta**%6dx zPefP{5kwI~dKTs}lQ55&fMv`?EcsIqB&pp#>b_V<`CBiehAzyG>2q&o)RVuAl6Laf z&*0qkXEUr1FLdv*`Ui%T46a!DI_^WeIsL{@ zsapRg{_7>eGO zMxeSPqC*=D9>Ow)Q1i(~keS3haRn=cvM%71uz`1J^ zniBsi>#V6v_|^J27o}ZAXn{)=_g@7RF*&>q6BdL)ZICN6A+&SEER z)&iRLZzJq!in$j&Ux{S4Vi|j3A`nE8P~ACvCl5!70XjS_ zT=sn#)G9lTRxyV z41U4{0sEvmWG=Xylxg!~GO3~Z8r+BX4yZbPN|+!?kq||ckX;Sk&Xl%=&YFs2-koGF zScWk>H=#`Zmm8q_tJl3kw+Yi(?ARvE#60#&45<$EDGv1Zbo8ki=qxEQ3lmDS2f3*M z+0}sDcphKb5j>?u_{t8Wh2@0pTMDL-wO|=(vu{Dr8#>gbe*6D*SN&e2Q^G_;5|)Ci zuuqzUZPIMad42B}I5j_tSjl7%9`{k$Lmo zBa3KO}46y@+~apLQzhjaUn&Vl9};5FYMP8<%2q zK_bEg5yuU8GVGt8Zg&UFrG_SlaPHi6N&1c<%vvy&+!fDZ9yRWgDAQFme!Gouvm3g% zj@vu51duw2ydrsz{RioDZyi7ldX9!KKSq!Sk}c4}5yo@?lG)llvNR3g1w(I5^iX#${i;#LIC zouu~Dw{aD3C+v&e<1ch$z-USkUs(~pvdDs|s5fGtd_8G%7GaxoO?2l>SCD@7ZTLH z>&d)%IgXp|>(pURo4XKA4Rh+XmFQFS-QF+O69{`27iglvh%q}EHPB}t0`wZDVfo}e z@;dsI#Cs~*;>?>rr+)jN(cAT%%Jvk&x)5kBgb5-TGy69D=?m!X4o3dqx0r?(b||NX zWlEm^KEax!NantAUoJ-Qd=O2Irl^I;Y%|C%*;`N9Zy&^cXj_L5Bk1&u`O&Lrf(=dV zCw*FMc{J@HNW!4JG$la!J3q!#((yv8AtRfdyBO-hOHCARIFF~d9gP#&|p6ie_$Gkg1Gxv)Qt%%N&ZCTVi#xwT0H5f960MLB8gxbw( zY25cIIcr zd_rY()>QHyd5NrBpCnitx+D`pQ}G6xD-O0xm?1qI`{V_YP`NMr7A_uPQsi>XU(w-z z5Man14>IiDe<$pcqxA;za_)M+L;V~#E

cecESq&_oFn1@x&oSPQ3jN?1gx#dwbH zB;?%HCHcOD_xP8D>dP@?B>tw%H2exQS?iZ*CC07LCEL1HIc4g+OXO~VbI%9u>ZMOf z2PwI~-3kFgZ|W9dp@!1FHLikyrfMM2sjTPlX2Ra~cPi>ra{9&SU+@nkKh%IjP$g6wLZ>lmXC(D?0pWG{ND!@8c*VuCfN z5REv-ug+ zptoK9Q>I+Yn5W++>>Gpkm=D>jbjx#ALWw^SZV#&BiEBf$jG)~ttJ=`V>75INc~LVP6m)vi_i3OZ|S79v=CfZ8o9aa{KtlBNBR)a{e6#y&;7&Z_if4cmm7*e1;Ev9faGIRcei z<8%`Z(-Ll)Q35`KH9Pt=jtsjm5GDe90RlBaG)3!hY7N%xqvn(4c#m&D3-^3GW>+D* zYiQiF8id%iv+PpHUi3u5I-Voz&=hZWt18Q2|7Q zh2-4pNgj1GM#qFcA*e09C%51#dJR=>jwx4zDw=u?BOi))uGOHA>J9gxhCF?yN8{cm z0_Oq%@61?Nvb@!3Jq64UoC^#KR0S{%PkeMiTWE?G-|3C`PH#kK$ssv!0p<}4kSy6f zR!#}H2~_Q*`ON18&quyfY-@|Ou!{Q-X9KNdRTAMS{zyMj zFOV|Tjw!c$nTrSnbk-d7_B?d9k?8Fs(b-0#vkpfPVeg#~1oyPg~zn})=j$G|xCm=V;gc@W*4I!G(`cVTav~w(Jw+_C&I1n8W zXc7M|;gK)`C_YcjN9^5hUeVB$I1b*Ss|Vk<#ov!sj>rE4Ui56>7dm-T00000NkvXX Hu0mjfV9-&3 literal 0 HcmV?d00001 From 1b689b7e375b89de9e2dbca94c92fc1ce041cf00 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 15:33:55 +0200 Subject: [PATCH 194/218] Update msx264 and linphone submodules to HEAD --- submodules/linphone | 2 +- submodules/msx264 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index 643dc7f9f..e8668e2e3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 643dc7f9f6c6b7d542a6e1724f943f97e0c0a9ca +Subproject commit e8668e2e312c390e891c372e3237ba3e6a54f53a diff --git a/submodules/msx264 b/submodules/msx264 index dfa98d491..3dfd0b6bb 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit dfa98d491f9760b9a540197c43d3fccc13bc5ce7 +Subproject commit 3dfd0b6bb38c2f7f71e97b24f6941a01539a24bd From 1259d99ff766d1f90dd96cf052a7aa23800fbac0 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 15:35:35 +0200 Subject: [PATCH 195/218] Update belle-sip to HEAD --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index f3f343c3a..7f236fa27 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit f3f343c3ac5307a8f14effe253f8eaf3e85c4cd0 +Subproject commit 7f236fa27afcb0f93f27531ecabe9cb14b3f72fb From 75a522b9deb74e5f219384a53d5568dd420f7fb6 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 17:08:48 +0200 Subject: [PATCH 196/218] Fix * -> Settings and Settings -> * views transitions --- Classes/PhoneMainView.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index d219b99f5..2e9370183 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -372,20 +372,20 @@ static PhoneMainView* phoneMainViewInstance=nil; if([old equal:[ChatViewController compositeViewDescription]]) { if([new equal:[ContactsViewController compositeViewDescription]] || - [new equal:[DialerViewController compositeViewDescription]] || - [new equal:[SettingsViewController compositeViewDescription]] || - [new equal:[HistoryViewController compositeViewDescription]]) { + [new equal:[DialerViewController compositeViewDescription]] || + [new equal:[HistoryViewController compositeViewDescription]]) { left = true; } } else if([old equal:[SettingsViewController compositeViewDescription]]) { - if([new equal:[DialerViewController compositeViewDescription]] || + if([new equal:[DialerViewController compositeViewDescription]] || [new equal:[ContactsViewController compositeViewDescription]] || - [new equal:[HistoryViewController compositeViewDescription]]) { + [new equal:[HistoryViewController compositeViewDescription]] || + [new equal:[ChatViewController compositeViewDescription]]) { left = true; } } else if([old equal:[DialerViewController compositeViewDescription]]) { - if([new equal:[ContactsViewController compositeViewDescription]] || - [new equal:[HistoryViewController compositeViewDescription]]) { + if([new equal:[ContactsViewController compositeViewDescription]] || + [new equal:[HistoryViewController compositeViewDescription]]) { left = true; } } else if([old equal:[ContactsViewController compositeViewDescription]]) { From 46f4de42a7e224b8cd61e6ea5b6d30657e33a8cc Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 17:09:23 +0200 Subject: [PATCH 197/218] Update iOS code to accomodate for linphone SDK API changes --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 08e6ddc47..7952d06f7 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -778,7 +778,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach static LinphoneCoreVTable linphonec_vtable = { .show =NULL, - .call_state_changed =(LinphoneCallStateCb)linphone_iphone_call_state, + .call_state_changed =(LinphoneCoreCallStateChangedCb)linphone_iphone_call_state, .registration_state_changed = linphone_iphone_registration_state, .notify_presence_recv=NULL, .new_subscription_request = NULL, From 9b5da13f24592db36d0cfc5033545dce0f2b6171 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 2 Oct 2013 17:09:45 +0200 Subject: [PATCH 198/218] New icons are now in the XCode project --- linphone-Info.plist | 17 +++++++++++++++++ linphone.xcodeproj/project.pbxproj | 14 ++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/linphone-Info.plist b/linphone-Info.plist index cae2d426b..95ba88002 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -21,6 +21,23 @@ CFBundleIconFiles + linphone_icon_120 + linphone_icon_57.png + linphone_icon_72.png + linphone_icon_57@2x.png + linphone_icon_72@2x.png + + + + CFBundleIcons~ipad + + CFBundlePrimaryIcon + + CFBundleIconFiles + + linphone_icon_152 + linphone_icon_76 + linphone_icon_120 linphone_icon_57.png linphone_icon_72.png linphone_icon_57@2x.png diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 892caba82..f61b07230 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1342,6 +1342,10 @@ D3F9A9EF15AF277E0045320F /* UACellBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */; }; F066515517F9A02E0064280C /* UITransparentTVCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F066515417F9A02E0064280C /* UITransparentTVCell.m */; }; F066515617F9A02E0064280C /* UITransparentTVCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F066515417F9A02E0064280C /* UITransparentTVCell.m */; }; + F0818E7E17FC51D8005A3330 /* linphone_icon_76.png in Resources */ = {isa = PBXBuildFile; fileRef = F0818E7C17FC51D8005A3330 /* linphone_icon_76.png */; }; + F0818E7F17FC51D8005A3330 /* linphone_icon_76.png in Resources */ = {isa = PBXBuildFile; fileRef = F0818E7C17FC51D8005A3330 /* linphone_icon_76.png */; }; + F0818E8017FC51D8005A3330 /* linphone_icon_152.png in Resources */ = {isa = PBXBuildFile; fileRef = F0818E7D17FC51D8005A3330 /* linphone_icon_152.png */; }; + F0818E8117FC51D8005A3330 /* linphone_icon_152.png in Resources */ = {isa = PBXBuildFile; fileRef = F0818E7D17FC51D8005A3330 /* linphone_icon_152.png */; }; F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; }; /* End PBXBuildFile section */ @@ -2489,6 +2493,9 @@ D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UACellBackgroundView.m; path = Utils/UACellBackgroundView/UACellBackgroundView.m; sourceTree = ""; }; F066515317F9A02E0064280C /* UITransparentTVCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransparentTVCell.h; sourceTree = ""; }; F066515417F9A02E0064280C /* UITransparentTVCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransparentTVCell.m; sourceTree = ""; }; + F0818E7B17FC5160005A3330 /* linphone_icon_120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_120.png; path = Resources/linphone_icon_120.png; sourceTree = ""; }; + F0818E7C17FC51D8005A3330 /* linphone_icon_76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_76.png; path = Resources/linphone_icon_76.png; sourceTree = ""; }; + F0818E7D17FC51D8005A3330 /* linphone_icon_152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_152.png; path = Resources/linphone_icon_152.png; sourceTree = ""; }; FD61C851169EAC63001AA2D6 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/ChatRoomViewController.xib; sourceTree = ""; }; FD61C853169FBBB6001AA2D6 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/ChatViewController.xib; sourceTree = ""; }; FD61C855169FBD1C001AA2D6 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ru.lproj/ContactDetailsLabelViewController.xib; sourceTree = ""; }; @@ -3582,10 +3589,13 @@ D37E3ECF1619DCC50087659A /* licenses.html */, 225CB2F911ABB76400628906 /* linphone-banner.png */, 8D1107310486CEB800E47090 /* linphone-Info.plist */, + F0818E7B17FC5160005A3330 /* linphone_icon_120.png */, + F0818E7D17FC51D8005A3330 /* linphone_icon_152.png */, 22058C70116E305000B08DDD /* linphone_icon_57.png */, D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */, 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */, D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */, + F0818E7C17FC51D8005A3330 /* linphone_icon_76.png */, D3012CC31610467D007CD926 /* linphone_logo.png */, D38F46F1160C5CC8002D4C4A /* linphone_splashscreen-568h@2x.png */, D3103920162C3C5100C00C18 /* linphone_splashscreen-Landscape.png */, @@ -4322,6 +4332,7 @@ D377BBFA15A19DA6002B696B /* video_on_disabled.png in Resources */, D37B96B715A1A6F20005CCD2 /* call_state_delete_default.png in Resources */, D37B96B915A1A6F20005CCD2 /* call_state_delete_over.png in Resources */, + F0818E8017FC51D8005A3330 /* linphone_icon_152.png in Resources */, D3C2814B15A2D38D0098AA42 /* dialer_selected.png in Resources */, D3C2815215A2D64A0098AA42 /* numpad_star_over.png in Resources */, D365AA7B15A2DE7500CAFE3F /* speaker_off_disabled.png in Resources */, @@ -4464,6 +4475,7 @@ D3A74EDC15C69392001500B9 /* chat_selected~ipad.png in Resources */, D3A74EDE15C69392001500B9 /* conference_default~ipad.png in Resources */, D3A74EE015C69392001500B9 /* conference_over~ipad.png in Resources */, + F0818E7E17FC51D8005A3330 /* linphone_icon_76.png in Resources */, D3A74EE215C69392001500B9 /* contacts_default_landscape~ipad.png in Resources */, D3A74EE415C69392001500B9 /* contacts_default~ipad.png in Resources */, D3A74EE615C69392001500B9 /* contacts_over_landscape~ipad.png in Resources */, @@ -4858,6 +4870,7 @@ D34BD6AB15C13DB70070C209 /* list_details_over.png in Resources */, D34BD6AC15C13DB70070C209 /* micro_off_default.png in Resources */, D34BD6AD15C13DB70070C209 /* micro_off_default_landscape.png in Resources */, + F0818E8117FC51D8005A3330 /* linphone_icon_152.png in Resources */, D34BD6AE15C13DB70070C209 /* micro_off_disabled.png in Resources */, D34BD6AF15C13DB70070C209 /* micro_off_disabled_landscape.png in Resources */, D34BD6B015C13DB70070C209 /* micro_off_over.png in Resources */, @@ -5000,6 +5013,7 @@ D3A74EDD15C69392001500B9 /* chat_selected~ipad.png in Resources */, D3A74EDF15C69392001500B9 /* conference_default~ipad.png in Resources */, D3A74EE115C69392001500B9 /* conference_over~ipad.png in Resources */, + F0818E7F17FC51D8005A3330 /* linphone_icon_76.png in Resources */, D3A74EE315C69392001500B9 /* contacts_default_landscape~ipad.png in Resources */, D3A74EE515C69392001500B9 /* contacts_default~ipad.png in Resources */, D3A74EE715C69392001500B9 /* contacts_over_landscape~ipad.png in Resources */, From 1ca1cc1f80a89713551533bb3ad48fc2c49a7842 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 3 Oct 2013 09:05:17 +0200 Subject: [PATCH 199/218] Fix messy transitions for iOS7 --- Classes/LinphoneUI/UILinphone.h | 3 ++- Classes/SettingsViewController.m | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h index d291ff639..68a23f41d 100644 --- a/Classes/LinphoneUI/UILinphone.h +++ b/Classes/LinphoneUI/UILinphone.h @@ -19,7 +19,8 @@ #import -#define LINPHONE_MAIN_COLOR [UIColor colorWithRed:207.0f/255.0f green:76.0f/255.0f blue:41.0f/255.0f alpha:1.0f] +#define LINPHONE_MAIN_COLOR [UIColor colorWithRed:207.0f/255.0f green:76.0f/255.0f blue:41.0f/255.0f alpha:1.0f] +#define LINPHONE_SETTINGS_BG_IOS7 [UIColor colorWithWhite:0.88 alpha:1.0] #define LINPHONE_TABLE_CELL_BACKGROUND_COLOR [UIColor colorWithRed:207.0f/255.0f green:76.0f/255.0f blue:41.0f/255.0f alpha:1.0f] @interface UIColor (LightAndDark) diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index d0eb48067..8469cda3f 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -335,7 +335,12 @@ } + (void)removeBackground:(UIView*)view { - [view setBackgroundColor:[UIColor clearColor]]; + // iOS7 transparent background is *really* transparent: with an alpha != 0 + // it messes up the transitions. Use non-transparent BG for iOS7 + if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) + [view setBackgroundColor:LINPHONE_SETTINGS_BG_IOS7]; + else + [view setBackgroundColor:[UIColor clearColor]]; } - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated { From 7a537441b770c7d2c300f3f422dac9d57409e021 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 3 Oct 2013 14:47:32 +0200 Subject: [PATCH 200/218] Updated belle-sip to HEAD, fixes systematic recompilation of the entire SDK. --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 7f236fa27..461029db7 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7f236fa27afcb0f93f27531ecabe9cb14b3f72fb +Subproject commit 461029db78ecec56e81363d0b3d3786e349257f8 From be2b671628f5056dd0bd6804f9fc41d5f4969658 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 3 Oct 2013 14:49:34 +0200 Subject: [PATCH 201/218] Fix i386 compilation, which was triggering link errors for the iPhoneSimulator target. --- submodules/build/builders.d/ffmpeg.mk | 10 +++++----- submodules/build/iphone-config.site | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk index efc195970..55c65aff1 100644 --- a/submodules/build/builders.d/ffmpeg.mk +++ b/submodules/build/builders.d/ffmpeg.mk @@ -4,13 +4,12 @@ ffmpeg_configure_options=\ --disable-ffprobe --disable-ffserver --disable-avdevice \ --disable-avfilter --disable-network \ --disable-everything --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 \ - --enable-decoder=h264 --disable-avformat --enable-armv6 --enable-armv6t2 \ + --enable-decoder=h264 --disable-avformat \ --cross-prefix=$$SDK_BIN_PATH/ \ --sysroot=$$SYSROOT_PATH --arch=$$ARCH \ - --enable-static --disable-shared --target-os=darwin \ + --enable-static --disable-shared --target-os=darwin \ --extra-cflags="$$COMMON_FLAGS" --extra-ldflags="$$COMMON_FLAGS" \ --disable-iconv \ - --disable-armv5te \ --ar="$$AR" \ --nm="$$NM" \ --cc="$$CC" @@ -19,12 +18,13 @@ ffmpeg_configure_options=\ #--sysinclude=PATH location of cross-build system headers ifneq (,$(findstring armv6,$(host))) - ffmpeg_configure_options+= --cpu=arm1176jzf-s + ffmpeg_configure_options+= --cpu=arm1176jzf-s --disable-armv5te --enable-armv6 --enable-armv6t2 endif ifneq (,$(findstring armv7,$(host))) - ffmpeg_configure_options+= --enable-neon --cpu=cortex-a8 + ffmpeg_configure_options+= --enable-neon --cpu=cortex-a8 --disable-armv5te --enable-armv6 --enable-armv6t2 endif + ffmpeg_dir?=externals/ffmpeg $(BUILDER_SRC_DIR)/$(ffmpeg_dir)/patched : cd $(BUILDER_SRC_DIR)/$(ffmpeg_dir) \ diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 1e8a74b95..1597865b5 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -48,6 +48,7 @@ LD="xcrun ld -arch ${ARCH}" AR="xcrun ar" RANLIB="xcrun ranlib" STRIP="xcrun strip" +NM="xcrun nm" CPPFLAGS="-Dasm=__asm" OBJCFLAGS="-x objective-c -fexceptions -gdwarf-2 -fobjc-abi-version=2 -fobjc-legacy-dispatch" From 518dd9e9c74356603ce4a29a6902075f7624d4e0 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Fri, 4 Oct 2013 10:25:08 +0200 Subject: [PATCH 202/218] Enable PIE for ffmpeg and x264. Note that the x264 compilation seems to generate non-PIC code even though the option is passed. --- submodules/build/builders.d/ffmpeg.mk | 2 +- submodules/build/builders.d/x264.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/build/builders.d/ffmpeg.mk b/submodules/build/builders.d/ffmpeg.mk index 55c65aff1..025b2c0c3 100644 --- a/submodules/build/builders.d/ffmpeg.mk +++ b/submodules/build/builders.d/ffmpeg.mk @@ -4,7 +4,7 @@ ffmpeg_configure_options=\ --disable-ffprobe --disable-ffserver --disable-avdevice \ --disable-avfilter --disable-network \ --disable-everything --enable-decoder=mjpeg --enable-encoder=mjpeg --enable-decoder=mpeg4 --enable-encoder=mpeg4 \ - --enable-decoder=h264 --disable-avformat \ + --enable-decoder=h264 --disable-avformat --enable-pic\ --cross-prefix=$$SDK_BIN_PATH/ \ --sysroot=$$SYSROOT_PATH --arch=$$ARCH \ --enable-static --disable-shared --target-os=darwin \ diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk index 8937c8d01..21c8638e9 100644 --- a/submodules/build/builders.d/x264.mk +++ b/submodules/build/builders.d/x264.mk @@ -24,7 +24,7 @@ x264-configure-option= \ --host=$(host)\ - --enable-static \ + --enable-static --enable-pic \ --cross-prefix=$$SDK_BIN_PATH/ \ --extra-ldflags="$$COMMON_FLAGS" From dd5e1d72459024abbad33fc99f7226e5dad7aa59 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Fri, 4 Oct 2013 17:13:23 +0200 Subject: [PATCH 203/218] Fix cell background in iOS7 --- .../UACellBackgroundView/UACellBackgroundView.m | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m index feb901710..d58d03fef 100644 --- a/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m +++ b/Classes/Utils/UACellBackgroundView/UACellBackgroundView.m @@ -122,7 +122,9 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi - (void)drawRect:(CGRect)aRect { // Drawing code - CGContextRef c = UIGraphicsGetCurrentContext(); + CGContextRef c = UIGraphicsGetCurrentContext(); + // don't use arcs on iOS >= 7 + BOOL use_arcs = [[[UIDevice currentDevice] systemVersion] floatValue] < 7; int lineWidth = 1; @@ -140,8 +142,8 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi CGContextSetLineWidth(c, lineWidth); CGContextSetAllowsAntialiasing(c, YES); CGContextSetShouldAntialias(c, YES); - - if (position == UACellBackgroundViewPositionTop) { + + if (position == UACellBackgroundViewPositionTop && use_arcs) { miny += 1; @@ -166,7 +168,7 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi CGContextStrokePath(c); CGContextRestoreGState(c); - } else if (position == UACellBackgroundViewPositionBottom) { + } else if (position == UACellBackgroundViewPositionBottom && use_arcs) { CGMutablePathRef path = CGPathCreateMutable(); CGPathMoveToPoint(path, NULL, minx, miny); @@ -190,8 +192,8 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, float ovalWi CGContextRestoreGState(c); - } else if (position == UACellBackgroundViewPositionMiddle) { - + } else if (position == UACellBackgroundViewPositionMiddle || !use_arcs) { + // in iOS7, this will be the default handling CGMutablePathRef path = CGPathCreateMutable(); CGPathMoveToPoint(path, NULL, minx, miny); CGPathAddLineToPoint(path, NULL, maxx, miny); From 217350708c1258c686d3156b9f4b07bf5d564a7b Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Fri, 4 Oct 2013 17:14:53 +0200 Subject: [PATCH 204/218] Update HPGrowingTextView for iOS7 compatibility. From https://github.com/HansPinckaers/GrowingTextView --- .../Utils/GrowingTextView/HPGrowingTextView.h | 20 ++- .../Utils/GrowingTextView/HPGrowingTextView.m | 164 +++++++++++++++--- .../GrowingTextView/HPTextViewInternal.h | 7 +- .../GrowingTextView/HPTextViewInternal.m | 19 +- 4 files changed, 181 insertions(+), 29 deletions(-) diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.h b/Classes/Utils/GrowingTextView/HPGrowingTextView.h index f381d1b39..0a8a250ed 100755 --- a/Classes/Utils/GrowingTextView/HPGrowingTextView.h +++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.h @@ -27,6 +27,12 @@ #import +#if __IPHONE_OS_VERSION_MAX_ALLOWED < 60000 + // UITextAlignment is deprecated in iOS 6.0+, use NSTextAlignment instead. + // Reference: https://developer.apple.com/library/ios/documentation/uikit/reference/NSString_UIKit_Additions/Reference/Reference.html + #define NSTextAlignment UITextAlignment +#endif + @class HPGrowingTextView; @class HPTextViewInternal; @@ -60,10 +66,11 @@ int minNumberOfLines; BOOL animateHeightChange; + NSTimeInterval animationDuration; //uitextview properties NSObject *__unsafe_unretained delegate; - NSTextAlignment textAlignment; + NSTextAlignment textAlignment; NSRange selectedRange; BOOL editable; UIDataDetectorTypes dataDetectorTypes; @@ -75,7 +82,12 @@ //real class properties @property int maxNumberOfLines; @property int minNumberOfLines; +@property (nonatomic) int maxHeight; +@property (nonatomic) int minHeight; @property BOOL animateHeightChange; +@property NSTimeInterval animationDuration; +@property (nonatomic, strong) NSString *placeholder; +@property (nonatomic, strong) UIColor *placeholderColor; @property (nonatomic, strong) UITextView *internalTextView; @@ -84,12 +96,13 @@ @property(nonatomic,strong) NSString *text; @property(nonatomic,strong) UIFont *font; @property(nonatomic,strong) UIColor *textColor; -@property(nonatomic) NSTextAlignment textAlignment; // default is UITextAlignmentLeft +@property(nonatomic) NSTextAlignment textAlignment; // default is NSTextAlignmentLeft @property(nonatomic) NSRange selectedRange; // only ranges of length 0 are supported @property(nonatomic,getter=isEditable) BOOL editable; @property(nonatomic) UIDataDetectorTypes dataDetectorTypes __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_3_0); @property (nonatomic) UIReturnKeyType returnKeyType; @property (assign) UIEdgeInsets contentInset; +@property (nonatomic) BOOL isScrollable; @property(nonatomic) BOOL enablesReturnKeyAutomatically; //uitextview methods @@ -101,4 +114,7 @@ - (BOOL)hasText; - (void)scrollRangeToVisible:(NSRange)range; +// call to force a height change (e.g. after you change max/min lines) +- (void)refreshHeight; + @end diff --git a/Classes/Utils/GrowingTextView/HPGrowingTextView.m b/Classes/Utils/GrowingTextView/HPGrowingTextView.m index a594818b7..1a5166a83 100755 --- a/Classes/Utils/GrowingTextView/HPGrowingTextView.m +++ b/Classes/Utils/GrowingTextView/HPGrowingTextView.m @@ -37,15 +37,19 @@ @implementation HPGrowingTextView @synthesize internalTextView; @synthesize delegate; - +@synthesize maxHeight; +@synthesize minHeight; @synthesize font; @synthesize textColor; @synthesize textAlignment; @synthesize selectedRange; @synthesize editable; -@synthesize dataDetectorTypes; +@synthesize dataDetectorTypes; @synthesize animateHeightChange; +@synthesize animationDuration; @synthesize returnKeyType; +@dynamic placeholder; +@dynamic placeholderColor; // having initwithcoder allows us to use HPGrowingTextView in a Nib. -- aob, 9/2011 - (id)initWithCoder:(NSCoder *)aDecoder @@ -82,10 +86,14 @@ minNumberOfLines = 1; animateHeightChange = YES; + animationDuration = 0.1f; internalTextView.text = @""; [self setMaxNumberOfLines:3]; + + [self setPlaceholderColor:[UIColor lightGrayColor]]; + internalTextView.displayPlaceHolder = YES; } -(CGSize)sizeThatFits:(CGSize)size @@ -101,10 +109,9 @@ [super layoutSubviews]; CGRect r = self.bounds; - r.origin.y = contentInset.top; - r.origin.x = contentInset.left; + r.origin.y = 0; + r.origin.x = contentInset.left; r.size.width -= contentInset.left + contentInset.right; - r.size.height -= contentInset.top + contentInset.bottom; internalTextView.frame = r; } @@ -114,10 +121,9 @@ contentInset = inset; CGRect r = self.frame; - r.origin.y = contentInset.top; - r.origin.x = contentInset.left; - r.size.width -= contentInset.left + contentInset.right; - r.size.height -= contentInset.top + contentInset.bottom; + r.origin.y = inset.top - inset.bottom; + r.origin.x = inset.left; + r.size.width -= inset.left + inset.right; internalTextView.frame = r; @@ -132,6 +138,8 @@ -(void)setMaxNumberOfLines:(int)n { + if(n == 0 && maxHeight > 0) return; // the user specified a maxHeight themselves. + // Use internalTextView for height calculations, thanks to Gwynne NSString *saveText = internalTextView.text, *newText = @"-"; @@ -143,13 +151,13 @@ internalTextView.text = newText; - maxHeight = internalTextView.contentSize.height; + maxHeight = [self measureHeight]; internalTextView.text = saveText; internalTextView.hidden = NO; internalTextView.delegate = self; - //[self sizeToFit]; + [self sizeToFit]; maxNumberOfLines = n; } @@ -159,8 +167,16 @@ return maxNumberOfLines; } +- (void)setMaxHeight:(int)height +{ + maxHeight = height; + maxNumberOfLines = 0; +} + -(void)setMinNumberOfLines:(int)m { + if(m == 0 && minHeight > 0) return; // the user specified a minHeight themselves. + // Use internalTextView for height calculations, thanks to Gwynne NSString *saveText = internalTextView.text, *newText = @"-"; @@ -172,13 +188,13 @@ internalTextView.text = newText; - minHeight = internalTextView.contentSize.height; + minHeight = [self measureHeight]; internalTextView.text = saveText; internalTextView.hidden = NO; internalTextView.delegate = self; - //[self sizeToFit]; + [self sizeToFit]; minNumberOfLines = m; } @@ -188,13 +204,43 @@ return minNumberOfLines; } +- (void)setMinHeight:(int)height +{ + minHeight = height; + minNumberOfLines = 0; +} + +- (NSString *)placeholder +{ + return internalTextView.placeholder; +} + +- (void)setPlaceholder:(NSString *)placeholder +{ + [internalTextView setPlaceholder:placeholder]; +} + +- (UIColor *)placeholderColor +{ + return internalTextView.placeholderColor; +} + +- (void)setPlaceholderColor:(UIColor *)placeholderColor +{ + [internalTextView setPlaceholderColor:placeholderColor]; +} - (void)textViewDidChange:(UITextView *)textView -{ +{ + [self refreshHeight]; +} + +- (void)refreshHeight +{ //size of content, so we can set the frame of self - NSInteger newSizeH = internalTextView.contentSize.height; + NSInteger newSizeH = [self measureHeight]; if(newSizeH < minHeight || !internalTextView.hasText) newSizeH = minHeight; //not smalles than minHeight - if(newSizeH > maxHeight) newSizeH = maxHeight; // not taller than maxHeight + if (internalTextView.frame.size.height > maxHeight) newSizeH = maxHeight; // not taller than maxHeight if (internalTextView.frame.size.height != newSizeH) { @@ -212,7 +258,7 @@ if ([UIView resolveClassMethod:@selector(animateWithDuration:animations:)]) { #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000 - [UIView animateWithDuration:0.1f + [UIView animateWithDuration:animationDuration delay:0 options:(UIViewAnimationOptionAllowUserInteraction| UIViewAnimationOptionBeginFromCurrentState) @@ -227,7 +273,7 @@ #endif } else { [UIView beginAnimations:@"" context:nil]; - [UIView setAnimationDuration:0.1f]; + [UIView setAnimationDuration:animationDuration]; [UIView setAnimationDelegate:self]; [UIView setAnimationDidStopSelector:@selector(growDidStop)]; [UIView setAnimationBeginsFromCurrentState:YES]; @@ -244,7 +290,6 @@ } } } - // if our new height is greater than the maxHeight // sets not set the height or move things @@ -260,15 +305,77 @@ internalTextView.scrollEnabled = NO; } + // scroll to caret (needed on iOS7) + if ([self respondsToSelector:@selector(snapshotViewAfterScreenUpdates:)]) + { + CGRect r = [internalTextView caretRectForPosition:internalTextView.selectedTextRange.end]; + CGFloat caretY = MAX(r.origin.y - internalTextView.frame.size.height + r.size.height + 8, 0); + if(internalTextView.contentOffset.y < caretY && r.origin.y != INFINITY) + internalTextView.contentOffset = CGPointMake(0, MIN(caretY, internalTextView.contentSize.height)); + } } + // Display (or not) the placeholder string + + BOOL wasDisplayingPlaceholder = internalTextView.displayPlaceHolder; + internalTextView.displayPlaceHolder = self.internalTextView.text.length == 0; + if (wasDisplayingPlaceholder != internalTextView.displayPlaceHolder) { + [internalTextView setNeedsDisplay]; + } + + // Tell the delegate that the text view changed - if ([delegate respondsToSelector:@selector(growingTextViewDidChange:)]) { + if ([delegate respondsToSelector:@selector(growingTextViewDidChange:)]) { [delegate growingTextViewDidChange:self]; } } +// Code from apple developer forum - @Steve Krulewitz, @Mark Marszal, @Eric Silverberg +- (CGFloat)measureHeight +{ +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 + if ([self respondsToSelector:@selector(snapshotViewAfterScreenUpdates:)]) + { + CGRect frame = internalTextView.bounds; + CGSize fudgeFactor; + // The padding added around the text on iOS6 and iOS7 is different. + fudgeFactor = CGSizeMake(10.0, 16.0); + + frame.size.height -= fudgeFactor.height; + frame.size.width -= fudgeFactor.width; + + NSMutableAttributedString* textToMeasure; + if(internalTextView.attributedText && internalTextView.attributedText.length > 0){ + textToMeasure = [[NSMutableAttributedString alloc] initWithAttributedString:internalTextView.attributedText]; + } + else{ + textToMeasure = [[NSMutableAttributedString alloc] initWithString:internalTextView.text]; + [textToMeasure addAttribute:NSFontAttributeName value:internalTextView.font range:NSMakeRange(0, textToMeasure.length)]; + } + + if ([textToMeasure.string hasSuffix:@"\n"]) + { + [textToMeasure appendAttributedString:[[NSAttributedString alloc] initWithString:@"-" attributes:@{NSFontAttributeName: internalTextView.font}]]; + } + + // NSAttributedString class method: boundingRectWithSize:options:context is + // available only on ios7.0 sdk. + CGRect size = [textToMeasure boundingRectWithSize:CGSizeMake(CGRectGetWidth(frame), MAXFLOAT) + options:NSStringDrawingUsesLineFragmentOrigin + context:nil]; + + return CGRectGetHeight(size) + fudgeFactor.height; + } + else + { + return self.internalTextView.contentSize.height; + } +#else + return self.internalTextView.contentSize.height; +#endif +} + -(void)resizeTextView:(NSInteger)newSizeH { if ([delegate respondsToSelector:@selector(growingTextView:willChangeHeight:)]) { @@ -283,15 +390,14 @@ internalTextViewFrame.origin.x = contentInset.left; internalTextViewFrame.size.width = internalTextView.contentSize.width; - internalTextView.frame = internalTextViewFrame; + if(!CGRectEqualToRect(internalTextView.frame, internalTextViewFrame)) internalTextView.frame = internalTextViewFrame; } --(void)growDidStop +- (void)growDidStop { if ([delegate respondsToSelector:@selector(growingTextView:didChangeHeight:)]) { [delegate growingTextView:self didChangeHeight:self.frame.size.height]; } - } -(void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event @@ -401,6 +507,18 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// +- (void)setIsScrollable:(BOOL)isScrollable +{ + internalTextView.scrollEnabled = isScrollable; +} + +- (BOOL)isScrollable +{ + return internalTextView.scrollEnabled; +} + +/////////////////////////////////////////////////////////////////////////////////////////////////// + -(void)setEditable:(BOOL)beditable { internalTextView.editable = beditable; diff --git a/Classes/Utils/GrowingTextView/HPTextViewInternal.h b/Classes/Utils/GrowingTextView/HPTextViewInternal.h index c44ac63dc..175f4d472 100755 --- a/Classes/Utils/GrowingTextView/HPTextViewInternal.h +++ b/Classes/Utils/GrowingTextView/HPTextViewInternal.h @@ -28,7 +28,10 @@ #import -@interface HPTextViewInternal : UITextView { -} +@interface HPTextViewInternal : UITextView + +@property (nonatomic, strong) NSString *placeholder; +@property (nonatomic, strong) UIColor *placeholderColor; +@property (nonatomic) BOOL displayPlaceHolder; @end diff --git a/Classes/Utils/GrowingTextView/HPTextViewInternal.m b/Classes/Utils/GrowingTextView/HPTextViewInternal.m index 060081b22..19f561311 100755 --- a/Classes/Utils/GrowingTextView/HPTextViewInternal.m +++ b/Classes/Utils/GrowingTextView/HPTextViewInternal.m @@ -30,6 +30,10 @@ @implementation HPTextViewInternal +@synthesize placeholder; +@synthesize placeholderColor; +@synthesize displayPlaceHolder; + -(void)setText:(NSString *)text { BOOL originalValue = self.scrollEnabled; @@ -41,6 +45,11 @@ [self setScrollEnabled:originalValue]; } +- (void)setScrollable:(BOOL)isScrollable +{ + [super setScrollEnabled:isScrollable]; +} + -(void)setContentOffset:(CGPoint)s { if(self.tracking || self.decelerating){ @@ -89,7 +98,13 @@ [super setContentSize:contentSize]; } - - +- (void)drawRect:(CGRect)rect +{ + [super drawRect:rect]; + if (displayPlaceHolder && placeholder && placeholderColor) { + [placeholderColor set]; + [placeholder drawInRect:CGRectMake(8.0f, 8.0f, self.frame.size.width - 16.0f, self.frame.size.height - 16.0f) withFont:self.font]; + } +} @end From 4243965ce6309044428c4949d602b1c2294a1d6c Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 09:15:00 +0200 Subject: [PATCH 205/218] Fix contact header visible through iOS7 status bar --- Classes/ChatRoomViewController.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index 2581cfb21..3043211e4 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -734,6 +734,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta CGRect headerFrame = [headerView frame]; headerFrame.origin.y = 0; [headerView setFrame:headerFrame]; + [headerView setAlpha:1.0]; } // Resize & Move table view @@ -790,6 +791,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta CGRect headerFrame = [headerView frame]; headerFrame.origin.y = -headerFrame.size.height; [headerView setFrame:headerFrame]; + [headerView setAlpha:0.0]; } // Resize & Move table view From 5842818bbc83b93bdaa17da2a16c9bfd7719118a Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 09:22:35 +0200 Subject: [PATCH 206/218] Make the status bar opaque on Settings view. This fixes the invisible "SIP Account" header. --- Classes/SettingsViewController.xib | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Classes/SettingsViewController.xib b/Classes/SettingsViewController.xib index afd4e8da6..1d71b8dc1 100644 --- a/Classes/SettingsViewController.xib +++ b/Classes/SettingsViewController.xib @@ -62,6 +62,10 @@ NO

+ + NO + NO + 1 From 8ebf46307cbbc7c926fe418d9cfc87c3b6d39ffa Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 11:17:48 +0200 Subject: [PATCH 207/218] Adjust chat cell for better readability --- Classes/LinphoneUI/UIChatCell.xib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/LinphoneUI/UIChatCell.xib b/Classes/LinphoneUI/UIChatCell.xib index e323fa21c..4defdc7b7 100644 --- a/Classes/LinphoneUI/UIChatCell.xib +++ b/Classes/LinphoneUI/UIChatCell.xib @@ -55,7 +55,7 @@ 274 - {{62, 2}, {218, 25}} + {{62, 2}, {218, 38}} @@ -92,7 +92,7 @@ 274 - {{62, 27}, {218, 33}} + {{62, 39}, {218, 21}} From 5d49c918cfbe93d4da059b283f407918b769fec4 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 12:05:47 +0200 Subject: [PATCH 208/218] Update iOS7 BG color to something closer to the iOS6 version. --- Classes/LinphoneUI/UILinphone.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneUI/UILinphone.h b/Classes/LinphoneUI/UILinphone.h index 68a23f41d..5b3d50d5b 100644 --- a/Classes/LinphoneUI/UILinphone.h +++ b/Classes/LinphoneUI/UILinphone.h @@ -20,7 +20,7 @@ #import #define LINPHONE_MAIN_COLOR [UIColor colorWithRed:207.0f/255.0f green:76.0f/255.0f blue:41.0f/255.0f alpha:1.0f] -#define LINPHONE_SETTINGS_BG_IOS7 [UIColor colorWithWhite:0.88 alpha:1.0] +#define LINPHONE_SETTINGS_BG_IOS7 [UIColor colorWithRed:164/255. green:175/255. blue:183/255. alpha:1.0]//[UIColor colorWithWhite:0.88 alpha:1.0] #define LINPHONE_TABLE_CELL_BACKGROUND_COLOR [UIColor colorWithRed:207.0f/255.0f green:76.0f/255.0f blue:41.0f/255.0f alpha:1.0f] @interface UIColor (LightAndDark) From debbda9bfd27f2c3a10cef640c73093fa52fef0f Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 14:05:10 +0200 Subject: [PATCH 209/218] Fix the contact editing interface --- Classes/ContactDetailsTableViewController.m | 45 ++++++++++++------- Classes/LinphoneUI/UIContactDetailsHeader.m | 11 ++++- Classes/LinphoneUI/UIEditableTableViewCell.m | 10 ++--- .../en.lproj/UIContactDetailsHeader.xib | 2 +- 4 files changed, 42 insertions(+), 26 deletions(-) diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 4bf5a1c3a..9d4d71a90 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -55,15 +55,15 @@ @implementation ContactDetailsTableViewController -enum _ContactSections { +typedef enum _ContactSections { ContactSections_None = 0, ContactSections_Number, ContactSections_Sip, ContactSections_Email, ContactSections_MAX -}; +} ContactSections_e; -static const int contactSections[ContactSections_MAX] = {ContactSections_None, ContactSections_Number, ContactSections_Sip, ContactSections_Email}; +static const ContactSections_e contactSections[ContactSections_MAX] = {ContactSections_None, ContactSections_Number, ContactSections_Sip, ContactSections_Email}; @synthesize footerController; @synthesize headerController; @@ -515,6 +515,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C [cell.detailTextField setDelegate:self]; [cell.detailTextField setAutocapitalizationType:UITextAutocapitalizationTypeNone]; [cell.detailTextField setAutocorrectionType:UITextAutocorrectionTypeNo]; + [cell setBackgroundColor:[UIColor whiteColor]]; // Background View UACellBackgroundView *selectedBackgroundView = [[[UACellBackgroundView alloc] initWithFrame:CGRectZero] autorelease]; @@ -708,7 +709,6 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C #pragma mark - UITableViewDelegate Functions - - (void)setEditing:(BOOL)editing animated:(BOOL)animated { bool_t showEmails = [[LinphoneManager instance] lpConfigBoolForKey:@"show_contacts_emails_preference"]; // Resign keyboard @@ -723,18 +723,25 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C [self.tableView beginUpdates]; } if(editing) { + // add phony entries so that the user can add new data for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) { if(contactSections[section] == ContactSections_Number || contactSections[section] == ContactSections_Sip || - (showEmails && contactSections[section] == ContactSections_Email)) - [self addEntry:self.tableView section:section animated:animated]; + (showEmails && contactSections[section] == ContactSections_Email)) { + [self addEntry:self.tableView section:section animated:animated]; + } } } else { for (int section = 0; section < [self numberOfSectionsInTableView:[self tableView]]; ++section) { + // remove phony entries that were not filled by the user if(contactSections[section] == ContactSections_Number || - contactSections[section] == ContactSections_Sip || - (showEmails && contactSections[section] == ContactSections_Email)) - [self removeEmptyEntry:self.tableView section:section animated:animated]; + contactSections[section] == ContactSections_Sip || + (showEmails && contactSections[section] == ContactSections_Email)) { + [self removeEmptyEntry:self.tableView section:section animated:animated]; + if( [[self getSectionData:section] count] == 0 ) // the section is empty -> remove titles + [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:section] + withRowAnimation:animated?UITableViewRowAnimationFade:UITableViewRowAnimationNone]; + } } } if(animated) { @@ -773,6 +780,8 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C } - (NSString*)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { + if( [[self getSectionData:section] count] == 0) return nil; + if(contactSections[section] == ContactSections_Number) { return NSLocalizedString(@"Phone numbers", nil); } else if(contactSections[section] == ContactSections_Sip) { @@ -784,7 +793,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C } - (NSString*)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section { - return @""; + return nil; } - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { @@ -819,7 +828,8 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C if(value != nil) { NSMutableArray *sectionDict = [self getSectionData:[editingIndexPath section]]; Entry *entry = [sectionDict objectAtIndex:[editingIndexPath row]]; - if(contactSections[[editingIndexPath section]] == ContactSections_Number) { + ContactSections_e thesection = contactSections[[editingIndexPath section]]; + if(thesection == ContactSections_Number) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonPhoneProperty); ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); CFRelease(lcMap); @@ -827,7 +837,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C ABMultiValueReplaceLabelAtIndex(lMap, (CFStringRef)(value), index); ABRecordSetValue(contact, kABPersonPhoneProperty, lMap, nil); CFRelease(lMap); - } else if(contactSections[[editingIndexPath section]] == ContactSections_Sip) { + } else if(thesection == ContactSections_Sip) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty); ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); CFRelease(lcMap); @@ -835,7 +845,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C ABMultiValueReplaceLabelAtIndex(lMap, (CFStringRef)(value), index); ABRecordSetValue(contact, kABPersonInstantMessageProperty, lMap, nil); CFRelease(lMap); - } else if(contactSections[[editingIndexPath section]] == ContactSections_Email) { + } else if(thesection == ContactSections_Email) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); CFRelease(lcMap); @@ -846,6 +856,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C } [self.tableView beginUpdates]; [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObject: editingIndexPath] withRowAnimation:FALSE]; + [self.tableView reloadSectionIndexTitles]; [self.tableView endUpdates]; } [editingIndexPath release]; @@ -876,8 +887,10 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C NSIndexPath *path = [self.tableView indexPathForCell:cell]; NSMutableArray *sectionDict = [self getSectionData:[path section]]; Entry *entry = [sectionDict objectAtIndex:[path row]]; + ContactSections_e sect = contactSections[[path section]]; + NSString *value = [textField text]; - if(contactSections[[path section]] == ContactSections_Number) { + if(sect == ContactSections_Number) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonPhoneProperty); ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); CFRelease(lcMap); @@ -885,9 +898,9 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C ABMultiValueReplaceValueAtIndex(lMap, (CFStringRef)value, index); ABRecordSetValue(contact, kABPersonPhoneProperty, lMap, nil); CFRelease(lMap); - } else if(contactSections[[path section]] == ContactSections_Sip) { + } else if(sect == ContactSections_Sip) { [self setSipContactEntry:entry withValue:value]; - } else if(contactSections[[path section]] == ContactSections_Email) { + } else if(sect == ContactSections_Email) { ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonEmailProperty); ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap); CFRelease(lcMap); diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m index 87fd448bb..6c78c743b 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.m +++ b/Classes/LinphoneUI/UIContactDetailsHeader.m @@ -140,7 +140,7 @@ + (CGFloat)height:(BOOL)editing { if(editing) { - return 160.0f; + return 170.0f; } else { return 80.0f; } @@ -206,15 +206,22 @@ [cell.detailTextField setAutocapitalizationType:UITextAutocapitalizationTypeWords]; [cell.detailTextField setAutocorrectionType:UITextAutocorrectionTypeNo]; [cell.detailTextField setKeyboardType:UIKeyboardTypeDefault]; + [cell setBackgroundColor:[UIColor whiteColor]]; } - + + // setup placeholder ABPropertyID property = [[propertyList objectAtIndex:[indexPath row]] intValue]; if(property == kABPersonFirstNameProperty) { [cell.detailTextField setPlaceholder:NSLocalizedString(@"First name", nil)]; } else if (property == kABPersonLastNameProperty) { [cell.detailTextField setPlaceholder:NSLocalizedString(@"Last name", nil)]; + } else if (property == kABPersonOrganizationProperty) { + [cell.detailTextField setPlaceholder:NSLocalizedString(@"Company name", nil)]; } + [cell.detailTextField setKeyboardType:UIKeyboardTypeDefault]; + + // setup values, if they exist if(contact) { CFStringRef lValue = ABRecordCopyValue(contact, property); if(lValue != NULL) { diff --git a/Classes/LinphoneUI/UIEditableTableViewCell.m b/Classes/LinphoneUI/UIEditableTableViewCell.m index eabd28611..b8d8d64b9 100644 --- a/Classes/LinphoneUI/UIEditableTableViewCell.m +++ b/Classes/LinphoneUI/UIEditableTableViewCell.m @@ -54,20 +54,16 @@ - (void)layoutSubviews { [super layoutSubviews]; - + CGRect fieldframe; fieldframe.origin.x = 15; fieldframe.origin.y = 0; fieldframe.size.height = 44; if([[self.textLabel text] length] != 0) - fieldframe.origin.x += [self.textLabel frame].size.width; - CGRect superframe = [[self.detailTextField superview]frame]; + fieldframe.origin.x += [self.textLabel frame].size.width + 5; + CGRect superframe = [[self.detailTextField superview] frame]; fieldframe.size.width = superframe.size.width - fieldframe.origin.x; [self.detailTextField setFrame:fieldframe]; - - CGRect labelFrame = [self.detailTextLabel frame]; - labelFrame.origin.x = fieldframe.origin.x; - [self.detailTextLabel setFrame:labelFrame]; } diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib index 729262f8a..ce91e660c 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib @@ -194,7 +194,7 @@ IBCocoaTouchFramework - {320, 160} + {320, 170} From c14c889b473e6e909c3f91b45b78c8b3b22f437b Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 14:11:01 +0200 Subject: [PATCH 210/218] Amend commit 5842818bbc83b93bdaa17da2a16c9bfd7719118a for opaque settings header: the fix was not complete. --- Classes/SettingsViewController.xib | 1 + 1 file changed, 1 insertion(+) diff --git a/Classes/SettingsViewController.xib b/Classes/SettingsViewController.xib index 1d71b8dc1..20b96974d 100644 --- a/Classes/SettingsViewController.xib +++ b/Classes/SettingsViewController.xib @@ -83,6 +83,7 @@ YES YES IBCocoaTouchFramework + NO From bcfd661408e766f71083ab39e0e700136ed188ed Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 15:21:02 +0200 Subject: [PATCH 211/218] Fix status bar color when going to/coming from dialer on ipad --- Classes/LinphoneAppDelegate.m | 7 +------ Classes/PhoneMainView.h | 1 + Classes/PhoneMainView.m | 20 +++++++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 66363f518..d712838fb 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -145,12 +145,7 @@ [self processRemoteNotification:remoteNotif]; } -#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 - // fix status bar color in iOS7 - if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) { - [application setStatusBarStyle:UIStatusBarStyleLightContent]; - } -#endif + [[PhoneMainView instance] updateStatusBar:nil]; return YES; } diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index 0f62eb42d..5ddf4ed16 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -60,6 +60,7 @@ - (void)showStateBar:(BOOL)show; - (void)showTabBar:(BOOL)show; - (void)fullScreen:(BOOL)enabled; +- (void)updateStatusBar:(UICompositeViewDescription*)to_view; - (void)startUp; - (void)addInhibitedEvent:(id)event; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 2e9370183..c0452853e 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -413,6 +413,23 @@ static PhoneMainView* phoneMainViewInstance=nil; [mainViewController setStateBarHidden:!show]; } +- (void)updateStatusBar:(UICompositeViewDescription*)to_view { +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000 + if ([LinphoneManager runningOnIpad]) { + // In iOS7, the ipad has a black background on dialer, so we have to adjust the + // status bar style for each transition to/from this view + BOOL toLightStatus = [to_view equal:[DialerViewController compositeViewDescription]]; + BOOL fromLightStatus = [currentView equal:[DialerViewController compositeViewDescription]]; + if( (!to_view && fromLightStatus) || // this case happens at app launch + toLightStatus ) + [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent]; + else if(fromLightStatus) + [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault]; + } +#endif +} + + - (void)fullScreen:(BOOL)enabled { [mainViewController setFullScreen:enabled]; } @@ -442,9 +459,10 @@ static PhoneMainView* phoneMainViewInstance=nil; } else { [mainViewController setViewTransition:nil]; } + [self updateStatusBar:view]; [mainViewController changeView:view]; currentView = view; - } + } NSDictionary* mdict = [NSMutableDictionary dictionaryWithObject:currentView forKey:@"view"]; [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneMainViewChange object:self userInfo:mdict]; From 92f00c7784450464d9f5f65b92f9972de614df07 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 7 Oct 2013 17:15:36 +0200 Subject: [PATCH 212/218] Added a vertical separator to the contact detail fields. --- Classes/LinphoneUI/UIEditableTableViewCell.h | 1 + Classes/LinphoneUI/UIEditableTableViewCell.m | 43 +++++++++++++++----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/Classes/LinphoneUI/UIEditableTableViewCell.h b/Classes/LinphoneUI/UIEditableTableViewCell.h index 5434eeb1e..c75b046c8 100644 --- a/Classes/LinphoneUI/UIEditableTableViewCell.h +++ b/Classes/LinphoneUI/UIEditableTableViewCell.h @@ -23,6 +23,7 @@ @interface UIEditableTableViewCell : UITransparentTVCell { } +@property (nonatomic, retain) IBOutlet UIView *verticalSep; @property (nonatomic, retain) IBOutlet UITextField *detailTextField; @end diff --git a/Classes/LinphoneUI/UIEditableTableViewCell.m b/Classes/LinphoneUI/UIEditableTableViewCell.m index b8d8d64b9..1ce7eccb3 100644 --- a/Classes/LinphoneUI/UIEditableTableViewCell.m +++ b/Classes/LinphoneUI/UIEditableTableViewCell.m @@ -22,6 +22,7 @@ @implementation UIEditableTableViewCell @synthesize detailTextField; +@synthesize verticalSep; #pragma mark - Lifecycle Functions @@ -30,7 +31,6 @@ { self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; if (self) { - UIView *parent = [self.detailTextLabel superview]; self.detailTextField = [[UITextField alloc] init]; [self.detailTextField setHidden:TRUE]; [self.detailTextField setClearButtonMode: UITextFieldViewModeWhileEditing]; @@ -39,7 +39,13 @@ UIFont *font = [UIFont fontWithName:@"Helvetica-Bold" size:[UIFont systemFontSize]]; [self.detailTextLabel setFont:font]; [self.detailTextField setFont:font]; - [parent addSubview:detailTextField]; + [self.contentView addSubview:detailTextField]; + + // a vertical separator that will come between the text and detailed text + self.verticalSep = [[UIView alloc] initWithFrame:CGRectMake(80, 5, 1, 34)]; + verticalSep.backgroundColor = [UIColor lightGrayColor]; + [self.verticalSep setHidden:TRUE]; + [self.contentView addSubview:verticalSep]; } return self; } @@ -53,17 +59,32 @@ #pragma mark - View Functions - (void)layoutSubviews { - [super layoutSubviews]; + [super layoutSubviews]; - CGRect fieldframe; - fieldframe.origin.x = 15; - fieldframe.origin.y = 0; - fieldframe.size.height = 44; - if([[self.textLabel text] length] != 0) - fieldframe.origin.x += [self.textLabel frame].size.width + 5; + CGRect detailEditFrame; + detailEditFrame.origin.x = 15; + detailEditFrame.origin.y = 0; + detailEditFrame.size.height = 44; + + if([[self.textLabel text] length] != 0) { + detailEditFrame.origin.x += [self.textLabel frame].size.width + 8; + + // shrink left text width by 10px + CGRect leftLabelFrame = [self.textLabel frame]; + leftLabelFrame.size.width -= 10; + [self.textLabel setFrame:leftLabelFrame]; + + // place separator between left text and detailed text + CGRect separatorFrame = [self.verticalSep frame]; + separatorFrame.origin.x = leftLabelFrame.size.width + leftLabelFrame.origin.x + 5; + [self.verticalSep setFrame:separatorFrame]; + [self.verticalSep setHidden:FALSE]; + } + + // put the detailed text edit view at the correct position CGRect superframe = [[self.detailTextField superview] frame]; - fieldframe.size.width = superframe.size.width - fieldframe.origin.x; - [self.detailTextField setFrame:fieldframe]; + detailEditFrame.size.width = superframe.size.width - detailEditFrame.origin.x; + [self.detailTextField setFrame:detailEditFrame]; } From 6133060d76d4382a5dcb818f0d47e1960152b0ed Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 9 Oct 2013 09:33:15 +0200 Subject: [PATCH 213/218] Fix a typo --- Classes/LinphoneManager.m | 2 +- Resources/en.lproj/Localizable.strings | Bin 19260 -> 19296 bytes Resources/fr.lproj/Localizable.strings | Bin 19908 -> 19926 bytes Resources/ru.lproj/Localizable.strings | Bin 19746 -> 19782 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 7952d06f7..1390b4240 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -494,7 +494,7 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char if(log == NULL || linphone_call_log_get_status(log) == LinphoneCallMissed) { UILocalNotification *notification = [[UILocalNotification alloc] init]; notification.repeatInterval = 0; - notification.alertBody = [NSString stringWithFormat:NSLocalizedString(@"You miss %@ call", nil), address]; + notification.alertBody = [NSString stringWithFormat:NSLocalizedString(@"You missed a call from %@", nil), address]; notification.alertAction = NSLocalizedString(@"Show", nil); notification.userInfo = [NSDictionary dictionaryWithObject:[NSString stringWithUTF8String:linphone_call_log_get_call_id(log)] forKey:@"callLog"]; [[UIApplication sharedApplication] presentLocalNotificationNow:notification]; diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 67d48ef40bdb220a283d0e2b5555d152ffdb7b98..a234b39a5e49b675049af571d7ee73155b56b79f 100644 GIT binary patch delta 62 zcmdlpjq$-W#tmVv?5PYX3yoAKIg#toO;6;l~f7!(*1fjAjR<^Z7rLmER7Lq0<;kfqAtu=%0;V^#oDc?{nG delta 24 gcmcaMoAJnO#toO;Srr&m85|}zswi&e@;Ji^0Cb25RR910 diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings index 7712490f2bf12e4852a29dca5103117203410789..36873bfbb8a4b677b2ca46bb4bf6fbaa83925e5b 100644 GIT binary patch delta 85 zcmZ29i}Bbj#tlC1im41K3lgcErUze delta 52 zcmX>$i*eB`#tlC1tO^XO3=Wh38;ee^a2MbQ^B5Euk{J>iau{+ZKeUaUY~#+gna9J5 F6#$fk4rl-X From 7f9abfed95fb2e1c0ca728fdbd353950e3dbe7e1 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 9 Oct 2013 10:31:48 +0200 Subject: [PATCH 214/218] Fix bug where the ring sound would not stop in case of a push notification. --- Classes/LinphoneAppDelegate.m | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index d712838fb..8c500d7e3 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -207,6 +207,14 @@ [[LinphoneManager instance] enableAutoAnswerForCallId:callid]; else [LinphoneLogger log:LinphoneLoggerError format:@"PushNotification: does not have call-id yet, fix it !"]; + + if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) { + // iOS7 fix for notification sound not stopping. + // see http://stackoverflow.com/questions/19124882/stopping-ios-7-remote-notification-sound + [[UIApplication sharedApplication] setApplicationIconBadgeNumber: 1]; + [[UIApplication sharedApplication] setApplicationIconBadgeNumber: 0]; + } + } } } From a9fbf3b36a72bb31cc56f5dc80c89fa64c72f204 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 9 Oct 2013 16:33:35 +0200 Subject: [PATCH 215/218] Modification of the build process to enable GPL builds without FFMPEG. Also simplified the process of adding options that require a reconfiguration of the linphone build. --- submodules/build/Makefile | 22 +++++++-- submodules/build/builder-iphone-os.mk | 67 +++++++++++++++++---------- 2 files changed, 62 insertions(+), 27 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index d078f0ac2..29cc10e9b 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -21,19 +21,33 @@ ############################################################################ enable_gpl_third_parties=yes enable_zrtp=no +enable_ffmpeg=yes enable_opus=yes enable_debug=no .NOTPARALLEL all: check_options build warning + +# check that the selected options are correct +CHECKOPT_MSG := "" + ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) + CHECKOPT_MSG += "ZRTP is not available in non-gpl build.\n" +endif + +ifeq ($(enable_gpl_third_parties)$(enable_ffmpeg),noyes) + CHECKOPT_MSG += "FFMPEG is not available in non-gpl build.\n" +endif + +ifneq ($(CHECKOPT_MSG),"") check_options: - @echo "ZRTP is not available in non-gpl build." + @echo $(CHECKOPT_MSG) @exit -1 else check_options: - endif +# setup footer + ifeq ($(enable_gpl_third_parties),yes) warning: @echo @@ -59,7 +73,9 @@ warning: @echo "*****************************************************************" endif -LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) enable_opus=$(enable_opus) enable_debug=$(enable_debug) +LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) \ + enable_zrtp=$(enable_zrtp) enable_opus=$(enable_opus) \ + enable_debug=$(enable_debug) enable_ffmpeg=$(enable_ffmpeg) build: make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 7cf34c9fb..8933c20a8 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -65,30 +65,48 @@ LINPHONE_BUILD_DIR=$(BUILDER_BUILD_DIR)/linphone all: build-linphone build-msilbc build-msamr build-msx264 build-mssilk build-msbcg729 -$(LINPHONE_BUILD_DIR)/enable_gpl_third_parties: - mkdir -p $(LINPHONE_BUILD_DIR) - touch $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties - rm -f $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties - cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile - -$(LINPHONE_BUILD_DIR)/disable_gpl_third_parties: - mkdir -p $(LINPHONE_BUILD_DIR) - touch $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties - rm -f $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties - cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile +# setup the switches that might trigger a linphone reconfiguration enable_gpl_third_parties?=yes +enable_ffmpeg?=yes + +SWITCHES:= ifeq ($(enable_gpl_third_parties),yes) -linphone_configure_controls+= --enable-ffmpeg -detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/enable_gpl_third_parties - -else -linphone_configure_controls+= --disable-ffmpeg -detect_gpl_mode_switch: $(LINPHONE_BUILD_DIR)/disable_gpl_third_parties + SWITCHES+= enable_gpl_third_parties + ifeq ($(enable_ffmpeg), yes) + linphone_configure_controls+= --enable-ffmpeg + SWITCHES += enable_ffmpeg + else + linphone_configure_controls+= --disable-ffmpeg + SWITCHES += disable_ffmpeg + endif + +else # !enable gpl + linphone_configure_controls+= --disable-ffmpeg + SWITCHES += disable_gpl_third_parties disable_ffmpeg endif +SWITCHES := $(addprefix $(LINPHONE_BUILD_DIR)/,$(SWITCHES)) + +mode_switch_check: $(SWITCHES) + + +$(LINPHONE_BUILD_DIR)/disable_%: + mkdir -p $(LINPHONE_BUILD_DIR) + touch $(LINPHONE_BUILD_DIR)/disable_$* + rm -f $(LINPHONE_BUILD_DIR)/enable_$* + cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile + +$(LINPHONE_BUILD_DIR)/enable_%: + mkdir -p $(LINPHONE_BUILD_DIR) + touch $(LINPHONE_BUILD_DIR)/enable_$* + rm -f $(LINPHONE_BUILD_DIR)/disable_$* + cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile + +# end of switches parsing + osip_dir=externals/osip eXosip_dir=externals/exosip speex_dir=externals/speex @@ -110,8 +128,6 @@ ifneq (,$(findstring armv7,$(host))) SPEEX_CONFIGURE_OPTION += --enable-armv7neon-asm endif - - clean-makefile: clean-makefile-linphone clean-makefile-msbcg729 clean: clean-linphone clean-msbcg729 init: @@ -121,19 +137,22 @@ init: veryclean: veryclean-linphone veryclean-msbcg729 rm -rf $(BUILDER_BUILD_DIR) +# list of the submodules to build +MS_MODULES := msilbc libilbc msamr mssilk msx264 +SUBMODULES_LIST := polarssl libantlr belle-sip srtp zrtpcpp speex libgsm libvpx libxml2 ffmpeg opus -.NOTPARALLEL build-linphone: init build-polarssl build-libantlr build-belle-sip build-srtp build-zrtpcpp build-speex build-libgsm build-ffmpeg build-libvpx build-opus build-libxml2 detect_gpl_mode_switch $(LINPHONE_BUILD_DIR)/Makefile +.NOTPARALLEL build-linphone: init $(addprefix build-,$(SUBMODULES_LIST)) mode_switch_check $(LINPHONE_BUILD_DIR)/Makefile cd $(LINPHONE_BUILD_DIR) && export PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig export CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make newdate && make && make install mkdir -p $(prefix)/share/linphone/tutorials && cp -f $(LINPHONE_SRC_DIR)/coreapi/help/*.c $(prefix)/share/linphone/tutorials/ -clean-linphone: clean-libantlr clean-polarssl clean-belle-sip clean-speex clean-libgsm clean-srtp clean-zrtpcpp clean-msilbc clean-libilbc clean-msamr clean-mssilk clean-ffmpeg clean-libvpx clean-msx264 clean-opus clean-libxml2 +clean-linphone: $(addprefix clean-,$(SUBMODULES_LIST)) $(addprefix clean-,$(MS_MODULES)) cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: veryclean-libantlr veryclean-polarssl veryclean-belle-sip veryclean-speex veryclean-srtp veryclean-zrtpcpp veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr veryclean-mssilk veryclean-msx264 veryclean-libvpx veryclean-opus veryclean-libxml2 +veryclean-linphone: $(addprefix veryclean-,$(SUBMODULES_LIST)) $(addprefix veryclean-,$(MS_MODULES)) #-cd $(LINPHONE_BUILD_DIR) && make distclean -cd $(LINPHONE_SRC_DIR) && rm -f configure -clean-makefile-linphone: clean-makefile-libantlr clean-makefile-polarssl clean-makefile-belle-sip clean-makefile-speex clean-makefile-srtp clean-makefile-zrtpcpp clean-makefile-libilbc clean-makefile-msilbc clean-makefile-msamr clean-makefile-ffmpeg clean-makefile-libvpx clean-makefile-mssilk clean-makefile-opus clean-makefile-libxml2 +clean-makefile-linphone: $(addprefix clean-makefile-,$(SUBMODULES_LIST)) $(addprefix clean-makefile-,$(MS_MODULES)) cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile @@ -142,7 +161,7 @@ $(LINPHONE_SRC_DIR)/configure: $(LINPHONE_BUILD_DIR)/Makefile: $(LINPHONE_SRC_DIR)/configure mkdir -p $(LINPHONE_BUILD_DIR) - echo -e "\033[1mPKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ + @echo -e "\033[1mPKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ $(LINPHONE_SRC_DIR)/configure -prefix=$(prefix) --host=$(host) ${library_mode} \ ${linphone_configure_controls}\033[0m" cd $(LINPHONE_BUILD_DIR) && \ From 4627ff65cd48ccae66fb4994982558af4cf008a9 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 10 Oct 2013 10:45:35 +0200 Subject: [PATCH 216/218] Typo in mssilk builder --- submodules/build/builders.d/mssilk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/build/builders.d/mssilk.mk b/submodules/build/builders.d/mssilk.mk index 9a51ee5a6..0a2a6c5ab 100644 --- a/submodules/build/builders.d/mssilk.mk +++ b/submodules/build/builders.d/mssilk.mk @@ -27,7 +27,7 @@ $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure: cd $(BUILDER_SRC_DIR)/$(mssilk_dir) && ./autogen.sh $(BUILDER_BUILD_DIR)/$(mssilk_dir)/Makefile: $(BUILDER_SRC_DIR)/$(mssilk_dir)/configure - echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" + @echo -e "\033[01;32m Running configure in $(BUILDER_BUILD_DIR)/$(mssilk_dir) \033[0m" mkdir -p $(BUILDER_BUILD_DIR)/$(mssilk_dir) cd $(BUILDER_BUILD_DIR)/$(mssilk_dir)/ \ && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ From e490b7ea132bab718b399df03e89b3e39b11d094 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 10 Oct 2013 11:26:58 +0200 Subject: [PATCH 217/218] Migrate non-GPL target of XCode to the new header paths --- linphone.xcodeproj/project.pbxproj | 42 +++++------------------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index f61b07230..c17931c1c 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -1340,6 +1340,7 @@ D3F9A9DB15AEEB940045320F /* history_notification.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F9A9DA15AEEB940045320F /* history_notification.png */; }; D3F9A9EE15AF277E0045320F /* UACellBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */; }; D3F9A9EF15AF277E0045320F /* UACellBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F9A9ED15AF277D0045320F /* UACellBackgroundView.m */; }; + F04F1E9D1806A41800D080F2 /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57B0E35F173C010400A476B8 /* libpolarssl.a */; }; F066515517F9A02E0064280C /* UITransparentTVCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F066515417F9A02E0064280C /* UITransparentTVCell.m */; }; F066515617F9A02E0064280C /* UITransparentTVCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F066515417F9A02E0064280C /* UITransparentTVCell.m */; }; F0818E7E17FC51D8005A3330 /* linphone_icon_76.png in Resources */ = {isa = PBXBuildFile; fileRef = F0818E7C17FC51D8005A3330 /* linphone_icon_76.png */; }; @@ -1814,7 +1815,6 @@ 340751E6150F38FD00B89C47 /* UIVideoButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIVideoButton.m; sourceTree = ""; }; 34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoZoomHandler.h; path = LinphoneUI/VideoZoomHandler.h; sourceTree = ""; }; 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VideoZoomHandler.m; path = LinphoneUI/VideoZoomHandler.m; sourceTree = ""; }; - 344ABDE71484E723007420B6 /* libzrtpcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzrtpcpp.a; path = "liblinphone-sdk/apple-darwin/lib/libzrtpcpp.a"; sourceTree = ""; }; 344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; }; 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; }; 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_72.png; path = Resources/linphone_icon_72.png; sourceTree = ""; }; @@ -2589,6 +2589,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + F04F1E9D1806A41800D080F2 /* libpolarssl.a in Frameworks */, 15017E71177357C500784ACB /* libxml2.a in Frameworks */, 2200C2DC174BBB24002E9A70 /* MobileCoreServices.framework in Frameworks */, 2200C2DB174BB87A002E9A70 /* AssetsLibrary.framework in Frameworks */, @@ -3313,7 +3314,6 @@ 22276E8213C73D3100210156 /* libswscale.a */, 7066FC0B13E830E400EFC6DC /* libvpx.a */, 22AA8AFB13D7125500B30535 /* libx264.a */, - 344ABDE71484E723007420B6 /* libzrtpcpp.a */, 344ABDEF14850AE9007420B6 /* libc++.1.dylib */, 22D1B68012A3E0BE001AE361 /* libresolv.dylib */, D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */, @@ -5879,14 +5879,7 @@ DEBUG, ); 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/, ); @@ -5921,14 +5914,7 @@ VIDEO_ENABLED, ); 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/, ); @@ -5964,14 +5950,7 @@ VIDEO_ENABLED, ); 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/, ); @@ -6007,14 +5986,7 @@ VIDEO_ENABLED, ); 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/, ); @@ -6071,7 +6043,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( IN_LINPHONE, VIDEO_ENABLED, - HAVE_X264, HAVE_SILK, HAVE_SSL, ); @@ -6136,7 +6107,6 @@ GCC_PREPROCESSOR_DEFINITIONS = ( IN_LINPHONE, VIDEO_ENABLED, - HAVE_X264, HAVE_SILK, HAVE_SSL, ); From e1e35b6bc9f4e6fddae52c384caae70c5446ae2b Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Thu, 10 Oct 2013 12:23:55 +0200 Subject: [PATCH 218/218] Added remote-notification option in the application background modes + bumped version number to 2.1 --- linphone-Info.plist | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linphone-Info.plist b/linphone-Info.plist index 95ba88002..29675f7ec 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -76,7 +76,7 @@ CFBundleVersion - 2.0.3 + 2.1 NSMainNibFile LinphoneApp NSMainNibFile~ipad @@ -85,8 +85,9 @@ UIBackgroundModes - voip audio + remote-notification + voip UILaunchImageFile~ipad linphone_splashscreen