Skip to content
Snippets Groups Projects
Commit 56401d41 authored by Andreas Hatziiliou's avatar Andreas Hatziiliou
Browse files

swarms: add camera MRL for host

When starting a swarm call with video, the MRL for the host
wasn't set. Thus, the camera button would appear muted and
starting/stopping video would have unintended behavior.

GitLab: #1869

Change-Id: I6ee2204d5b49b856bfc72fb560f6623f9c7c874f
parent 7fdd2f57
Branches
Tags
No related merge requests found
......@@ -231,7 +231,9 @@ public Q_SLOTS:
* Listen from CallbacksHandler when a conference is created.
* @param callId
*/
void slotConferenceCreated(const QString& accountId, const QString& conversationId, const QString& callId);
void slotConferenceCreated(const QString& accountId,
const QString& conversationId,
const QString& callId);
void slotConferenceChanged(const QString& accountId,
const QString& callId,
const QString& state);
......@@ -372,11 +374,14 @@ initializeMediaList(VectorMapStringString& mediaList, bool audioOnly)
{MediaAttributeKey::LABEL, "audio_0"}});
if (audioOnly)
return;
const auto defaultCamera = VideoManager::instance().getDefaultDevice();
QString cameraMRL = "camera://" + defaultCamera;
mediaList.push_back({{MediaAttributeKey::MEDIA_TYPE, MediaAttributeValue::VIDEO},
{MediaAttributeKey::ENABLED, TRUE_STR},
{MediaAttributeKey::MUTED, FALSE_STR},
{MediaAttributeKey::SOURCE, ""},
{MediaAttributeKey::SOURCE, cameraMRL},
{MediaAttributeKey::LABEL, "video_0"}});
return;
}
QString
......@@ -397,7 +402,8 @@ CallModel::createCall(const QString& uri, bool isAudioOnly, VectorMapStringStrin
pimpl_->waitForConference_ = uri;
return {};
}
qWarning() << "no call placed between (account: " << owner.id << ", contact: " << uri << ")";
qWarning() << "no call placed between (account: " << owner.id << ", contact: " << uri
<< ")";
return "";
}
......@@ -1708,7 +1714,9 @@ CallModel::hasCall(const QString& callId) const
}
void
CallModelPimpl::slotConferenceCreated(const QString& accountId, const QString& conversationId, const QString& confId)
CallModelPimpl::slotConferenceCreated(const QString& accountId,
const QString& conversationId,
const QString& confId)
{
if (accountId != linked.owner.id)
return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment