Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-uwp
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-client-uwp
Commits
121bdf32
Commit
121bdf32
authored
Sep 13, 2016
by
Nicolas Jager
Browse files
Options
Downloads
Patches
Plain Diff
call : tell to the daemon to hang up when the call is over
Change-Id: I31ca827d5632b9cc11798282e69b90754b4db685 Tuleap: #1015
parent
5750df0d
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CallsViewModel.cpp
+1
-0
1 addition, 0 deletions
CallsViewModel.cpp
RingD.cpp
+7
-0
7 additions, 0 deletions
RingD.cpp
RingD.h
+3
-1
3 additions, 1 deletion
RingD.h
with
11 additions
and
1 deletion
CallsViewModel.cpp
+
1
−
0
View file @
121bdf32
...
@@ -45,6 +45,7 @@ CallsViewModel::CallsViewModel()
...
@@ -45,6 +45,7 @@ CallsViewModel::CallsViewModel()
delete
call
;
delete
call
;
call
->
stateChange
(
""
,
code
);
call
->
stateChange
(
""
,
code
);
callStatusUpdated
(
call
);
// used ?
callStatusUpdated
(
call
);
// used ?
RingD
::
instance
->
hangUpCall
(
call
);
return
;
return
;
}
}
call
->
stateChange
(
state
,
code
);
call
->
stateChange
(
state
,
code
);
...
...
This diff is collapsed.
Click to expand it.
RingD.cpp
+
7
−
0
View file @
121bdf32
...
@@ -160,6 +160,12 @@ RingClientUWP::RingD::cancelOutGoingCall(Call^ call)
...
@@ -160,6 +160,12 @@ RingClientUWP::RingD::cancelOutGoingCall(Call^ call)
tasksList_
.
push
(
ref
new
RingD
::
Task
(
Request
::
CancelOutGoingCall
,
call
));
tasksList_
.
push
(
ref
new
RingD
::
Task
(
Request
::
CancelOutGoingCall
,
call
));
}
}
void
RingClientUWP
::
RingD
::
hangUpCall
(
Call
^
call
)
{
tasksList_
.
push
(
ref
new
RingD
::
Task
(
Request
::
HangUpCall
,
call
));
}
void
void
RingClientUWP
::
RingD
::
startDaemon
()
RingClientUWP
::
RingD
::
startDaemon
()
{
{
...
@@ -355,6 +361,7 @@ RingD::dequeueTasks()
...
@@ -355,6 +361,7 @@ RingD::dequeueTasks()
}
}
break
;
break
;
case
Request
::
CancelOutGoingCall
:
case
Request
::
CancelOutGoingCall
:
case
Request
::
HangUpCall
:
{
{
auto
callId
=
task
->
_call
->
callId
;
auto
callId
=
task
->
_call
->
callId
;
auto
callId2
=
Utils
::
toString
(
callId
);
auto
callId2
=
Utils
::
toString
(
callId
);
...
...
This diff is collapsed.
Click to expand it.
RingD.h
+
3
−
1
View file @
121bdf32
...
@@ -63,6 +63,7 @@ internal:
...
@@ -63,6 +63,7 @@ internal:
void
acceptIncommingCall
(
Call
^
call
);
void
acceptIncommingCall
(
Call
^
call
);
void
placeCall
(
Contact
^
contact
);
void
placeCall
(
Contact
^
contact
);
void
cancelOutGoingCall
(
Call
^
call
);
void
cancelOutGoingCall
(
Call
^
call
);
void
hangUpCall
(
Call
^
call
);
/* TODO : move members */
/* TODO : move members */
bool
hasConfig
;
bool
hasConfig
;
...
@@ -82,7 +83,8 @@ private:
...
@@ -82,7 +83,8 @@ private:
AddSIPAccount
,
AddSIPAccount
,
RefuseIncommingCall
,
RefuseIncommingCall
,
AcceptIncommingCall
,
AcceptIncommingCall
,
CancelOutGoingCall
CancelOutGoingCall
,
HangUpCall
};
};
ref
class
Task
ref
class
Task
{
{
...
...
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