Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review 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
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
3b97741a
Commit
3b97741a
authored
3 years ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
videoview: don't close the device when a video call is present
Gitlab:
#627
Change-Id: I5d892fc49b1605984481c810dcd43994258c845d
parent
538481a9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/commoncomponents/PhotoboothView.qml
+1
-1
1 addition, 1 deletion
src/commoncomponents/PhotoboothView.qml
src/mainview/components/OngoingCallPage.qml
+4
-12
4 additions, 12 deletions
src/mainview/components/OngoingCallPage.qml
with
5 additions
and
13 deletions
src/commoncomponents/PhotoboothView.qml
+
1
−
1
View file @
3b97741a
...
...
@@ -46,7 +46,7 @@ Item {
function
stopBooth
(){
if
(
!
AccountAdapter
.
hasVideoCall
())
{
VideoDevices
.
stopDevice
(
preview
.
deviceId
)
VideoDevices
.
stopDevice
(
preview
.
deviceId
)
}
isPreviewing
=
false
}
...
...
This diff is collapsed.
Click to expand it.
src/mainview/components/OngoingCallPage.qml
+
4
−
12
View file @
3b97741a
...
...
@@ -33,7 +33,7 @@ Rectangle {
id
:
root
property
var
accountPeerPair
:
[
""
,
""
]
property
variant
clickPos
:
"
1,1
"
property
string
clickPos
:
"
1,1
"
property
int
previewMargin
:
15
property
int
previewMarginYTop
:
previewMargin
+
42
property
int
previewMarginYBottom
:
previewMargin
+
84
...
...
@@ -44,14 +44,6 @@ Rectangle {
property
var
linkedWebview
:
null
property
string
callPreviewId
:
""
onCallPreviewIdChanged
:
{
testLog
(
"
\n\n
CHANGING CALLPREVIEWID
"
+
root
.
callPreviewId
+
"
"
+
previewRenderer
.
rendererId
+
"
\n\n
"
)
}
function
testLog
(
txt
)
{
console
.
log
(
this
,
txt
)
}
color
:
"
black
"
onAccountPeerPairChanged
:
{
...
...
@@ -194,7 +186,7 @@ Rectangle {
rendererId
:
root
.
callPreviewId
onVisibleChanged
:
{
if
(
!
visible
)
{
if
(
!
visible
&&
!
AccountAdapter
.
hasVideoCall
()
)
{
VideoDevices
.
stopDevice
(
rendererId
,
true
)
}
}
...
...
@@ -291,8 +283,8 @@ Rectangle {
function
onUpdateOverlay
(
isPaused
,
isAudioOnly
,
isAudioMuted
,
isVideoMuted
,
isSIP
,
isConferenceCall
,
isGrid
,
previewId
)
{
if
(
previewId
!=
""
)
{
if
(
root
.
callPreviewId
!=
previewId
)
if
(
previewId
!=
=
""
)
{
if
(
root
.
callPreviewId
!=
=
previewId
)
VideoDevices
.
stopDevice
(
root
.
callPreviewId
,
true
)
VideoDevices
.
startDevice
(
previewId
)
}
else
{
...
...
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