From a95fde282a07cb1e90a2c78f81ddc1a9451375e9 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 15 Oct 2015 12:15:57 +0200 Subject: [PATCH] conference.c: move doc to header --- coreapi/conference.c | 15 --------------- coreapi/linphonecore.h | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/coreapi/conference.c b/coreapi/conference.c index 5479c8315..66898d9a2 100644 --- a/coreapi/conference.c +++ b/coreapi/conference.c @@ -276,21 +276,6 @@ static int convert_conference_to_call(LinphoneCore *lc){ return err; } -/** - * Remove a call from the conference. - * @param lc the linphone core - * @param call a call that has been previously merged into the conference. - * - * After removing the remote participant belonging to the supplied call, the call becomes a normal call in paused state. - * If one single remote participant is left alone together with the local user in the conference after the removal, then the conference is - * automatically transformed into a simple call in StreamsRunning state. - * The conference's resources are then automatically destroyed. - * - * In other words, unless linphone_core_leave_conference() is explicitely called, the last remote participant of a conference is automatically - * put in a simple call in running state. - * - * @return 0 if successful, -1 otherwise. - **/ int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call){ int err; char * str=linphone_call_get_remote_address_as_string(call); diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 2a4439c2c..aa6856d21 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -3782,7 +3782,22 @@ LINPHONE_PUBLIC LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCor LINPHONE_PUBLIC int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call); LINPHONE_PUBLIC int linphone_core_add_all_to_conference(LinphoneCore *lc); -LINPHONE_PUBLIC int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call); +/** + * Remove a call from the conference. + * @param lc the linphone core + * @param call a call that has been previously merged into the conference. + * + * After removing the remote participant belonging to the supplied call, the call becomes a normal call in paused state. + * If one single remote participant is left alone together with the local user in the conference after the removal, then the conference is + * automatically transformed into a simple call in StreamsRunning state. + * The conference's resources are then automatically destroyed. + * + * In other words, unless linphone_core_leave_conference() is explicitly called, the last remote participant of a conference is automatically + * put in a simple call in running state. + * + * @return 0 if successful, -1 otherwise. + **/ + LINPHONE_PUBLIC int linphone_core_remove_from_conference(LinphoneCore *lc, LinphoneCall *call); /** * Indicates whether the local participant is part of a conference. * @param lc the linphone core