Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
e834b879
Commit
e834b879
authored
Sep 18, 2017
by
Sylvain Berfini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prepared audio mute button in incall view
parent
e29c3689
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
2 deletions
+19
-2
CallModel.cpp
src/components/call/CallModel.cpp
+12
-0
CallModel.hpp
src/components/call/CallModel.hpp
+5
-0
Incall.qml
ui/views/App/Calls/Incall.qml
+2
-2
No files found.
src/components/call/CallModel.cpp
View file @
e834b879
...
...
@@ -444,6 +444,18 @@ void CallModel::setMicroMuted (bool status) {
// -----------------------------------------------------------------------------
bool
CallModel
::
getAudioMuted
()
const
{
// TODO
return
false
;
}
void
CallModel
::
setAudioMuted
(
bool
status
)
{
// TODO
emit
audioMutedChanged
(
status
);
}
// -----------------------------------------------------------------------------
bool
CallModel
::
getPausedByUser
()
const
{
return
mPausedByUser
;
}
...
...
src/components/call/CallModel.hpp
View file @
e834b879
...
...
@@ -45,6 +45,7 @@ class CallModel : public QObject {
Q_PROPERTY
(
float
speakerVu
READ
getSpeakerVu
CONSTANT
);
Q_PROPERTY
(
bool
microMuted
READ
getMicroMuted
WRITE
setMicroMuted
NOTIFY
microMutedChanged
);
Q_PROPERTY
(
bool
audioMuted
READ
getAudioMuted
WRITE
setAudioMuted
NOTIFY
audioMutedChanged
);
Q_PROPERTY
(
bool
pausedByUser
READ
getPausedByUser
WRITE
setPausedByUser
NOTIFY
statusChanged
);
Q_PROPERTY
(
bool
videoEnabled
READ
getVideoEnabled
WRITE
setVideoEnabled
NOTIFY
statusChanged
);
...
...
@@ -126,6 +127,7 @@ signals:
void
callErrorChanged
(
const
QString
&
callError
);
void
isInConferenceChanged
(
bool
status
);
void
microMutedChanged
(
bool
status
);
void
audioMutedChanged
(
bool
status
);
void
recordingChanged
(
bool
status
);
void
statsUpdated
();
void
statusChanged
(
CallStatus
status
);
...
...
@@ -162,6 +164,9 @@ private:
bool
getMicroMuted
()
const
;
void
setMicroMuted
(
bool
status
);
bool
getAudioMuted
()
const
;
void
setAudioMuted
(
bool
status
);
bool
getPausedByUser
()
const
;
void
setPausedByUser
(
bool
status
);
...
...
ui/views/App/Calls/Incall.qml
View file @
e834b879
...
...
@@ -328,11 +328,11 @@ Rectangle {
ActionSwitch
{
id
:
speaker
enabled
:
true
enabled
:
!
call
.
audioMuted
icon
:
'
speaker
'
iconSize
:
CallStyle
.
actionArea
.
iconSize
onClicked
:
console
.
log
(
'
TODO
'
)
onClicked
:
incall
.
call
.
audioMuted
=
enabled
}
}
...
...
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