From 4c1af495914054589db4ac6bbc72b0eeae6ea9aa Mon Sep 17 00:00:00 2001
From: Andrea Gianarda <andrea.gianarda@belledonne-communications.com>
Date: Mon, 7 Aug 2023 09:36:37 +0200
Subject: [PATCH] Rename linphone_conference_info_set_participants_2 as
linphone_conference_info_set_participant_infos
Do not call deprecated function
linphone_conference_info_get_participants in testers but use linphone_conference_info_get_participant_infos
---
include/linphone/api/c-conference-info.h | 6 +--
src/c-wrapper/api/c-conference-info.cpp | 4 +-
tester/ics-tester.cpp | 4 +-
tester/local_conference_edition_tester.cpp | 19 +++++----
tester/local_conference_tester.cpp | 44 +++++++++++---------
tester/local_conference_tester_functions.cpp | 20 +++++----
tester/local_inpromptu_conference_tester.cpp | 7 ++--
7 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/include/linphone/api/c-conference-info.h b/include/linphone/api/c-conference-info.h
index 06d371ae00..8894ce29de 100644
--- a/include/linphone/api/c-conference-info.h
+++ b/include/linphone/api/c-conference-info.h
@@ -85,7 +85,7 @@ linphone_conference_info_get_participants(const LinphoneConferenceInfo *conferen
/**
* Retrieve the list of participants as list of participant infos.
* @param conference_info The #LinphoneConferenceInfo object. @notnil
- * @return The list of participants. \bctbx_list{LinphoneParticipantInfo} @maybenil
+ * @return The list of participant informations. \bctbx_list{LinphoneParticipantInfo} @maybenil
*/
LINPHONE_PUBLIC const bctbx_list_t *
linphone_conference_info_get_participant_infos(const LinphoneConferenceInfo *conference_info);
@@ -103,8 +103,8 @@ LINPHONE_PUBLIC void linphone_conference_info_set_participants(LinphoneConferenc
* @param conference_info The #LinphoneConferenceInfo object. @notnil
* @param participant_infos The list of participant informations to set. \bctbx_list{LinphoneParticipantInfo} @maybenil
*/
-LINPHONE_PUBLIC void linphone_conference_info_set_participants_2(LinphoneConferenceInfo *conference_info,
- const bctbx_list_t *participant_infos);
+LINPHONE_PUBLIC void linphone_conference_info_set_participant_infos(LinphoneConferenceInfo *conference_info,
+ const bctbx_list_t *participant_infos);
/**
* Add a participant to the conference.
diff --git a/src/c-wrapper/api/c-conference-info.cpp b/src/c-wrapper/api/c-conference-info.cpp
index 2b9b55867e..0d32b8943e 100644
--- a/src/c-wrapper/api/c-conference-info.cpp
+++ b/src/c-wrapper/api/c-conference-info.cpp
@@ -70,8 +70,8 @@ void linphone_conference_info_set_participants(LinphoneConferenceInfo *conferenc
ConferenceInfo::toCpp(conference_info)->setParticipants(participantsList);
}
-void linphone_conference_info_set_participants_2(LinphoneConferenceInfo *conference_info,
- const bctbx_list_t *participant_infos) {
+void linphone_conference_info_set_participant_infos(LinphoneConferenceInfo *conference_info,
+ const bctbx_list_t *participant_infos) {
const std::list<std::shared_ptr<LinphonePrivate::ParticipantInfo>> participantInfos =
LinphonePrivate::Utils::bctbxListToCppSharedPtrList<LinphoneParticipantInfo, LinphonePrivate::ParticipantInfo>(
participant_infos);
diff --git a/tester/ics-tester.cpp b/tester/ics-tester.cpp
index 69aadc122f..7660e9ca39 100644
--- a/tester/ics-tester.cpp
+++ b/tester/ics-tester.cpp
@@ -364,7 +364,7 @@ static void send_conference_invitations(bool_t enable_encryption,
BC_ASSERT_TRUE(linphone_address_weak_equal(
conf_uri, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
if (add_participant_in_error) {
BC_ASSERT_EQUAL(bctbx_list_size(participants), 3, size_t, "%zu");
} else {
@@ -417,7 +417,7 @@ static void send_conference_invitations(bool_t enable_encryption,
linphone_conference_info_get_organizer(conf_info_from_content)));
BC_ASSERT_TRUE(
linphone_address_weak_equal(conf_uri, linphone_conference_info_get_uri(conf_info_from_content)));
- const bctbx_list_t *participants = linphone_conference_info_get_participants(conf_info_from_content);
+ const bctbx_list_t *participants = linphone_conference_info_get_participant_infos(conf_info_from_content);
if (add_participant_in_error) {
BC_ASSERT_EQUAL(bctbx_list_size(participants), 3, size_t, "%zu");
} else {
diff --git a/tester/local_conference_edition_tester.cpp b/tester/local_conference_edition_tester.cpp
index 9ca0d07135..6098de6aa4 100644
--- a/tester/local_conference_edition_tester.cpp
+++ b/tester/local_conference_edition_tester.cpp
@@ -161,7 +161,7 @@ static void edit_simple_conference_base(bool_t from_organizer,
}
const auto ics_participant_number = 3;
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number, size_t, "%zu");
std::list<stats> participant_stats;
@@ -261,7 +261,7 @@ static void edit_simple_conference_base(bool_t from_organizer,
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number, size_t,
"%zu");
@@ -594,7 +594,7 @@ static void edit_simple_conference_base(bool_t from_organizer,
}
const auto ics_participant_number = ((add) ? 4 : 3) + ((join) ? 1 : 0);
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number, size_t, "%zu");
std::list<stats> participant_stats;
@@ -716,7 +716,8 @@ static void edit_simple_conference_base(bool_t from_organizer,
linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(
+ conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number,
size_t, "%zu");
@@ -1031,7 +1032,7 @@ static void conference_edition_with_simultaneous_participant_add_remove_base(boo
linphone_conference_info_add_participant(conf_info, michelle.getCMgr()->identity);
linphone_conference_info_remove_participant(conf_info, laure.getCMgr()->identity);
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), participants.size(), size_t, "%zu");
std::list<stats> participant_stats;
@@ -1129,7 +1130,7 @@ static void conference_edition_with_simultaneous_participant_add_remove_base(boo
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), participants.size(), size_t, "%zu");
if (start_time > 0) {
@@ -1398,7 +1399,7 @@ static void conference_cancelled_through_edit_base(bool_t server_restart) {
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), 3, size_t, "%zu");
if (start_time > 0) {
@@ -1493,7 +1494,7 @@ static void conference_cancelled_through_edit_base(bool_t server_restart) {
linphone_conference_info_set_subject(conf_info, subject);
linphone_conference_info_set_description(conf_info, description2);
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), 3, size_t, "%zu");
conference_scheduler = linphone_core_create_conference_scheduler(marie.getLc());
@@ -1594,7 +1595,7 @@ static void conference_cancelled_through_edit_base(bool_t server_restart) {
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), 0, size_t, "%zu");
if (start_time > 0) {
diff --git a/tester/local_conference_tester.cpp b/tester/local_conference_tester.cpp
index 10243dc51c..41181a60cf 100644
--- a/tester/local_conference_tester.cpp
+++ b/tester/local_conference_tester.cpp
@@ -5226,7 +5226,7 @@ static void check_conference_info(LinphoneCoreManager *mgr,
BC_ASSERT_TRUE(linphone_address_weak_equal(organizer->identity, linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), no_members, size_t, "%zu");
if (start_time > 0) {
@@ -5331,7 +5331,7 @@ create_conference_on_server(Focus &focus,
linphone_account_get_params(default_account)))
: linphone_address_new(linphone_core_get_identity(organizer.getLc()));
linphone_conference_info_set_organizer(conf_info, organizer_address);
- linphone_conference_info_set_participants_2(conf_info, participant_infos);
+ linphone_conference_info_set_participant_infos(conf_info, participant_infos);
if ((end_time >= 0) && (start_time >= 0) && (end_time > start_time)) {
linphone_conference_info_set_duration(
conf_info, (int)((end_time - start_time) / 60)); // duration is expected to be set in minutes
@@ -5516,12 +5516,12 @@ create_conference_on_server(Focus &focus,
linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), participant_expected_participant_number,
size_t, "%zu");
const bctbx_list_t *ics_participants_db =
- linphone_conference_info_get_participants(conf_info_in_db);
+ linphone_conference_info_get_participant_infos(conf_info_in_db);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants_db),
participant_expected_participant_number, size_t, "%zu");
@@ -9296,7 +9296,7 @@ static void create_conference_dial_out_base(bool_t send_ics,
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
const bctbx_list_t *info_participants =
- linphone_conference_info_get_participants(call_log_info);
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), participant_conference_info_participants,
size_t, "%zu");
@@ -10099,7 +10099,8 @@ static void create_simple_conference_dial_out_with_some_calls_declined_base(Linp
BC_ASSERT_TRUE(
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(call_log_info);
+ const bctbx_list_t *info_participants =
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 5, size_t, "%zu");
@@ -10674,7 +10675,8 @@ create_conference_with_late_participant_addition_base(time_t start_time,
BC_ASSERT_TRUE(
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(call_log_info);
+ const bctbx_list_t *info_participants =
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), static_cast<int>(members.size()), size_t,
"%zu");
@@ -11928,7 +11930,7 @@ static void edit_simple_conference_base(bool_t from_organizer,
participants.push_back(lise.getCMgr());
const auto ics_participant_number = 3;
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number, size_t, "%zu");
std::list<stats> participant_stats;
@@ -12028,7 +12030,7 @@ static void edit_simple_conference_base(bool_t from_organizer,
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number, size_t,
"%zu");
@@ -12349,7 +12351,7 @@ static void edit_simple_conference_base(bool_t from_organizer,
}
const auto ics_participant_number = ((add) ? 4 : 3) + ((join) ? 1 : 0);
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number, size_t, "%zu");
std::list<stats> participant_stats;
@@ -12470,7 +12472,8 @@ static void edit_simple_conference_base(bool_t from_organizer,
linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(
+ conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), ics_participant_number,
size_t, "%zu");
@@ -12783,7 +12786,7 @@ static void conference_edition_with_simultaneous_participant_add_remove_base(boo
linphone_conference_info_add_participant(conf_info, michelle.getCMgr()->identity);
linphone_conference_info_remove_participant(conf_info, laure.getCMgr()->identity);
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), participants.size(), size_t, "%zu");
std::list<stats> participant_stats;
@@ -12881,7 +12884,7 @@ static void conference_edition_with_simultaneous_participant_add_remove_base(boo
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), participants.size(), size_t, "%zu");
if (start_time > 0) {
@@ -13148,7 +13151,7 @@ static void conference_cancelled_through_edit_base(bool_t server_restart) {
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), 3, size_t, "%zu");
if (start_time > 0) {
@@ -13243,7 +13246,7 @@ static void conference_cancelled_through_edit_base(bool_t server_restart) {
linphone_conference_info_set_subject(conf_info, subject);
linphone_conference_info_set_description(conf_info, description2);
- const bctbx_list_t *ics_participants = linphone_conference_info_get_participants(conf_info);
+ const bctbx_list_t *ics_participants = linphone_conference_info_get_participant_infos(conf_info);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), 3, size_t, "%zu");
conference_scheduler = linphone_core_create_conference_scheduler(marie.getLc());
@@ -13344,7 +13347,7 @@ static void conference_cancelled_through_edit_base(bool_t server_restart) {
confAddr, linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), 0, size_t, "%zu");
if (start_time > 0) {
@@ -16638,7 +16641,7 @@ static void create_conference_with_active_call_base(bool_t dialout) {
linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 4, size_t, "%zu");
BC_ASSERT_NOT_EQUAL((long long)linphone_conference_info_get_date_time(info), 0, long long,
@@ -16706,7 +16709,7 @@ static void create_conference_with_active_call_base(bool_t dialout) {
linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 4, size_t, "%zu");
@@ -16738,7 +16741,8 @@ static void create_conference_with_active_call_base(bool_t dialout) {
BC_ASSERT_TRUE(
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(call_log_info);
+ const bctbx_list_t *info_participants =
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 4, size_t, "%zu");
BC_ASSERT_GREATER_STRICT((long long)linphone_conference_info_get_date_time(call_log_info), 0,
@@ -17104,7 +17108,7 @@ static void create_conference_with_active_call_base(bool_t dialout) {
linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), (dialout) ? 4 : 5, size_t, "%zu");
diff --git a/tester/local_conference_tester_functions.cpp b/tester/local_conference_tester_functions.cpp
index 1148da05d0..7f78b3db90 100644
--- a/tester/local_conference_tester_functions.cpp
+++ b/tester/local_conference_tester_functions.cpp
@@ -1589,7 +1589,7 @@ void check_conference_info(LinphoneCoreManager *mgr,
BC_ASSERT_TRUE(linphone_address_weak_equal(organizer->identity, linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), no_members, size_t, "%zu");
BC_ASSERT_EQUAL((int)linphone_conference_info_get_security_level(info), (int)security_level, int, "%0d");
@@ -1695,7 +1695,7 @@ create_conference_on_server(Focus &focus,
linphone_account_get_params(default_account)))
: linphone_address_new(linphone_core_get_identity(organizer.getLc()));
linphone_conference_info_set_organizer(conf_info, organizer_address);
- linphone_conference_info_set_participants_2(conf_info, participant_infos);
+ linphone_conference_info_set_participant_infos(conf_info, participant_infos);
if ((end_time >= 0) && (start_time >= 0) && (end_time > start_time)) {
linphone_conference_info_set_duration(
conf_info, (int)((end_time - start_time) / 60)); // duration is expected to be set in minutes
@@ -1882,12 +1882,12 @@ create_conference_on_server(Focus &focus,
linphone_conference_info_get_uri(conf_info_from_original_content)));
const bctbx_list_t *ics_participants =
- linphone_conference_info_get_participants(conf_info_from_original_content);
+ linphone_conference_info_get_participant_infos(conf_info_from_original_content);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants), participant_expected_participant_number,
size_t, "%zu");
const bctbx_list_t *ics_participants_db =
- linphone_conference_info_get_participants(conf_info_in_db);
+ linphone_conference_info_get_participant_infos(conf_info_in_db);
BC_ASSERT_EQUAL(bctbx_list_size(ics_participants_db),
participant_expected_participant_number, size_t, "%zu");
@@ -4868,7 +4868,8 @@ void create_conference_with_late_participant_addition_base(time_t start_time,
BC_ASSERT_TRUE(
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(call_log_info);
+ const bctbx_list_t *info_participants =
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), static_cast<int>(members.size()), size_t,
"%zu");
@@ -7173,7 +7174,7 @@ void create_conference_with_active_call_base(bool_t dialout) {
linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 4, size_t, "%zu");
BC_ASSERT_NOT_EQUAL((long long)linphone_conference_info_get_date_time(info), 0, long long,
@@ -7241,7 +7242,7 @@ void create_conference_with_active_call_base(bool_t dialout) {
linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 4, size_t, "%zu");
@@ -7273,7 +7274,8 @@ void create_conference_with_active_call_base(bool_t dialout) {
BC_ASSERT_TRUE(
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(call_log_info);
+ const bctbx_list_t *info_participants =
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 4, size_t, "%zu");
BC_ASSERT_GREATER_STRICT((long long)linphone_conference_info_get_date_time(call_log_info), 0,
@@ -7642,7 +7644,7 @@ void create_conference_with_active_call_base(bool_t dialout) {
linphone_conference_info_get_organizer(info)));
BC_ASSERT_TRUE(linphone_address_weak_equal(confAddr, linphone_conference_info_get_uri(info)));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(info);
+ const bctbx_list_t *info_participants = linphone_conference_info_get_participant_infos(info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), (dialout) ? 4 : 5, size_t, "%zu");
diff --git a/tester/local_inpromptu_conference_tester.cpp b/tester/local_inpromptu_conference_tester.cpp
index 48cf2b81e6..04e3e2f8a0 100644
--- a/tester/local_inpromptu_conference_tester.cpp
+++ b/tester/local_inpromptu_conference_tester.cpp
@@ -259,7 +259,7 @@ static void create_conference_dial_out_base(bool_t send_ics,
BC_ASSERT_TRUE(
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
const bctbx_list_t *info_participants =
- linphone_conference_info_get_participants(call_log_info);
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), participant_conference_info_participants,
size_t, "%zu");
@@ -437,7 +437,7 @@ static void create_conference_dial_out_base(bool_t send_ics,
linphone_conference_info_get_uri(call_log_info), confAddr));
const bctbx_list_t *info_participants =
- linphone_conference_info_get_participants(call_log_info);
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants),
participant_conference_info_participants, size_t, "%zu");
@@ -1133,7 +1133,8 @@ static void create_simple_conference_dial_out_with_some_calls_declined_base(Linp
BC_ASSERT_TRUE(
linphone_address_weak_equal(linphone_conference_info_get_uri(call_log_info), confAddr));
- const bctbx_list_t *info_participants = linphone_conference_info_get_participants(call_log_info);
+ const bctbx_list_t *info_participants =
+ linphone_conference_info_get_participant_infos(call_log_info);
// Original participants + Marie who joined the conference
BC_ASSERT_EQUAL(bctbx_list_size(info_participants), 5, size_t, "%zu");
--
GitLab