Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
ba2cd263
Commit
ba2cd263
authored
Jul 29, 2021
by
Ming Rui Zhang
Committed by
Andreas Traczyk
Jul 29, 2021
Browse files
Options
Downloads
Patches
Plain Diff
newcallmodel: remove autoAnswer hack
Change-Id: Ia3264cee8f7649bb2e4e966a2c8d093947354834
parent
4d4fdb80
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/newcallmodel.cpp
+9
-16
9 additions, 16 deletions
src/newcallmodel.cpp
with
9 additions
and
16 deletions
src/newcallmodel.cpp
+
9
−
16
View file @
ba2cd263
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment