Commit aeec4941 authored by Andrea Gianarda's avatar Andrea Gianarda
Browse files

Add back setID and getID

parent 711db764
......@@ -151,11 +151,21 @@ public:
virtual void notifyStateChanged (LinphonePrivate::ConferenceInterface::State state) override;
void checkIfTerminated();
void setID(const char *conferenceID) {
mConferenceID = conferenceID;
}
const char *getID() const {
return mConferenceID.c_str();
}
protected:
void setConferenceId (const ConferenceId &conferenceId);
protected:
// Legacy member
std::string mConferenceID;
LinphoneConferenceStateChangedCb mStateChangedCb = nullptr;
// TODO: Delete mUserData
void *mUserData = nullptr;
......
......@@ -166,11 +166,6 @@ float linphone_conference_get_input_volume (const LinphoneConference *conference
return aci->getRecordVolume();
}
/*ConferenceId linphone_conference_get_conference_id(const LinphoneConference *conference) {
return MediaConference::Conference::toCpp(conference)->getConferenceId();
}
*/
int linphone_conference_get_participant_count (const LinphoneConference *conference) {
return MediaConference::Conference::toCpp(conference)->getParticipantCount();
}
......@@ -317,3 +312,10 @@ bool_t linphone_conference_params_local_participant_enabled(const LinphoneConfer
return ConferenceParams::toCpp(params)->localParticipantEnabled();
}
const char *linphone_conference_get_ID (const LinphoneConference *obj) {
return MediaConference::Conference::toCpp(obj)->getID();
}
void linphone_conference_set_ID(LinphoneConference *obj, const char *conferenceID) {
MediaConference::Conference::toCpp(obj)->setID(conferenceID);
}
......@@ -242,13 +242,7 @@ LINPHONE_PUBLIC int linphone_conference_get_participant_count(const LinphoneConf
LINPHONE_PUBLIC LinphoneParticipant *linphone_conference_get_me(const LinphoneConference *conference);
/**
* Get the conference id
* @param conference the conference
*/
//LINPHONE_PUBLIC ConferenceId linphone_conference_get_conference_id(const LinphoneConference *conference);
/**
* Terlnate conferenceGet the conference id
* Terminates conference
* @param conference The #LinphoneConference object. @notnil
* @return 0 if the termination is successful, -1 otherwise.
*/
......@@ -281,6 +275,19 @@ LINPHONE_PUBLIC void linphone_conference_preview_ogl_render(LinphoneConference *
* @param conf The #LinphoneConference object. @notnil
*/
LINPHONE_PUBLIC void linphone_conference_ogl_render(LinphoneConference *conf);
/**
* Get the conference id as string
* @param conf The #LinphoneConference object. @notnil
* @return the conference id @maybenil
*/
LINPHONE_PUBLIC const char *linphone_conference_get_ID(const LinphoneConference *conf);
/**
* Set the conference id as string
* @param conf The #LinphoneConference object. @notnil
* @param conference_id the conference id to set. @notnil
*/
LINPHONE_PUBLIC void linphone_conference_set_ID(LinphoneConference *conf, const char *conference_id);
/************ */
/* DEPRECATED */
......
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