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
639fce5f
Unverified
Commit
639fce5f
authored
4 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
newcallmodel: setActiveParticipant accepts URI
Change-Id: Iff79da1f583cd57402f20d1ad631a6d5e5d918d9
parent
bbfb03b6
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/api/newcallmodel.h
+25
-17
25 additions, 17 deletions
src/api/newcallmodel.h
src/newcallmodel.cpp
+259
-195
259 additions, 195 deletions
src/newcallmodel.cpp
with
284 additions
and
212 deletions
src/api/newcallmodel.h
+
25
−
17
View file @
639fce5f
...
...
@@ -31,23 +31,26 @@ namespace Video {
class
Renderer
;
}
namespace
lrc
{
namespace
lrc
{
class
CallbacksHandler
;
class
NewCallModelPimpl
;
namespace
api
{
namespace
api
{
namespace
account
{
struct
Info
;
}
namespace
call
{
struct
Info
;
}
namespace
account
{
struct
Info
;
}
namespace
call
{
struct
Info
;
}
class
NewAccountModel
;
/**
* @brief Class that manages call informations.
*/
class
LIB_EXPORT
NewCallModel
:
public
QObject
{
* @brief Class that manages call informations.
*/
class
LIB_EXPORT
NewCallModel
:
public
QObject
{
Q_OBJECT
public:
...
...
@@ -55,11 +58,7 @@ public:
const
account
::
Info
&
owner
;
enum
class
Media
{
NONE
,
AUDIO
,
VIDEO
};
enum
class
Media
{
NONE
,
AUDIO
,
VIDEO
};
NewCallModel
(
const
account
::
Info
&
owner
,
const
CallbacksHandler
&
callbacksHandler
);
~
NewCallModel
();
...
...
@@ -188,7 +187,9 @@ public:
* @param audioOnly If the call is audio only
* @return id for a new call
*/
Q_INVOKABLE
QString
callAndAddParticipant
(
const
QString
uri
,
const
QString
&
callId
,
bool
audioOnly
);
Q_INVOKABLE
QString
callAndAddParticipant
(
const
QString
uri
,
const
QString
&
callId
,
bool
audioOnly
);
/**
* Not implemented yet
...
...
@@ -232,6 +233,8 @@ public:
/**
* Set the shown participant
* @param confId The call to change
* @param participant Use contact URI (or callId)
*/
void
setActiveParticipant
(
const
QString
&
confId
,
const
QString
&
participant
);
...
...
@@ -262,7 +265,9 @@ Q_SIGNALS:
* @param fromId the peer uri
* @param displayname
*/
void
newIncomingCall
(
const
QString
&
fromId
,
const
QString
&
callId
,
const
QString
&
displayname
)
const
;
void
newIncomingCall
(
const
QString
&
fromId
,
const
QString
&
callId
,
const
QString
&
displayname
)
const
;
/**
* Emitted when a call is added to a conference
* @param callId
...
...
@@ -277,7 +282,10 @@ Q_SIGNALS:
* @param oldCount
* @param urgentCount
*/
void
voiceMailNotify
(
const
QString
&
accountId
,
int
newCount
,
int
oldCount
,
int
urgentCount
)
const
;
void
voiceMailNotify
(
const
QString
&
accountId
,
int
newCount
,
int
oldCount
,
int
urgentCount
)
const
;
private
:
std
::
unique_ptr
<
NewCallModelPimpl
>
pimpl_
;
...
...
This diff is collapsed.
Click to expand it.
src/newcallmodel.cpp
+
259
−
195
View file @
639fce5f
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