From f5e89876184a4c241c1f7975ce664ee74c7a8829 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Tue, 26 Jul 2022 11:01:27 +0200
Subject: [PATCH] Fix frozen camera preview

---
 linphone-app/ui/views/App/Calls/CallsWindow.js        |  2 ++
 .../ui/views/App/Calls/IncallActiveSpeaker.qml        | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/linphone-app/ui/views/App/Calls/CallsWindow.js b/linphone-app/ui/views/App/Calls/CallsWindow.js
index 1cdce1ef4..6562e15e3 100644
--- a/linphone-app/ui/views/App/Calls/CallsWindow.js
+++ b/linphone-app/ui/views/App/Calls/CallsWindow.js
@@ -66,6 +66,7 @@ function openWaitingRoom(model){
 // -----------------------------------------------------------------------------
 // Used to get Component based from Call Status
 function getContent (call, conferenceInfoModel) {
+	console.log("Changing contents")
 	if (call == null) {
 		if(conferenceInfoModel)
 			return waitingRoom
@@ -83,6 +84,7 @@ function getContent (call, conferenceInfoModel) {
 	}
 	window.conferenceInfoModel = call.conferenceInfoModel;
 	if (status === CallModel.CallStatusOutgoing || status === CallModel.CallStatusEnded) {
+		console.log("Is conference ? "+call.isConference)
 		return waitingRoom
 	}
 	
diff --git a/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml
index da67df360..c68b2976f 100644
--- a/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml
+++ b/linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml
@@ -82,9 +82,9 @@ Item {
 		model: mainItem.callModel.isConference 
 					? mainItem.participantDevices 
 					: mainItem.callModel.videoEnabled
-							? [{modelData:null}]
+							? [{videoEnabled:true, isPreview:true}]
 							: []
-		onModelChanged: console.log(mainItem.callModel.videoEnabled + "/" +mainItem.callModel.cameraEnabled + " / " +count)
+		onModelChanged: console.log( mainItem.callModel.isConference+"/"+mainItem.callModel.videoEnabled + "/" +mainItem.callModel.cameraEnabled + " / " +count)
 		spacing: 15
 		verticalLayoutDirection: ItemView.BottomToTop
 		delegate:Item{
@@ -95,10 +95,9 @@ Item {
 					id: miniView
 					anchors.fill: parent
 					anchors.margins: 3
-					
-					deactivateCamera: index <0 || (!modelData && !mainItem.cameraEnabled) || !modelData.videoEnabled || (callModel && callModel.pausedByUser)
-					currentDevice: modelData
-					callModel: mainItem.callModel
+					deactivateCamera: index <0 || !mainItem.cameraEnabled || (!modelData.videoEnabled) || (callModel && callModel.pausedByUser)
+					currentDevice: modelData.isPreview ? null : modelData
+					callModel: modelData.isPreview ? null : mainItem.callModel
 					isCameraFromDevice:  mainItem.callModel.isConference
 					isPaused: currentDevice && currentDevice.isPaused
 					showCloseButton: false