From adb7984f162880a9bd3effdc1121143606c5e834 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 19 Apr 2011 18:12:45 +0200 Subject: [PATCH] use tunnel with auto connection --- Classes/LinphoneUI/LinphoneManager.m | 2 +- linphone.xcodeproj/project.pbxproj | 8 +++++--- submodules/tunnel | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index 9aa4ae2a9..8820e8c01 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -25,7 +25,7 @@ #include #import #import -#include "TunnelManager.hh" +#include "tunnel/TunnelManager.hh" using namespace belledonnecomm; diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index bc194ffdd..d354d1f9d 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -258,6 +258,7 @@ 22323036132A28AE00F10886 /* TunnelManager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TunnelManager.cc; sourceTree = ""; }; 22323039132A290F00F10886 /* eXosip_transport_hook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eXosip_transport_hook.h; sourceTree = ""; }; 2237D4081084D7A9001383EE /* oldphone-mono.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = "oldphone-mono.wav"; path = "liblinphone-sdk/apple-darwin/share/sounds/linphone/rings/oldphone-mono.wav"; sourceTree = ""; }; + 2240EEE8135DE9A3006735F5 /* TunnelManager.hh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = TunnelManager.hh; path = "../../../../../../workspace-iphone-reltime/rtc320/submodules/linphone-iphone/submodules/tunnel/include/tunnel/TunnelManager.hh"; sourceTree = ""; }; 2242D91410D66BF300E9963F /* in_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = in_call.png; path = Resources/in_call.png; sourceTree = ""; }; 2242D91510D66BF300E9963F /* out_call.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = out_call.png; path = Resources/out_call.png; sourceTree = ""; }; 2242D91810D66C2100E9963F /* mic_active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mic_active.png; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/mic_active.png"; sourceTree = ""; }; @@ -794,6 +795,7 @@ 22DA44381354B3B6002CB522 /* tunnel */ = { isa = PBXGroup; children = ( + 2240EEE8135DE9A3006735F5 /* TunnelManager.hh */, 22DA44391354B3B6002CB522 /* client.hh */, 22DA443A1354B3B6002CB522 /* common.hh */, 22DA443B1354B3B6002CB522 /* Makefile.am */, @@ -1039,7 +1041,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, @@ -1106,7 +1108,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, @@ -1173,7 +1175,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = linphone_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; HEADER_SEARCH_PATHS = ( submodules/linphone/coreapi, submodules/linphone/mediastreamer2/include, diff --git a/submodules/tunnel b/submodules/tunnel index 70efb2245..c17125798 160000 --- a/submodules/tunnel +++ b/submodules/tunnel @@ -1 +1 @@ -Subproject commit 70efb2245fe7230990a6a9d945d79af558a08381 +Subproject commit c171257982274d1947bd4333b12918cdb2e8280e