lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-19 14:15:54 +02:00
Code Activity

calladapter: setActiveParticipant accepts URI

Browse source 
Change-Id: I7de33f90ff291979808b568183e57ab551210942
This commit is contained in:
Sébastien Blin 2020-09-25 16:40:33 -04:00
parent a737855426
commit c5f7584d0a
No known key found for this signature in database
GPG key ID: C894BB01EEB2A9A9
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/calladapter.cpp
View file

@ -548,28 +548,21 @@ CallAdapter::maximizeParticipant(const QString& uri, bool isActive)
const auto conversation = convModel->getConversationForUID(LRCInstance::getCurrentConvUid()); const auto conversation = convModel->getConversationForUID(LRCInstance::getCurrentConvUid());
const auto confId = conversation.confId; const auto confId = conversation.confId;
QString callId;
if (LRCInstance::getCurrentAccountInfo().profileInfo.uri != uri) {
const auto convInfo = LRCInstance::getConversationFromPeerUri(uri, accountId_);
if (!convInfo.uid.isEmpty()) {
callId = convInfo.callId;
}
}
try { try {
const auto call = callModel->getCall(confId); const auto call = callModel->getCall(confId);
switch (call.layout) { switch (call.layout) {
case lrc::api::call::Layout::GRID: case lrc::api::call::Layout::GRID:
callModel->setActiveParticipant(confId, callId); callModel->setActiveParticipant(confId, uri);
callModel->setConferenceLayout(confId, lrc::api::call::Layout::ONE_WITH_SMALL); callModel->setConferenceLayout(confId, lrc::api::call::Layout::ONE_WITH_SMALL);
break; break;
case lrc::api::call::Layout::ONE_WITH_SMALL: case lrc::api::call::Layout::ONE_WITH_SMALL:
callModel->setActiveParticipant(confId, callId); callModel->setActiveParticipant(confId, uri);
callModel->setConferenceLayout(confId, callModel->setConferenceLayout(confId,
isActive ? lrc::api::call::Layout::ONE isActive ? lrc::api::call::Layout::ONE
: lrc::api::call::Layout::ONE_WITH_SMALL); : lrc::api::call::Layout::ONE_WITH_SMALL);
break; break;
case lrc::api::call::Layout::ONE: case lrc::api::call::Layout::ONE:
callModel->setActiveParticipant(confId, callId); callModel->setActiveParticipant(confId, uri);
callModel->setConferenceLayout(confId, lrc::api::call::Layout::GRID); callModel->setConferenceLayout(confId, lrc::api::call::Layout::GRID);
break; break;
}; };