From b408241b1e6592a444395edf6c8bd9bd34ede496 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 25 Aug 2016 18:18:31 +0200 Subject: [PATCH] update linphone submodule (VideoToolbox H264 decoder improvements) --- Classes/AssistantView.m | 14 +++++++------- submodules/linphone | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 8f4da2359..746b8dec0 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -710,13 +710,13 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - Account creator callbacks -void assistant_is_account_used(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { +void assistant_is_account_used(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *response) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; [thiz isAccountUsed:status]; } -void assistant_create_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { +void assistant_create_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *response) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorAccountCreated) { @@ -730,7 +730,7 @@ void assistant_create_account(LinphoneAccountCreator *creator, LinphoneAccountCr } } -void assistant_recover_phone_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { +void assistant_recover_phone_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *response) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorOK) { @@ -740,7 +740,7 @@ void assistant_recover_phone_account(LinphoneAccountCreator *creator, LinphoneAc } } -void assistant_activate_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { +void assistant_activate_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *response) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorAccountActivated) { @@ -761,7 +761,7 @@ void assistant_activate_account(LinphoneAccountCreator *creator, LinphoneAccount } } -void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { +void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *response) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorAccountActivated) { @@ -785,7 +785,7 @@ void assistant_is_account_activated(LinphoneAccountCreator *creator, LinphoneAcc } } -void assistant_link_phone_number_with_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { +void assistant_link_phone_number_with_account(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *response) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorOK) { @@ -801,7 +801,7 @@ void assistant_link_phone_number_with_account(LinphoneAccountCreator *creator, L } } -void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) { +void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char *response) { AssistantView *thiz = (__bridge AssistantView *)(linphone_account_creator_get_user_data(creator)); thiz.waitView.hidden = YES; if (status == LinphoneAccountCreatorOK) { diff --git a/submodules/linphone b/submodules/linphone index c24a71a17..e4bc29cb9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c24a71a17a97e58bf5639c395ae6b783a723c0bf +Subproject commit e4bc29cb99cf035cca84f00064f40caff333c6a5