Skip to content
Snippets Groups Projects
Commit ba2cd263 authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Andreas Traczyk
Browse files

newcallmodel: remove autoAnswer hack

Change-Id: Ia3264cee8f7649bb2e4e966a2c8d093947354834
parent 4d4fdb80
Branches
No related tags found
No related merge requests found
...@@ -325,8 +325,7 @@ NewCallModel::createCall(const QString& uri, bool isAudioOnly, VectorMapStringSt ...@@ -325,8 +325,7 @@ NewCallModel::createCall(const QString& uri, bool isAudioOnly, VectorMapStringSt
{MediaAttributeKey::LABEL, "audio_0"}}; {MediaAttributeKey::LABEL, "audio_0"}};
mediaList.push_back(mediaAttribute); mediaList.push_back(mediaAttribute);
if (!isAudioOnly) { if (!isAudioOnly) {
mediaAttribute[MediaAttributeKey::MEDIA_TYPE] mediaAttribute[MediaAttributeKey::MEDIA_TYPE] = MediaAttributeValue::VIDEO;
= MediaAttributeValue::VIDEO;
mediaAttribute[MediaAttributeKey::LABEL] = "video_0"; mediaAttribute[MediaAttributeKey::LABEL] = "video_0";
mediaList.push_back(mediaAttribute); mediaList.push_back(mediaAttribute);
} }
...@@ -413,8 +412,7 @@ NewCallModel::requestMediaChange(const QString& callId, const QString& mediaLabe ...@@ -413,8 +412,7 @@ NewCallModel::requestMediaChange(const QString& callId, const QString& mediaLabe
// mediaNegotiationStatus // mediaNegotiationStatus
if (found < callInfo->mediaList.size()) { if (found < callInfo->mediaList.size()) {
callInfo->mediaList[found][MediaAttributeKey::MUTED] callInfo->mediaList[found][MediaAttributeKey::MUTED]
= callInfo->mediaList[found][MediaAttributeKey::MUTED] == "true" ? "false" = callInfo->mediaList[found][MediaAttributeKey::MUTED] == "true" ? "false" : "true";
: "true";
if (mediaLabel.contains("audio_0")) { if (mediaLabel.contains("audio_0")) {
callInfo->audioMuted = !callInfo->audioMuted; callInfo->audioMuted = !callInfo->audioMuted;
} else if (mediaLabel.contains("video_0")) { } else if (mediaLabel.contains("video_0")) {
...@@ -1029,12 +1027,7 @@ NewCallModelPimpl::slotIncomingCallWithMedia(const QString& accountId, ...@@ -1029,12 +1027,7 @@ NewCallModelPimpl::slotIncomingCallWithMedia(const QString& accountId,
} }
emit linked.newIncomingCall(fromId, callId, displayname); emit linked.newIncomingCall(fromId, callId, displayname);
// HACK. BECAUSE THE DAEMON DOESN'T HANDLE THIS CASE!
if (!linked.owner.confProperties.isRendezVous && linked.owner.confProperties.autoAnswer) {
linked.accept(callId);
} }
} // namespace lrc
void void
NewCallModelPimpl::slotMediaChangeRequested(const QString& accountId, NewCallModelPimpl::slotMediaChangeRequested(const QString& accountId,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment