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

fix compilation issue bringed from linphone submodule

Browse source
This commit is contained in:
Jehan Monnier 2012-11-06 06:11:13 +01:00
parent fed41709b5
commit c96be98316
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/IncallViewController.m
View file

@ -357,7 +357,7 @@ void addAnimationFadeTransition(UIView* view, float duration) {
if (fullUpdate) {
videoUpdateIndicator.hidden = YES;
LinphoneCallState state = linphone_call_get_state(currentCall);
if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdated || state == LinphoneCallUpdatedByRemote) {
if (state == LinphoneCallStreamsRunning || state == LinphoneCallUpdating || state == LinphoneCallUpdatedByRemote) {
if (linphone_call_params_video_enabled(linphone_call_get_current_params(currentCall))) {
[addVideo setTitle:NSLocalizedString(@"-video", nil) forState:UIControlStateNormal];
[IncallViewController updateIndicator: videoCallQuality withCallQuality:linphone_call_get_average_quality(currentCall)];

4
Classes/LinphoneUI/LinphoneManager.m
View file

@ -211,7 +211,7 @@ extern void libmsbcg729_init();
}
break;
}
case LinphoneCallUpdated:
case LinphoneCallUpdating:
{
const LinphoneCallParams* current = linphone_call_get_current_params(call);
if (linphone_call_params_video_enabled(current)) {
@ -467,7 +467,7 @@ static LinphoneCoreVTable linphonec_vtable = {
-(void) configurePayloadType:(const char*) type fromPrefKey: (NSString*)key withRate:(int)rate {
if ([[NSUserDefaults standardUserDefaults] boolForKey:key]) {
PayloadType* pt;
if((pt = linphone_core_find_payload_type(theLinphoneCore,type,rate))) {
if((pt = linphone_core_find_payload_type(theLinphoneCore,type,rate,1))) {
linphone_core_enable_payload_type(theLinphoneCore,pt, TRUE);
}
}

2
Classes/LinphoneUI/UICallButton.m
View file

@ -35,7 +35,7 @@ static BOOL transferMode = NO;
}
-(void) touchUp:(id) sender {
if (!linphone_core_is_network_reachabled([LinphoneManager getLc])) {
if (!linphone_core_is_network_reachable([LinphoneManager getLc])) {
UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Network Error",nil)
message:NSLocalizedString(@"There is no network connection available, enable WIFI or WWAN prior to place a call",nil)
delegate:nil

2
Classes/PhoneViewController.m
View file

@ -77,7 +77,7 @@
if (config == NULL) {
s = LinphoneRegistrationNone;
m = linphone_core_is_network_reachabled([LinphoneManager getLc]) ? NSLocalizedString(@"No SIP account configured", nil) : NSLocalizedString(@"Network down", nil);
m = linphone_core_is_network_reachable([LinphoneManager getLc]) ? NSLocalizedString(@"No SIP account configured", nil) : NSLocalizedString(@"Network down", nil);
} else {
s = linphone_proxy_config_get_state(config);

12
linphone.xcodeproj/project.pbxproj
View file

@ -103,6 +103,10 @@
2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; };
227BCDC210D4004600FBFD76 /* CallHistoryTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */; };
227BCDC310D4004600FBFD76 /* CallHistoryTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */; };
228390511648CAD7008A0F2C /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */; };
228390521648CAD7008A0F2C /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 228390501648CAD7008A0F2C /* libmediastreamer_voip.a */; };
228390531648D31B008A0F2C /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */; };
228390541648D31F008A0F2C /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 228390501648CAD7008A0F2C /* libmediastreamer_voip.a */; };
228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
228B19AF130290C500F154D3 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 228B19AE130290C500F154D3 /* iTunesArtwork */; };
22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; };
@ -505,6 +509,8 @@
227BCDBF10D4004600FBFD76 /* CallHistoryTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallHistoryTableViewController.h; sourceTree = "<group>"; };
227BCDC010D4004600FBFD76 /* CallHistoryTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallHistoryTableViewController.m; sourceTree = "<group>"; };
227BCDC110D4004600FBFD76 /* CallHistoryTableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CallHistoryTableViewController.xib; sourceTree = "<group>"; };
2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = "<group>"; };
228390501648CAD7008A0F2C /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = "<group>"; };
228697C311AC29B800E9E0CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
228B19AE130290C500F154D3 /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = text; name = iTunesArtwork; path = Resources/iTunesArtwork; sourceTree = "<group>"; };
22968A5D12F875C600588287 /* UISpeakerButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISpeakerButton.h; sourceTree = "<group>"; };
@ -713,6 +719,8 @@
226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */,
226183AE1472527D0037138E /* libsrtp.a in Frameworks */,
226183B0147259670037138E /* libmssilk.a in Frameworks */,
228390531648D31B008A0F2C /* libmediastreamer_base.a in Frameworks */,
228390541648D31F008A0F2C /* libmediastreamer_voip.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -720,6 +728,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
228390511648CAD7008A0F2C /* libmediastreamer_base.a in Frameworks */,
228390521648CAD7008A0F2C /* libmediastreamer_voip.a in Frameworks */,
34075199150645A300B89C47 /* CoreTelephony.framework in Frameworks */,
22D8F15B147548E2008C97DB /* libvpx.a in Frameworks */,
22D8F15C147548E2008C97DB /* QuartzCore.framework in Frameworks */,
@ -1135,6 +1145,8 @@
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
2283904F1648CAD7008A0F2C /* libmediastreamer_base.a */,
228390501648CAD7008A0F2C /* libmediastreamer_voip.a */,
340751961506459A00B89C47 /* CoreTelephony.framework */,
226CDADD14E2D0B800513B67 /* libbcg729.a */,
226CDADE14E2D0B800513B67 /* libmsbcg729.a */,