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 branch 'master' of git.linphone.org:linphone-iphone

Browse source
This commit is contained in:
Simon Morlat 2012-06-08 22:09:13 +02:00
commit 7e4a6cdb53
6 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Classes/IncallViewController.m
View file

@ -932,7 +932,11 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
} else {
switch (linphone_call_get_state(call)) {
case LinphoneCallPaused:
[ms appendFormat:@"%@", NSLocalizedString(@"Paused (tap to resume)", nil), nil];
if(!linphone_core_sound_resources_locked(linphone_call_get_core(call))) {
[ms appendFormat:@"%@", NSLocalizedString(@"Paused (tap to resume)", nil), nil];
} else {
[ms appendFormat:@"%@", NSLocalizedString(@"Paused", nil), nil];
}
break;
case LinphoneCallOutgoingInit:
case LinphoneCallOutgoingProgress:
@ -1242,7 +1246,9 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
if (linphone_core_is_in_conference(lc)) {
linphone_core_leave_conference(lc);
}
linphone_core_resume_call([LinphoneManager getLc], selectedCall);
if(!linphone_core_sound_resources_locked(lc)) {
linphone_core_resume_call([LinphoneManager getLc], selectedCall);
}
}
[self updateUIFromLinphoneState: YES];

11
Classes/LinphoneUI/LinphoneManager.m
View file

@ -141,6 +141,14 @@ extern void libmsbcg729_init();
}
-(void) onCall:(LinphoneCall*) call StateChanged: (LinphoneCallState) new_state withMessage: (const char *) message {
if(new_state == LinphoneCallReleased) {
if(linphone_call_get_user_pointer(call) != NULL) {
free (linphone_call_get_user_pointer(call));
linphone_call_set_user_pointer(call, NULL);
}
return;
}
const char* lUserNameChars=linphone_address_get_username(linphone_call_get_remote_address(call));
NSString* lUserName = lUserNameChars?[[[NSString alloc] initWithUTF8String:lUserNameChars] autorelease]:NSLocalizedString(@"Unknown",nil);
if (new_state == LinphoneCallIncomingReceived) {
@ -269,9 +277,6 @@ extern void libmsbcg729_init();
[callDelegate displayInCall:call FromUI:mCurrentViewController forUser:lUserName withDisplayName:lDisplayName];
}
break;
case LinphoneCallReleased:
free (linphone_call_get_user_pointer(call));
break;
default:
break;
}

8
Classes/PhoneViewController.m
View file

@ -270,9 +270,9 @@
mIncomingCallActionSheet = [[UIActionSheet alloc] initWithTitle:[NSString stringWithFormat:NSLocalizedString(@" %@ is calling you",nil),[displayName length]>0?displayName:username]
delegate:cd
cancelButtonTitle:NSLocalizedString(@"Decline",nil)
cancelButtonTitle:nil
destructiveButtonTitle:NSLocalizedString(@"Answer",nil)
otherButtonTitles:nil];
otherButtonTitles:NSLocalizedString(@"Decline",nil),nil];
mIncomingCallActionSheet.actionSheetStyle = UIActionSheetStyleDefault;
if ([LinphoneManager runningOnIpad]) {
@ -320,8 +320,8 @@
-(void) displayInCall: (LinphoneCall*) call FromUI:(UIViewController*) viewCtrl forUser:(NSString*) username withDisplayName:(NSString*) displayName {
[mMainScreenWithVideoPreview showPreview:NO];
if (self.presentedViewController != (UIViewController*)mIncallViewController && (call == 0x0 ||
linphone_call_get_dir(call)==LinphoneCallIncoming)){
if (self.presentedViewController != (UIViewController*)mIncallViewController /*&& (call == 0x0 ||
linphone_call_get_dir(call)==LinphoneCallIncoming)*/){
[self presentModalViewController:(UIViewController*)mIncallViewController animated:true];
}

4
linphone-Info.plist
View file

@ -24,11 +24,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.5.0</string>
<string>3.5.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.2</string>
<string>1.3</string>
<key>NSMainNibFile</key>
<string>PhoneMainView</string>
<key>NSMainNibFile~ipad</key>

10
linphone.xcodeproj/project.pbxproj
View file

@ -1596,7 +1596,7 @@
HAVE_SILK,
);
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
submodules/linphone/coreapi,
submodules/linphone/mediastreamer2/include,
@ -1635,7 +1635,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 3.1;
LIBRARY_SEARCH_PATHS = "";
LINK_WITH_STANDARD_LIBRARIES = YES;
PROVISIONING_PROFILE = "32E63D15-36ED-474A-8157-8DD0770DF063";
PROVISIONING_PROFILE = "B8ED8915-B69D-40DA-9B89-1700C44B156B";
SDKROOT = iphoneos;
};
name = DistributionAdhoc;
@ -1662,7 +1662,7 @@
HAVE_SILK,
);
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
submodules/linphone/coreapi,
submodules/linphone/mediastreamer2/include,
@ -1938,7 +1938,7 @@
HAVE_SILK,
);
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
submodules/linphone/coreapi,
submodules/linphone/mediastreamer2/include,
@ -2005,7 +2005,7 @@
HAVE_SILK,
);
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
submodules/linphone/coreapi,
submodules/linphone/mediastreamer2/include,

2
submodules/linphone

@ -1 +1 @@
Subproject commit bad6c152f1521de8648d47c70e9321b7668b40b5
Subproject commit 2d669353c3eda22e63023fde2f3cde7b437d2c81