Commit 18fde493 authored by François Grisez's avatar François Grisez

Rename the two implementations of the Conference interface

parent 20831d92
This diff is collapsed.
......@@ -31,12 +31,12 @@
typedef struct _LinphoneConference LinphoneConference;
typedef enum {
LinphoneConferenceClassMedia,
LinphoneConferenceClassTransport
LinphoneConferenceClassLocal,
LinphoneConferenceClassRemote
} LinphoneConferenceClass;
LinphoneConference *linphone_media_conference_new(LinphoneCore *core);
LinphoneConference *linphone_transport_conference_new(LinphoneCore *core);
LinphoneConference *linphone_local_conference_new(LinphoneCore *core);
LinphoneConference *linphone_remote_conference_new(LinphoneCore *core);
void linphone_conference_free(LinphoneConference *obj);
int linphone_conference_add_call(LinphoneConference *obj, LinphoneCall *call);
......
......@@ -7400,11 +7400,11 @@ 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;
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) {
lc->conf_ctx = linphone_media_conference_new(lc);
} else if(strcasecmp(conf_method_name, "transport") == 0) {
lc->conf_ctx = linphone_transport_conference_new(lc);
conf_method_name = lp_config_get_string(lc->config, "misc", "conference_type", "local");
if(strcasecmp(conf_method_name, "local") == 0) {
lc->conf_ctx = linphone_local_conference_new(lc);
} else if(strcasecmp(conf_method_name, "remote") == 0) {
lc->conf_ctx = linphone_remote_conference_new(lc);
} else {
ms_error("'%s' is not a valid conference method", conf_method_name);
return -1;
......@@ -7420,7 +7420,7 @@ int linphone_core_add_all_to_conference(LinphoneCore *lc) {
calls=calls->next;
linphone_core_add_to_conference(lc, call);
}
if(lc->conf_ctx && linphone_conference_check_class(lc->conf_ctx, LinphoneConferenceClassMedia)) {
if(lc->conf_ctx && linphone_conference_check_class(lc->conf_ctx, LinphoneConferenceClassLocal)) {
linphone_core_enter_conference(lc);
}
return 0;
......
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