mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-27 16:59:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No video for conference as it is not yet supported by the application

Browse source 
Reorder pause when removing participants from conference
This commit is contained in:
Julien Wadel 2020-06-24 21:04:32 +02:00
parent 902ba80e00
commit 459689098d
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-app/src/app/cli/Cli.cpp
View file

@ -146,7 +146,9 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
}
qInfo() << QStringLiteral("Create conference with id: `%1`.").arg(id);
conference = core->createConferenceWithParams(core->createConferenceParams());
auto confParameters = core->createConferenceParams();
confParameters->enableVideo(false);// Video is not yet fully supported by the application in conference
conference = core->createConferenceWithParams(confParameters);
conference->setId(Utils::appStringToCoreString(id));
if (core->enterConference() == -1) {

16
linphone-app/src/components/conference/ConferenceAddModel.cpp
View file

@ -136,7 +136,9 @@ bool ConferenceHelperModel::ConferenceAddModel::removeFromConference (const QStr
void ConferenceHelperModel::ConferenceAddModel::update () {
shared_ptr<linphone::Conference> conference = mConferenceHelperModel->mCore->getConference();
if(!conference){
conference = mConferenceHelperModel->mCore->createConferenceWithParams(mConferenceHelperModel->mCore->createConferenceParams());
auto parameters = mConferenceHelperModel->mCore->createConferenceParams();
parameters->enableVideo(false);// Video is not yet fully supported by the application in conference
conference = mConferenceHelperModel->mCore->createConferenceWithParams(parameters);
}
auto currentCalls = CoreManager::getInstance()->getCore()->getCalls();
list<shared_ptr<linphone::Address>> allLinphoneAddresses;
@ -147,12 +149,14 @@ void ConferenceHelperModel::ConferenceAddModel::update () {
Q_CHECK_PTR(linphoneAddress);
allLinphoneAddresses.push_back(linphoneAddress);
}
if( allLinphoneAddresses.size() > 0)
if( allLinphoneAddresses.size() > 0){
auto parameters = CoreManager::getInstance()->getCore()->createCallParams(nullptr);
parameters->enableVideo(false);
conference->inviteParticipants(
allLinphoneAddresses,
CoreManager::getInstance()->getCore()->createCallParams(nullptr)
parameters
);
}
// 2) Put in pause and remove all calls that are not in the conference list
for(const auto &call : CoreManager::getInstance()->getCore()->getCalls()){
const std::string callAddress = call->getRemoteAddress()->asStringUriOnly();
@ -160,10 +164,10 @@ void ConferenceHelperModel::ConferenceAddModel::update () {
while(address != allLinphoneAddresses.end() && (*address)->asStringUriOnly() != callAddress)
++address;
if(address == allLinphoneAddresses.end()){// Not in conference list : put in pause and remove it from conference if it's the case
call->pause();
if( call->getParams()->getLocalConferenceMode() ){// Remove conference if it is not yet requested
CoreManager::getInstance()->getCore()->removeFromConference(call);
}
}else
call->pause();
}
}
}