From 6cb3a41187f02c424108bc818bb099de306e082a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 12 Aug 2016 10:27:33 +0200 Subject: [PATCH] use linphone_core_create_call_params() instead of making a copy of current params. --- Classes/CallView.m | 14 +++++++------- Classes/LinphoneUI/UIVideoButton.m | 4 ++-- Classes/PhoneMainView.m | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Classes/CallView.m b/Classes/CallView.m index fa65b3054..6bcc3e939 100644 --- a/Classes/CallView.m +++ b/Classes/CallView.m @@ -601,9 +601,9 @@ static void hideSpinner(LinphoneCall *call, void *user_data) { onCancelClick:^() { LOGI(@"User declined video proposal"); if (call == linphone_core_get_current_call(LC)) { - LinphoneCallParams *paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call)); - linphone_core_accept_call_update(LC, call, paramsCopy); - linphone_call_params_destroy(paramsCopy); + LinphoneCallParams *params = linphone_core_create_call_params(LC,call); + linphone_core_accept_call_update(LC, call, params); + linphone_call_params_destroy(params); [videoDismissTimer invalidate]; videoDismissTimer = nil; } @@ -611,10 +611,10 @@ static void hideSpinner(LinphoneCall *call, void *user_data) { onConfirmationClick:^() { LOGI(@"User accept video proposal"); if (call == linphone_core_get_current_call(LC)) { - LinphoneCallParams *paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call)); - linphone_call_params_enable_video(paramsCopy, TRUE); - linphone_core_accept_call_update(LC, call, paramsCopy); - linphone_call_params_destroy(paramsCopy); + LinphoneCallParams *params = linphone_core_create_call_params(LC,call); + linphone_call_params_enable_video(params, TRUE); + linphone_core_accept_call_update(LC, call, params); + linphone_call_params_destroy(params); [videoDismissTimer invalidate]; videoDismissTimer = nil; } diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m index 60383ece7..d644c0621 100644 --- a/Classes/LinphoneUI/UIVideoButton.m +++ b/Classes/LinphoneUI/UIVideoButton.m @@ -45,7 +45,7 @@ INIT_WITH_COMMON_CF { LinphoneCallAppData *callAppData = (__bridge LinphoneCallAppData *)linphone_call_get_user_pointer(call); callAppData->videoRequested = TRUE; /* will be used later to notify user if video was not activated because of the linphone core*/ - LinphoneCallParams *call_params = linphone_call_params_copy(linphone_call_get_current_params(call)); + LinphoneCallParams *call_params = linphone_core_create_call_params(LC,call); linphone_call_params_enable_video(call_params, TRUE); linphone_core_update_call(LC, call, call_params); linphone_call_params_destroy(call_params); @@ -64,7 +64,7 @@ INIT_WITH_COMMON_CF { LinphoneCall *call = linphone_core_get_current_call(LC); if (call) { - LinphoneCallParams *call_params = linphone_call_params_copy(linphone_call_get_current_params(call)); + LinphoneCallParams *call_params = linphone_core_create_call_params(LC,call); linphone_call_params_enable_video(call_params, FALSE); linphone_core_update_call(LC, call, call_params); linphone_call_params_destroy(call_params); diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index b66948bc7..cca27f268 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -696,11 +696,11 @@ static RootViewManager *rootViewManagerInstance = nil; [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() { - LinphoneCallParams *paramsCopy = - linphone_call_params_copy(linphone_call_get_current_params(call)); + LinphoneCallParams *params = + linphone_core_create_call_params(LC,call); // stop video - linphone_call_params_enable_video(paramsCopy, FALSE); - linphone_core_update_call(LC, call, paramsCopy); + linphone_call_params_enable_video(params, FALSE); + linphone_core_update_call(LC, call, params); }]; [sheet showInView:self.view]; callData->batteryWarningShown = TRUE;