data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix on AS Preview

Browse source
This commit is contained in:
Julien Wadel 2024-04-03 16:19:36 +02:00
parent 37b5ac5292
commit 579cf7e773
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Linphone/core/camera/PreviewManager.cpp
View file

@ -66,11 +66,15 @@ QQuickFramebufferObject::Renderer *PreviewManager::subscribe(const CameraGui *ca
} else { } else {
lDebug() << log().arg("Resubscribing") << itCandidate->first->getQmlName(); lDebug() << log().arg("Resubscribing") << itCandidate->first->getQmlName();
} }
App::postModelBlock([&renderer, isFirst = (itCandidate == mCandidates.begin())]() { App::postModelBlock(
renderer = [&renderer, isFirst = (itCandidate == mCandidates.begin()), name = itCandidate->first->getQmlName()]() {
(QQuickFramebufferObject::Renderer *)CoreModel::getInstance()->getCore()->createNativePreviewWindowId(); renderer =
if (isFirst) CoreModel::getInstance()->getCore()->setNativePreviewWindowId(renderer); (QQuickFramebufferObject::Renderer *)CoreModel::getInstance()->getCore()->createNativePreviewWindowId();
}); if (isFirst) {
lDebug() << "[PreviewManager] " << name << " Set Native Preview Id";
CoreModel::getInstance()->getCore()->setNativePreviewWindowId(renderer);
}
});
itCandidate->second = renderer; itCandidate->second = renderer;
mCounterMutex.unlock(); mCounterMutex.unlock();
return renderer; return renderer;

2
Linphone/view/Item/Call/WaitingRoom.qml
View file

@ -29,7 +29,7 @@ RowLayout {
id: accounts id: accounts
} }
account: accounts.defaultAccount account: accounts.defaultAccount
previewEnabled: mainItem.cameraEnabled previewEnabled: true
} }
RowLayout { RowLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter

5
Linphone/view/Item/Contact/Sticker.qml
View file

@ -75,12 +75,13 @@ Item {
Loader{ Loader{
id: cameraLoader id: cameraLoader
anchors.fill: parent anchors.fill: parent
property bool reset: false
Timer{ Timer{
id: resetTimer id: resetTimer
interval: 1 interval: 1
onTriggered: {cameraLoader.active=false; cameraLoader.active=true;} onTriggered: {cameraLoader.reset=true; cameraLoader.reset=false;}
} }
active: mainItem.visible && mainItem.cameraEnabled active: mainItem.visible && mainItem.cameraEnabled && !mainItem.reset
onActiveChanged: console.log("("+mainItem.qmlName+") Camera active " + active) onActiveChanged: console.log("("+mainItem.qmlName+") Camera active " + active)
sourceComponent: cameraComponent sourceComponent: cameraComponent
} }

4
Linphone/view/Layout/Call/ActiveSpeakerLayout.qml
View file

@ -96,9 +96,9 @@ Item{
qmlName: 'M_'+index qmlName: 'M_'+index
participantDevice: modelData participantDevice: modelData
cameraEnabled: visible cameraEnabled: mainItem.call.core.cameraEnabled
Component.onCompleted: console.log(modelData.core.address) Component.onCompleted: console.log(modelData.core.address)
//previewEnabled: mainItem.call.core.cameraEnabled previewEnabled: index == 0
} }
} }
} }