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

Merge remote-tracking branch 'linphone/master' into buschjaeger

Browse source 
Conflicts:
	linphone-Info.plist
	linphone.xcodeproj/project.pbxproj
This commit is contained in:
Simon Morlat 2012-05-03 15:50:02 +02:00
commit ec4beba395
10 changed files with 62 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Classes/LinphoneUI/LinphoneManager.m
View file

@ -41,7 +41,7 @@ extern void libmsx264_init();
#endif
#define FRONT_CAM_NAME "AV Capture: Front Camera"
#define BACK_CAM_NAME "AV Capture: Back Camera"
#define DEFAULT_EXPIRES 600
#if defined (HAVE_SILK)
extern void libmssilk_init();
#endif
@ -451,23 +451,42 @@ static LinphoneCoreVTable linphonec_vtable = {
void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void* nilCtx) {
ms_message("Network connection flag [%x]",flags);
LinphoneManager* lLinphoneMgr = [LinphoneManager instance];
SCNetworkReachabilityFlags networkDownFlags=kSCNetworkReachabilityFlagsConnectionRequired |kSCNetworkReachabilityFlagsConnectionOnTraffic;
if ([LinphoneManager getLc] != nil) {
LinphoneProxyConfig* proxy;
linphone_core_get_default_proxy([LinphoneManager getLc], &proxy);
struct NetworkReachabilityContext* ctx = nilCtx ? ((struct NetworkReachabilityContext*)nilCtx) : 0;
if ((flags == 0) | (flags & (kSCNetworkReachabilityFlagsConnectionRequired |kSCNetworkReachabilityFlagsConnectionOnTraffic))) {
if ((flags == 0) | (flags & networkDownFlags)) {
[[LinphoneManager instance] kickOffNetworkConnection];
linphone_core_set_network_reachable([LinphoneManager getLc],false);
lLinphoneMgr.connectivity = none;
} else {
Connectivity newConnectivity;
BOOL isWifiOnly = [[NSUserDefaults standardUserDefaults] boolForKey:@"wifi_only_preference"];
if (!ctx || ctx->testWWan)
newConnectivity = flags & kSCNetworkReachabilityFlagsIsWWAN ? wwan:wifi;
else
newConnectivity = wifi;
if (newConnectivity == wwan
&& proxy
&& isWifiOnly
&& (lLinphoneMgr.connectivity == newConnectivity || lLinphoneMgr.connectivity == none)) {
linphone_proxy_config_expires(proxy, 0);
} else if (proxy){
linphone_proxy_config_expires(proxy, DEFAULT_EXPIRES); //might be better to save the previous value
}
if (lLinphoneMgr.connectivity == none) {
linphone_core_set_network_reachable([LinphoneManager getLc],true);
} else if (lLinphoneMgr.connectivity != newConnectivity) {
// connectivity has changed
linphone_core_set_network_reachable([LinphoneManager getLc],false);
if (newConnectivity == wwan && proxy && isWifiOnly) {
linphone_proxy_config_expires(proxy, 0);
}
linphone_core_set_network_reachable([LinphoneManager getLc],true);
}
lLinphoneMgr.connectivity=newConnectivity;
@ -615,7 +634,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
linphone_proxy_config_set_identity(proxyCfg,identity);
linphone_proxy_config_set_server_addr(proxyCfg,proxy);
linphone_proxy_config_enable_register(proxyCfg,true);
linphone_proxy_config_expires(proxyCfg, 600);
linphone_proxy_config_expires(proxyCfg, DEFAULT_EXPIRES);
if (isOutboundProxy)
linphone_proxy_config_set_route(proxyCfg,proxy);

10
Classes/MainScreenWithVideoPreview.m
View file

@ -128,10 +128,18 @@
-(void) showPreview:(BOOL) show {
LinphoneCore* lc;
@try {
lc = [LinphoneManager getLc];
}
@catch (NSException *exception) {
return;
}
bool enableVideo = [[NSUserDefaults standardUserDefaults] boolForKey:@"enable_video_preference"];
if (enableVideo) {
LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
LinphoneCall* call = linphone_core_get_current_call(lc);
if (show && call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
return;
}

8
Classes/PhoneViewController.m
View file

@ -83,10 +83,12 @@
switch (s) {
case LinphoneRegistrationOk: m = @"Registered"; break;
case LinphoneRegistrationNone: m=@"Not registered"; break;
case LinphoneRegistrationNone:
case LinphoneRegistrationCleared:
m=@"Not registered"; break;
case LinphoneRegistrationFailed: m = @"Registration failed"; break;
case LinphoneRegistrationProgress: m = @"Registration in progress"; break;
case LinphoneRegistrationCleared: m= @"No SIP account"; break;
//case LinphoneRegistrationCleared: m= @"No SIP account"; break;
default: break;
}
}
@ -113,7 +115,7 @@
[callShort setEnabled:!linphone_core_sound_resources_locked([LinphoneManager getLc])];
} @catch (NSException* exc) {
// R.A.S: linphone core si simply not ready...
ms_warning("Exception %s: %s",
ms_warning("Catched exception %s: %s",
[exc.name cStringUsingEncoding:[NSString defaultCStringEncoding]],
[exc.reason cStringUsingEncoding:[NSString defaultCStringEncoding]]);
}

4
Classes/StatusSubViewController.m
View file

@ -63,11 +63,11 @@
label.hidden = NO;
switch(state) {
case LinphoneRegistrationCleared:
image.hidden = NO;
/* image.hidden = NO;
[image setImage:[UIImage imageNamed:@"status_orange.png"]];
[spinner stopAnimating];
[label setText:message != nil ? message : NSLocalizedString(@"No SIP account defined", nil)];
return YES;
return YES;*/
case LinphoneRegistrationFailed:
image.hidden = NO;
[image setImage:[UIImage imageNamed:@"status_red.png"]];

22
PhoneMainView.xib
View file

@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">784</int>
<string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.23</string>
<string key="IBDocument.HIToolboxVersion">567.00</string>
<string key="IBDocument.SystemVersion">11D50b</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.32</string>
<string key="IBDocument.HIToolboxVersion">568.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">933</string>
<string key="NS.object.0">1181</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -47,7 +47,6 @@
<object class="NSPSMatrix" key="NSFrameMatrix"/>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -141,7 +140,6 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 431}, {320, 49}}</string>
<reference key="NSSuperview"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
@ -318,7 +316,7 @@
<string>8.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIApplication</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -368,6 +366,10 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<integer value="784" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
<real value="1296" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
@ -381,12 +383,12 @@
<string>dialer-orange.png</string>
<string>history-orange.png</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{25, 24}</string>
<string>{25, 23}</string>
</object>
</object>
<string key="IBCocoaTouchPluginVersion">933</string>
<string key="IBCocoaTouchPluginVersion">1181</string>
</data>
</archive>

2
linphone.xcodeproj/project.pbxproj
View file

@ -1551,6 +1551,8 @@
3418845814C6F66F00EA48C7 /* status_orange.png in Resources */,
3418845A14C6F66F00EA48C7 /* status_red.png in Resources */,
3418845D14C7077400EA48C7 /* status_gray.png in Resources */,
57282931154AF1460076F540 /* history-orange.png in Resources */,
57282933154AF14D0076F540 /* dialer-orange.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

5
submodules/build/builders.d/openssl.mk
View file

@ -1,6 +1,9 @@
openssl_version=1.0.0a
openssl_site=http://www.openssl.org/source
OPENSSL_BUILD_DIR?=$(BUILDER_BUILD_DIR)/externals/openssl
ifneq (,$(findstring mingw,$(host)))
CONFIGURE_OPTION := mingw
MAKE_PARAMS:= CC=i586-mingw32msvc-gcc RANLIB=i586-mingw32msvc-ranlib
@ -10,7 +13,7 @@ $(OPENSSL_BUILD_DIR)/Configure:
mkdir -p $(BUILDER_BUILD_DIR)/externals \
&& cd $(BUILDER_BUILD_DIR)/externals \
&& rm -rf openssl \
&& wget ftp://sunsite.cnlab-switch.ch/mirror/openssl/source/openssl-$(openssl_version).tar.gz \
&& wget $(openssl_site)/openssl-$(openssl_version).tar.gz \
&& tar xvzf openssl-$(openssl_version).tar.gz \
&& rm -f openssl-$(openssl_version).tar.gz \
&& mv openssl-$(openssl_version) openssl \

7
submodules/build/builders.d/srtp.mk
View file

@ -1,16 +1,17 @@
srtp_dir?=externals/srtp
$(BUILDER_SRC_DIR)/$(srtp_dir)/configure:
$(BUILDER_SRC_DIR)/$(srtp_dir)/configure: $(BUILDER_SRC_DIR)/$(srtp_dir)/configure.in
cd $(BUILDER_SRC_DIR)/$(srtp_dir) \
&& autoconf
$(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/configure
$(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile: $(BUILDER_SRC_DIR)/$(srtp_dir)/configure $(BUILDER_SRC_DIR)/$(srtp_dir)/Makefile.in
mkdir -p $(BUILDER_BUILD_DIR)/$(srtp_dir)
cd $(BUILDER_BUILD_DIR)/$(srtp_dir)/\
&& CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \
$(BUILDER_SRC_DIR)/$(srtp_dir)/configure -prefix=$(prefix) --host=$(host) ${library_mode}
build-srtp: $(BUILDER_BUILD_DIR)/$(srtp_dir)/Makefile
cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a && make uninstall && make install
host_alias=$(host) && . /$(BUILDER_SRC_DIR)/build/$(config_site) && \
cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make libsrtp.a AR=$$AR && make install
clean-srtp:
-cd $(BUILDER_BUILD_DIR)/$(srtp_dir) && make clean

2
submodules/externals/srtp vendored

@ -1 +1 @@
Subproject commit daa25fdbacb75e2aa99f5fce1bd5836dc616fb42
Subproject commit c01a03a478d4c97fa7e2af80844f8d60440af0a6

2
submodules/linphone

@ -1 +1 @@
Subproject commit 0e496ed3d9f19528b0a2db5050c11030ca6a1312
Subproject commit 04fa4d457b3b584eae8c5964a48a97ec4040c94a