From 6c481ccad5b8242afe9e2bae92a4c4db0546574c Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 22 Sep 2022 10:15:49 +0200 Subject: [PATCH] Activate video on transfer --- .../src/components/conference/ConferenceAddModel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linphone-app/src/components/conference/ConferenceAddModel.cpp b/linphone-app/src/components/conference/ConferenceAddModel.cpp index eb1e04a73..488e3032c 100644 --- a/linphone-app/src/components/conference/ConferenceAddModel.cpp +++ b/linphone-app/src/components/conference/ConferenceAddModel.cpp @@ -23,6 +23,7 @@ #include "components/core/CoreManager.hpp" #include "components/chat-room/ChatRoomModel.hpp" #include "components/sip-addresses/SipAddressesModel.hpp" +#include "components/settings/SettingsModel.hpp" #include "utils/Utils.hpp" #include "ConferenceAddModel.hpp" @@ -147,11 +148,12 @@ bool ConferenceHelperModel::ConferenceAddModel::removeFromConference (const QStr void ConferenceHelperModel::ConferenceAddModel::update () { shared_ptr conference = mConferenceHelperModel->mCore->getConference(); - bool enablingVideo = false;// Video is not yet fully supported by the application in conference + bool enablingVideo = CoreManager::getInstance()->getSettingsModel()->getVideoConferenceEnabled();// Video is not yet fully supported by the application in conference if(!conference){ auto parameters = mConferenceHelperModel->mCore->createConferenceParams(conference); parameters->enableVideo(enablingVideo); - parameters->setConferenceFactoryAddress(nullptr);// Do a local conference + if(!enablingVideo) + parameters->setConferenceFactoryAddress(nullptr);// Do a local conference conference = mConferenceHelperModel->mCore->createConferenceWithParams(parameters); } auto currentCalls = CoreManager::getInstance()->getCore()->getCalls();