Skip to content
Snippets Groups Projects
Commit b9c7058b authored by Aline Gondim Santos's avatar Aline Gondim Santos Committed by Sébastien Blin
Browse files

calls: hide preview if camera stream and no device available

+ remove record video message if no video device available

Change-Id: I35c15709ecd5159dfa02ebcbf7aacd0bbf3d54e9
parent 4a25228e
No related branches found
No related tags found
No related merge requests found
...@@ -113,6 +113,7 @@ ColumnLayout { ...@@ -113,6 +113,7 @@ ColumnLayout {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
Layout.preferredWidth: JamiTheme.chatViewFooterButtonSize Layout.preferredWidth: JamiTheme.chatViewFooterButtonSize
Layout.preferredHeight: JamiTheme.chatViewFooterButtonSize Layout.preferredHeight: JamiTheme.chatViewFooterButtonSize
visible: VideoDevices.listSize !== 0
radius: JamiTheme.chatViewFooterButtonRadius radius: JamiTheme.chatViewFooterButtonRadius
preferredSize: JamiTheme.chatViewFooterButtonIconSize preferredSize: JamiTheme.chatViewFooterButtonIconSize
......
...@@ -179,24 +179,8 @@ Rectangle { ...@@ -179,24 +179,8 @@ Rectangle {
id: previewRenderer id: previewRenderer
lrcInstance: LRCInstance lrcInstance: LRCInstance
visible: !callOverlay.isAudioOnly && !callOverlay.isConferenceCall && !callOverlay.isVideoMuted && !callOverlay.isPaused visible: !callOverlay.isAudioOnly && !callOverlay.isConferenceCall && !callOverlay.isVideoMuted && !callOverlay.isPaused &&
((VideoDevices.listSize !== 0 && AvAdapter.currentRenderingDeviceType === Video.DeviceType.CAMERA) || AvAdapter.currentRenderingDeviceType !== Video.DeviceType.CAMERA )
Connections {
target: CallAdapter
function onPreviewVisibilityNeedToChange(visible) {
previewRenderer.visible = visible
}
}
Connections {
target: VideoDevices
// TODO: previewRenderer visible should be listening to a property
function onDeviceListChanged() {
previewRenderer.visible = VideoDevices.listSize !== 0
}
}
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
......
...@@ -90,7 +90,6 @@ Item { ...@@ -90,7 +90,6 @@ Item {
participantOverlays = participantOverlays.filter(part => !deletedUris.includes(part.uri)) participantOverlays = participantOverlays.filter(part => !deletedUris.includes(part.uri))
if (infos.length === 0) { // Return to normal call if (infos.length === 0) { // Return to normal call
previewRenderer.visible = !isAudioOnly && !isVideoMuted && !isConferenceCall && !isPaused
for (var part in participantOverlays) { for (var part in participantOverlays) {
if (participantOverlays[part]) { if (participantOverlays[part]) {
participantOverlays[part].destroy() participantOverlays[part].destroy()
...@@ -98,7 +97,6 @@ Item { ...@@ -98,7 +97,6 @@ Item {
} }
participantOverlays = [] participantOverlays = []
} else { } else {
previewRenderer.visible = false
for (var infoVariant in infos) { for (var infoVariant in infos) {
// Only create overlay for new participants // Only create overlay for new participants
if (!currentUris.includes(infos[infoVariant].uri)) { if (!currentUris.includes(infos[infoVariant].uri)) {
......
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