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

fix: open correct preview when sharing

Browse source 
While in an audio only call, if a sharing is started, the preview could
open the camera instead.

Change-Id: I03d8a9df3385f856f65995a9bbaa1835949d8bdc
This commit is contained in:
Aline Gondim Santos 2022-09-21 11:39:34 -03:00
parent 4127200d8d
commit 87acb931b9
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/app/commoncomponents/LocalVideo.qml
View file

@ -37,7 +37,8 @@ VideoView {
} }
onVisibleChanged: { onVisibleChanged: {
const id = visible ? VideoDevices.getDefaultDevice() : "" rendererId = rendererId ? rendererId : VideoDevices.getDefaultDevice()
const id = visible ? rendererId : ""
startWithId(id) startWithId(id)
} }
} }

9
src/app/mainview/components/OngoingCallPage.qml
View file

@ -199,14 +199,6 @@ Rectangle {
visible: false visible: false
rendererId: "" rendererId: ""
Connections {
target: AvAdapter
function onCurrentRenderingDeviceIdChanged() {
previewRenderer.rendererId = AvAdapter.currentRenderingDeviceId
}
}
height: width * invAspectRatio height: width * invAspectRatio
width: Math.max(callPageMainRect.width / 5, JamiTheme.minimumPreviewWidth) width: Math.max(callPageMainRect.width / 5, JamiTheme.minimumPreviewWidth)
x: callPageMainRect.width - previewRenderer.width - previewMargin x: callPageMainRect.width - previewRenderer.width - previewMargin
@ -312,6 +304,7 @@ Rectangle {
isGrid) isGrid)
callOverlay.isVideoMuted = !AvAdapter.isCapturing() callOverlay.isVideoMuted = !AvAdapter.isCapturing()
callOverlay.sharingActive = AvAdapter.isSharing() callOverlay.sharingActive = AvAdapter.isSharing()
previewRenderer.rendererId = previewId
previewRenderer.visible = (AvAdapter.isSharing() || AvAdapter.isCapturing()) && participantsLayer.count == 0 previewRenderer.visible = (AvAdapter.isSharing() || AvAdapter.isCapturing()) && participantsLayer.count == 0
} }