mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Video conference : On pause, deactivate camera to display avatar instead of putting them on pause view.

Browse source 
Fix camera deactivation mode.
This commit is contained in:
Julien Wadel 2022-07-12 15:08:42 +02:00
parent da3eeadd82
commit 1b0b92fbc3
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linphone-app/ui/modules/Linphone/Camera/CameraItem.qml
View file

@ -22,8 +22,8 @@ Item {
property bool isFullscreen: false
property bool hideCamera: false
property bool isPaused: false
property bool deactivateCamera: true
property bool isVideoEnabled: deactivateCamera && (!callModel || callModel.videoEnabled)
property bool deactivateCamera: false
property bool isVideoEnabled: !deactivateCamera && (!callModel || callModel.videoEnabled)
&& (!container.currentDevice || callModel && (container.currentDevice
&& (container.currentDevice.videoEnabled || (container.currentDevice.isMe && callModel.cameraEnabled))))

2
linphone-app/ui/modules/Linphone/Sticker/Sticker.qml
View file

@ -19,7 +19,7 @@ import UtilsCpp 1.0
Item{
id: mainItem
property bool flipped : deactivateCamera && camera.isReady
property bool flipped : !deactivateCamera && camera.isReady
property bool showCustomButton: false

5
linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
View file

@ -54,7 +54,7 @@ Item {
Sticker{
id: cameraView
callModel: mainItem.callModel
deactivateCamera: mainItem.cameraEnabled && (!currentDevice || currentDevice.videoEnabled)
deactivateCamera: (callModel && callModel.pausedByUser) || !mainItem.cameraEnabled || (currentDevice && !currentDevice.videoEnabled)
isCameraFromDevice: false
isPreview: false
anchors.fill: parent
@ -96,8 +96,7 @@ Item {
anchors.fill: parent
anchors.margins: 3
deactivateCamera: index >=0 && ( (!modelData && mainItem.cameraEnabled) || modelData.videoEnabled)
//onCameraEnabledChanged: console.log(username +" => " +modelData.videoEnabled)
deactivateCamera: index <0 || (!modelData && !mainItem.cameraEnabled) || !modelData.videoEnabled || (callModel && callModel.pausedByUser)
currentDevice: modelData
callModel: mainItem.callModel
isCameraFromDevice: mainItem.callModel.isConference

4
linphone-app/ui/views/App/Calls/VideoConferenceGrid.qml
View file

@ -58,11 +58,11 @@ Mosaic {
id: cameraView
anchors.fill: parent
deactivateCamera: index >=0 && grid.cameraEnabled
deactivateCamera: index <0 || !grid.cameraEnabled || grid.callModel.pausedByUser
currentDevice: gridModel.participantDevices.getAt(index)
callModel: participantDevices.callModel
isCameraFromDevice: true
isPaused: grid.callModel.pausedByUser || avatarCell.currentDevice && avatarCell.currentDevice.isPaused
isPaused: avatarCell.currentDevice && avatarCell.currentDevice.isPaused
showCloseButton: false
showCustomButton: false
avatarStickerBackgroundColor: VideoConferenceStyle.container.avatar.stickerBackgroundColor

2
linphone-app/ui/views/App/Calls/WaitingRoom.qml
View file

@ -133,7 +133,7 @@ Rectangle {
height: cameraHeight
width : cameraWidth
deactivateCamera: mainItem.previewLoaderEnabled
deactivateCamera: !mainItem.previewLoaderEnabled
callModel: mainItem.callModel
conferenceInfoModel: mainItem.conferenceInfoModel
/*