Skip to content
Snippets Groups Projects
Commit 87acb931 authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

fix: open correct preview when sharing

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

Change-Id: I03d8a9df3385f856f65995a9bbaa1835949d8bdc
parent 4127200d
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,8 @@ VideoView { ...@@ -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)
} }
} }
......
...@@ -199,14 +199,6 @@ Rectangle { ...@@ -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 { ...@@ -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
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment