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

LinphoneManager: rename *LibLinphone to *LinphoneCore methods for consistency

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-04-27 17:13:33 +02:00
parent 054ae00984
commit 7441e0155a
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/LinphoneAppDelegate.m
View file

@ -212,7 +212,7 @@
[[UIApplication sharedApplication] endBackgroundTask:bgStartId];
}];
[[LinphoneManager instance] startLibLinphone];
[[LinphoneManager instance] startLinphoneCore];
// initialize UI
[self.window makeKeyAndVisible];
[RootViewManager setupWithPortrait:(PhoneMainView*)self.window.rootViewController];
@ -513,8 +513,8 @@
name:kLinphoneConfiguringStateUpdate
object:nil];
linphone_core_set_provisioning_uri([LinphoneManager getLc] , [configURL UTF8String]);
[[LinphoneManager instance] destroyLibLinphone];
[[LinphoneManager instance] startLibLinphone];
[[LinphoneManager instance] destroyLinphoneCore];
[[LinphoneManager instance] startLinphoneCore];
}

4
Classes/LinphoneManager.h
View file

@ -132,8 +132,8 @@ typedef struct _LinphoneManagerSounds {
- (void)playMessageSound;
- (void)resetLinphoneCore;
- (void)startLibLinphone;
- (void)destroyLibLinphone;
- (void)startLinphoneCore;
- (void)destroyLinphoneCore;
- (BOOL)resignActive;
- (void)becomeActive;
- (BOOL)enterBackgroundMode;

7
Classes/LinphoneManager.m
View file

@ -1387,7 +1387,7 @@ static LinphoneCoreVTable linphonec_vtable = {
static BOOL libStarted = FALSE;
- (void)startLibLinphone {
- (void)startLinphoneCore {
if ( libStarted ) {
[LinphoneLogger logc:LinphoneLoggerError format:"Liblinphone is already initialized!"];
@ -1402,6 +1402,7 @@ static BOOL libStarted = FALSE;
// create linphone core
[self createLinphoneCore];
linphone_core_migrate_to_multi_transport(theLinphoneCore);
// init audio session (just getting the instance will init)
@ -1491,7 +1492,7 @@ static BOOL libStarted = FALSE;
repeats:YES];
}
- (void)destroyLibLinphone {
- (void)destroyLinphoneCore {
[mIterateTimer invalidate];
//just in case
[self removeCTCallCenterCb];
@ -1518,7 +1519,7 @@ static BOOL libStarted = FALSE;
}
- (void) resetLinphoneCore {
[self destroyLibLinphone];
[self destroyLinphoneCore];
[self createLinphoneCore];
// reset network state to trigger a new network connectivity assessment

2
Classes/SettingsViewController.m
View file

@ -701,7 +701,7 @@ static UICompositeViewDescription *compositeDescription = nil;
if([key isEqual:@"release_button"]) {
[UIApplication sharedApplication].keyWindow.rootViewController = nil;
[[UIApplication sharedApplication].keyWindow setRootViewController:nil];
[[LinphoneManager instance] destroyLibLinphone];
[[LinphoneManager instance] destroyLinphoneCore];
[LinphoneManager instanceRelease];
} else if([key isEqual:@"clear_cache_button"]) {
[[PhoneMainView instance].mainViewController clearCache:[NSArray arrayWithObject:[[PhoneMainView instance] currentView]]];