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-client-windows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
2de13a70
Commit
2de13a70
authored
Apr 06, 2020
by
Ming Rui Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
videoview: fix the issue where avatar does not hide when call is on hold
Change-Id: Ia9b6909ce2f41906127cf5edb0c785bf1e6c9fea
parent
5186b079
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
10 deletions
+5
-10
src/callaudioonlyavataroverlay.cpp
src/callaudioonlyavataroverlay.cpp
+2
-2
src/callaudioonlyavataroverlay.h
src/callaudioonlyavataroverlay.h
+1
-1
src/videooverlay.cpp
src/videooverlay.cpp
+0
-4
src/videooverlay.h
src/videooverlay.h
+0
-1
src/videoview.cpp
src/videoview.cpp
+2
-2
No files found.
src/callaudioonlyavataroverlay.cpp
View file @
2de13a70
...
...
@@ -56,7 +56,7 @@ CallAudioOnlyAvatarOverlay::writeAvatarOverlay(const lrc::api::conversation::Inf
}
void
CallAudioOnlyAvatarOverlay
::
respondToPauseLabel
(
bool
pauseButtonDisplay
ed
)
CallAudioOnlyAvatarOverlay
::
respondToPauseLabel
(
bool
isPaus
ed
)
{
setAvatarVisible
(
!
pauseButtonDisplay
ed
);
setAvatarVisible
(
!
isPaus
ed
);
}
src/callaudioonlyavataroverlay.h
View file @
2de13a70
...
...
@@ -38,7 +38,7 @@ public:
~
CallAudioOnlyAvatarOverlay
();
void
setAvatarVisible
(
bool
visible
);
void
writeAvatarOverlay
(
const
lrc
::
api
::
conversation
::
Info
&
convInfo
);
void
respondToPauseLabel
(
bool
pauseButtonDisplay
ed
);
void
respondToPauseLabel
(
bool
isPaus
ed
);
private:
Ui
::
CallAudioOnlyAvatarOverlay
*
ui
;
...
...
src/videooverlay.cpp
View file @
2de13a70
...
...
@@ -191,19 +191,15 @@ VideoOverlay::on_chatButton_toggled(bool checked)
void
VideoOverlay
::
on_holdButton_toggled
(
bool
checked
)
{
// why is 'checked' unused?
Q_UNUSED
(
checked
);
auto
callId
=
LRCInstance
::
getCallIdForConversationUid
(
convUid_
,
accountId_
);
if
(
callId
.
isEmpty
()
||
!
LRCInstance
::
getCurrentCallModel
()
->
hasCall
(
callId
))
{
return
;
}
auto
callModel
=
LRCInstance
::
getCurrentCallModel
();
bool
onHold
{
false
};
if
(
callModel
->
hasCall
(
callId
))
{
callModel
->
togglePause
(
callId
);
onHold
=
callModel
->
getCall
(
callId
).
status
==
lrc
::
api
::
call
::
Status
::
PAUSED
;
}
ui
->
onHoldLabel
->
setVisible
(
onHold
);
}
void
...
...
src/videooverlay.h
View file @
2de13a70
...
...
@@ -55,7 +55,6 @@ public:
signals:
void
setChatVisibility
(
bool
visible
);
void
holdStateChanged
(
bool
state
);
void
videoMuteStateChanged
(
bool
state
);
private:
...
...
src/videoview.cpp
View file @
2de13a70
...
...
@@ -304,8 +304,9 @@ VideoView::updateCall(const QString& convUid,
}
overlay_
->
updateCall
(
convInfo
);
auto
isPaused
=
call
->
status
==
lrc
::
api
::
call
::
Status
::
PAUSED
;
// TODO(atraczyk): this should be part of the overlay
audioOnlyAvatar_
->
setAvatarVisible
(
call
->
isAudioOnly
);
audioOnlyAvatar_
->
setAvatarVisible
(
call
->
isAudioOnly
&&
!
isPaused
);
if
(
call
->
isAudioOnly
)
{
audioOnlyAvatar_
->
writeAvatarOverlay
(
convInfo
);
}
...
...
@@ -315,7 +316,6 @@ VideoView::updateCall(const QString& convUid,
// distant
ui
->
distantWidget
->
setRendererId
(
call
->
id
);
auto
isPaused
=
call
->
status
==
lrc
::
api
::
call
::
Status
::
PAUSED
;
ui
->
distantWidget
->
setVisible
(
!
isPaused
);
}
...
...
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