From b0ed927a31fc8b984cd8e46d341d5e9dad35fd63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Fri, 15 Nov 2019 10:42:51 -0500
Subject: [PATCH] conference: getConferenceDetails now returns current
VIDEO_SOURCE
Change-Id: Ic79a23038d1d6eef3d855c49b06e7bc8e3af4e75
---
src/conference.cpp | 2 ++
src/conference.h | 2 ++
src/manager.cpp | 1 +
3 files changed, 5 insertions(+)
diff --git a/src/conference.cpp b/src/conference.cpp
index e9549effe7..fbd62643c5 100644
--- a/src/conference.cpp
+++ b/src/conference.cpp
@@ -44,6 +44,7 @@ Conference::Conference()
, confState_(ACTIVE_ATTACHED)
, participants_()
#ifdef ENABLE_VIDEO
+ , mediaInput_(Manager::instance().getVideoManager().videoDeviceMonitor.getMRLForDefaultDevice())
, videoMixer_(nullptr)
#endif
{
@@ -159,6 +160,7 @@ void
Conference::switchInput(const std::string& input)
{
#ifdef ENABLE_VIDEO
+ mediaInput_ = input;
getVideoMixer()->switchInput(input);
#endif
}
diff --git a/src/conference.h b/src/conference.h
index caebbf7fe5..29c379f700 100644
--- a/src/conference.h
+++ b/src/conference.h
@@ -110,6 +110,7 @@ class Conference : public Recordable {
#ifdef ENABLE_VIDEO
std::shared_ptr<video::VideoMixer> getVideoMixer();
+ std::string getVideoInput() const { return mediaInput_; }
#endif
private:
@@ -118,6 +119,7 @@ class Conference : public Recordable {
ParticipantSet participants_;
#ifdef ENABLE_VIDEO
+ std::string mediaInput_ {};
std::shared_ptr<video::VideoMixer> videoMixer_;
#endif
};
diff --git a/src/manager.cpp b/src/manager.cpp
index 208deb6174..76ea63b6a0 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -2838,6 +2838,7 @@ Manager::getConferenceDetails(
if (iter_conf != pimpl_->conferenceMap_.end()) {
conf_details["CONFID"] = confID;
conf_details["CONF_STATE"] = iter_conf->second->getStateStr();
+ conf_details["VIDEO_SOURCE"] = iter_conf->second->getVideoInput();
}
return conf_details;
--
GitLab