Commit a931f518 authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Andreas Traczyk
Browse files

conference: hold call

Use conference id to hold conference when other call became current

Change-Id: I3846661c73c936ed0a49777761900e08f6139ab9
parent fde8f56b
...@@ -590,14 +590,11 @@ NewCallModelPimpl::setCurrentCall(const std::string& callId) ...@@ -590,14 +590,11 @@ NewCallModelPimpl::setCurrentCall(const std::string& callId)
// to a current conference // to a current conference
if (it != pendingConferences_.end()) return; if (it != pendingConferences_.end()) return;
std::vector<std::string> filterCalls; std::vector<std::string> filterCalls;
if (dontHoldConferences_) { QStringList conferences = CallManager::instance().getConferenceList();
// Do not hold calls in a conference for (const auto& confId : conferences) {
QStringList conferences = CallManager::instance().getConferenceList(); QStringList callList = CallManager::instance().getParticipantList(confId);
for (const auto& confId : conferences) { foreach(const auto& callId, callList) {
QStringList callList = CallManager::instance().getParticipantList(confId); filterCalls.emplace_back(callId.toStdString());
foreach(const auto& callId, callList) {
filterCalls.emplace_back(callId.toStdString());
}
} }
} }
for (const auto& cid : Lrc::activeCalls()) { for (const auto& cid : Lrc::activeCalls()) {
...@@ -606,6 +603,12 @@ NewCallModelPimpl::setCurrentCall(const std::string& callId) ...@@ -606,6 +603,12 @@ NewCallModelPimpl::setCurrentCall(const std::string& callId)
CallManager::instance().hold(cid.c_str()); CallManager::instance().hold(cid.c_str());
} }
} }
if (dontHoldConferences_) {
return;
}
for (const auto& confId : conferences) {
CallManager::instance().holdConference(confId);
}
} }
void void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment