Commit c526791c authored by François Grisez's avatar François Grisez

Conference implementation based on focus server

parent 9d650f59
This diff is collapsed.
......@@ -28,16 +28,10 @@
#include "linphonecore.h"
typedef enum _LinphoneConferenceType {
LinphoneConferenceTypeUnknown = 0,
LinphoneConferenceTypeMedia = 1,
LinphoneConferenceTypeTransport = 2
} LinphoneConferenceType;
typedef void LinphoneConference;
LinphoneConference *linphone_conference_make(LinphoneCore *core, LinphoneConferenceType type);
LinphoneConference *linphone_media_conference_new(LinphoneCore *core);
LinphoneConference *linphone_transport_conference_new(LinphoneCore *core);
void linphone_conference_free(LinphoneConference *obj);
int linphone_conference_add_call(LinphoneConference *obj, LinphoneCall *call);
......@@ -53,7 +47,6 @@ int linphone_conference_mute_microphone(LinphoneConference *obj, bool_t val);
bool_t linphone_conference_microphone_is_muted(const LinphoneConference *obj);
float linphone_conference_get_input_volume(const LinphoneConference *obj);
int linphone_conference_get_participant_count(const LinphoneConference *obj);
LinphoneConferenceType linphone_conference_get_method(const LinphoneConference *obj);
int linphone_conference_start_recording(LinphoneConference *obj, const char *path);
int linphone_conference_stop_recording(LinphoneConference *obj);
......
......@@ -7399,18 +7399,16 @@ const char *linphone_stream_type_to_string(const LinphoneStreamType type) {
int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call) {
const char *conf_method_name;
LinphoneConferenceType method;
if(lc->conf_ctx == NULL) {
conf_method_name = lp_config_get_string(lc->config, "misc", "conference_method", "media");
if(strcasecmp(conf_method_name, "media") == 0) {
method = LinphoneConferenceTypeMedia;
lc->conf_ctx = linphone_media_conference_new(lc);
} else if(strcasecmp(conf_method_name, "transport") == 0) {
method = LinphoneConferenceTypeTransport;
lc->conf_ctx = linphone_transport_conference_new(lc);
} else {
ms_error("'%s' is not a valid conference method", conf_method_name);
return -1;
}
lc->conf_ctx = linphone_conference_make(lc, method);
}
return linphone_conference_add_call(lc->conf_ctx, call);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment