Skip to content
Snippets Groups Projects
Commit b0ed927a authored by Sébastien Blin's avatar Sébastien Blin Committed by Adrien Béraud
Browse files

conference: getConferenceDetails now returns current VIDEO_SOURCE

Change-Id: Ic79a23038d1d6eef3d855c49b06e7bc8e3af4e75
parent 14fd2d52
No related branches found
No related tags found
No related merge requests found
...@@ -44,6 +44,7 @@ Conference::Conference() ...@@ -44,6 +44,7 @@ Conference::Conference()
, confState_(ACTIVE_ATTACHED) , confState_(ACTIVE_ATTACHED)
, participants_() , participants_()
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
, mediaInput_(Manager::instance().getVideoManager().videoDeviceMonitor.getMRLForDefaultDevice())
, videoMixer_(nullptr) , videoMixer_(nullptr)
#endif #endif
{ {
...@@ -159,6 +160,7 @@ void ...@@ -159,6 +160,7 @@ void
Conference::switchInput(const std::string& input) Conference::switchInput(const std::string& input)
{ {
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
mediaInput_ = input;
getVideoMixer()->switchInput(input); getVideoMixer()->switchInput(input);
#endif #endif
} }
......
...@@ -110,6 +110,7 @@ class Conference : public Recordable { ...@@ -110,6 +110,7 @@ class Conference : public Recordable {
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
std::shared_ptr<video::VideoMixer> getVideoMixer(); std::shared_ptr<video::VideoMixer> getVideoMixer();
std::string getVideoInput() const { return mediaInput_; }
#endif #endif
private: private:
...@@ -118,6 +119,7 @@ class Conference : public Recordable { ...@@ -118,6 +119,7 @@ class Conference : public Recordable {
ParticipantSet participants_; ParticipantSet participants_;
#ifdef ENABLE_VIDEO #ifdef ENABLE_VIDEO
std::string mediaInput_ {};
std::shared_ptr<video::VideoMixer> videoMixer_; std::shared_ptr<video::VideoMixer> videoMixer_;
#endif #endif
}; };
......
...@@ -2838,6 +2838,7 @@ Manager::getConferenceDetails( ...@@ -2838,6 +2838,7 @@ Manager::getConferenceDetails(
if (iter_conf != pimpl_->conferenceMap_.end()) { if (iter_conf != pimpl_->conferenceMap_.end()) {
conf_details["CONFID"] = confID; conf_details["CONFID"] = confID;
conf_details["CONF_STATE"] = iter_conf->second->getStateStr(); conf_details["CONF_STATE"] = iter_conf->second->getStateStr();
conf_details["VIDEO_SOURCE"] = iter_conf->second->getVideoInput();
} }
return conf_details; return conf_details;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment