mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a method to LinphoneCore to get a pointer to the internal conference object

Browse source
This commit is contained in:
François Grisez 2015-12-07 11:23:17 +01:00
parent b675b29777
commit 0a4fab5987
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/conference.cc
View file

@ -653,11 +653,11 @@ void TransportConference::transferStateChanged(LinphoneCore *lc, LinphoneCall *t
LinphoneConference *linphone_media_conference_new(LinphoneCore *core) {
return new MediaConference(core);
return (LinphoneConference *) new MediaConference(core);
}
LinphoneConference *linphone_transport_conference_new(LinphoneCore *core) {
return new TransportConference(core);
return (LinphoneConference *) new TransportConference(core);
}
void linphone_conference_free(LinphoneConference *obj) {

2
coreapi/conference.h
View file

@ -28,7 +28,7 @@
#include "linphonecore.h"
typedef void LinphoneConference;
typedef struct _LinphoneConference LinphoneConference;
typedef enum {
LinphoneConferenceClassMedia,

4
coreapi/linphonecore.c
View file

@ -7473,3 +7473,7 @@ int linphone_core_stop_conference_recording(LinphoneCore *lc) {
if(lc->conf_ctx) return linphone_conference_stop_recording(lc->conf_ctx);
return -1;
}
LinphoneConference *linphone_core_get_conference(LinphoneCore *lc) {
return lc->conf_ctx;
}

3
coreapi/linphonecore.h
View file

@ -3803,6 +3803,8 @@ LINPHONE_PUBLIC const char *linphone_core_get_user_certificates_path(LinphoneCor
*/
LINPHONE_PUBLIC LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri);
typedef struct _LinphoneConference LinphoneConference;
LINPHONE_PUBLIC int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call);
LINPHONE_PUBLIC int linphone_core_add_all_to_conference(LinphoneCore *lc);
/**
@ -3835,6 +3837,7 @@ LINPHONE_PUBLIC int linphone_core_terminate_conference(LinphoneCore *lc);
LINPHONE_PUBLIC int linphone_core_get_conference_size(LinphoneCore *lc);
LINPHONE_PUBLIC int linphone_core_start_conference_recording(LinphoneCore *lc, const char *path);
LINPHONE_PUBLIC int linphone_core_stop_conference_recording(LinphoneCore *lc);
LINPHONE_PUBLIC LinphoneConference *linphone_core_get_conference(LinphoneCore *lc);
/**
* Get the maximum number of simultaneous calls Linphone core can manage at a time. All new call above this limit are declined with a busy answer
* @ingroup initializing