Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-lrc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
20
Issues
20
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-lrc
Commits
ac1c821c
Unverified
Commit
ac1c821c
authored
Jul 08, 2020
by
Aline Gondim Santos
Committed by
Sébastien Blin
Aug 31, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
plugin: toggle callmediahandler with callID
Change-Id: Ieba982cf9988b7837328fba81d597f23b068ea1f
parent
4dc5fcc3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
26 deletions
+20
-26
src/newcallmodel.cpp
src/newcallmodel.cpp
+0
-5
src/pluginmodel.cpp
src/pluginmodel.cpp
+20
-21
No files found.
src/newcallmodel.cpp
View file @
ac1c821c
...
...
@@ -770,11 +770,6 @@ NewCallModelPimpl::slotCallStateChanged(const QString& callId, const QString& st
if
(
call
->
status
==
call
::
Status
::
ENDED
)
{
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
)
{
if
(
previousStatus
==
call
::
Status
::
INCOMING_RINGING
||
previousStatus
==
call
::
Status
::
OUTGOING_RINGING
)
{
...
...
src/pluginmodel.cpp
View file @
ac1c821c
/**
**************************************************************************
* Copyright (C) 20
18-2020 Savoir-faire Linux Inc. *
* Author: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
*
*
*
* This library is free software; you can redistribute it and/or
*
* modify it under the terms of the GNU Lesser General Public
*
* License as published by the Free Software Foundation; either
*
* 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,
*
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
*
* Lesser General Public License for more details.
*
*
*
* You should have received a copy of the GNU General Public License
*
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*
**************************************************************************
/
/**
* Copyright (C) 20
20 Savoir-faire Linux Inc.
* Author: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* 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,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "api/pluginmodel.h"
// Std
...
...
@@ -136,10 +136,9 @@ void
PluginModel
::
toggleCallMediaHandler
(
const
QString
&
id
)
{
MapStringString
toggleInfo
=
PluginManager
::
instance
().
getCallMediaHandlerStatus
();
if
(
toggleInfo
[
"state"
]
==
"true"
){
PluginManager
::
instance
().
toggleCallMediaHandler
(
toggleInfo
[
"name"
],
false
);
}
if
(
!
id
.
isEmpty
()
&&
id
!=
toggleInfo
[
"name"
])
{
if
(
toggleInfo
[
"name"
]
==
id
){
PluginManager
::
instance
().
toggleCallMediaHandler
(
id
,
false
);
}
else
{
PluginManager
::
instance
().
toggleCallMediaHandler
(
id
,
true
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment