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
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
ac1c821c
Unverified
Commit
ac1c821c
authored
4 years ago
by
Aline Gondim Santos
Committed by
Sébastien Blin
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
plugin: toggle callmediahandler with callID
Change-Id: Ieba982cf9988b7837328fba81d597f23b068ea1f
parent
4dc5fcc3
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/newcallmodel.cpp
+0
-5
0 additions, 5 deletions
src/newcallmodel.cpp
src/pluginmodel.cpp
+20
-21
20 additions, 21 deletions
src/pluginmodel.cpp
with
20 additions
and
26 deletions
src/newcallmodel.cpp
+
0
−
5
View file @
ac1c821c
...
@@ -770,11 +770,6 @@ NewCallModelPimpl::slotCallStateChanged(const QString& callId, const QString& st
...
@@ -770,11 +770,6 @@ NewCallModelPimpl::slotCallStateChanged(const QString& callId, const QString& st
if
(
call
->
status
==
call
::
Status
::
ENDED
)
{
if
(
call
->
status
==
call
::
Status
::
ENDED
)
{
emit
linked
.
callEnded
(
callId
);
emit
linked
.
callEnded
(
callId
);
// NOTE: this line stops all mediaHandlers after the end of any call.
// The mediaHandler will be linked with the callID soon and each mediaHandler
// will be activated/deactivated with respect to the callID.
// This modification will allow to remove the next line.
PluginModel
().
toggleCallMediaHandler
(
""
);
}
else
if
(
call
->
status
==
call
::
Status
::
IN_PROGRESS
)
{
}
else
if
(
call
->
status
==
call
::
Status
::
IN_PROGRESS
)
{
if
(
previousStatus
==
call
::
Status
::
INCOMING_RINGING
if
(
previousStatus
==
call
::
Status
::
INCOMING_RINGING
||
previousStatus
==
call
::
Status
::
OUTGOING_RINGING
)
{
||
previousStatus
==
call
::
Status
::
OUTGOING_RINGING
)
{
...
...
This diff is collapsed.
Click to expand it.
src/pluginmodel.cpp
+
20
−
21
View file @
ac1c821c
/**
**************************************************************************
/**
* Copyright (C)
2018-
2020 Savoir-faire Linux Inc.
*
* Copyright (C) 2020 Savoir-faire Linux Inc.
* Author: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
*
* Author: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
*
*
*
* This library is free software; you can redistribute it and/or
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
*
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* version 2.1 of the License, or (at your option) any later version.
*
*
*
* This library is distributed in the hope that it will be useful,
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* Lesser General Public License for more details.
*
*
*
* You should have received a copy of the GNU General Public License
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* along with this program. If not, see <http://www.gnu.org/licenses/>.
**************************************************************************
*/
*/
#include
"api/pluginmodel.h"
#include
"api/pluginmodel.h"
// Std
// Std
...
@@ -136,10 +136,9 @@ void
...
@@ -136,10 +136,9 @@ void
PluginModel
::
toggleCallMediaHandler
(
const
QString
&
id
)
PluginModel
::
toggleCallMediaHandler
(
const
QString
&
id
)
{
{
MapStringString
toggleInfo
=
PluginManager
::
instance
().
getCallMediaHandlerStatus
();
MapStringString
toggleInfo
=
PluginManager
::
instance
().
getCallMediaHandlerStatus
();
if
(
toggleInfo
[
"state"
]
==
"true"
){
if
(
toggleInfo
[
"name"
]
==
id
){
PluginManager
::
instance
().
toggleCallMediaHandler
(
toggleInfo
[
"name"
],
false
);
PluginManager
::
instance
().
toggleCallMediaHandler
(
id
,
false
);
}
}
else
{
if
(
!
id
.
isEmpty
()
&&
id
!=
toggleInfo
[
"name"
])
{
PluginManager
::
instance
().
toggleCallMediaHandler
(
id
,
true
);
PluginManager
::
instance
().
toggleCallMediaHandler
(
id
,
true
);
}
}
}
}
...
...
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