lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 06:45:45 +02:00
Code Activity

videoview: don't close the device when a video call is present

Browse source 
Gitlab: #627
Change-Id: I5d892fc49b1605984481c810dcd43994258c845d
This commit is contained in:
Andreas Traczyk 2021-12-20 15:05:17 -05:00
parent 538481a9f8
commit 3b97741afb
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commoncomponents/PhotoboothView.qml
View file

@ -46,7 +46,7 @@ Item {
function stopBooth(){
if (!AccountAdapter.hasVideoCall()) {
VideoDevices.stopDevice(preview.deviceId)
VideoDevices.stopDevice(preview.deviceId)
}
isPreviewing = false
}

16
src/mainview/components/OngoingCallPage.qml
View file

@ -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 {