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

Videoconference : Fix blinking on active speaker.

Browse source
This commit is contained in:
Julien Wadel 2022-06-09 14:17:13 +02:00
parent a04337c31e
commit a76695cb97
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/src/components/conference/ConferenceListener.cpp
View file

@ -82,7 +82,7 @@ void ConferenceListener::onParticipantDeviceMediaAvailabilityChanged(const std::
emit participantDeviceMediaAvailabilityChanged(participantDevice);
}
void ConferenceListener::onParticipantDeviceIsSpeakingChanged(const std::shared_ptr<linphone::Conference> & conference, const std::shared_ptr<const linphone::ParticipantDevice> & participantDevice, bool isSpeaking) {
qDebug() << "onParticipantDeviceIsSpeakingChanged: " << participantDevice->getAddress()->asString().c_str() << ". Speaking:" << isSpeaking;
//qDebug() << "onParticipantDeviceIsSpeakingChanged: " << participantDevice->getAddress()->asString().c_str() << ". Speaking:" << isSpeaking;
emit participantDeviceIsSpeakingChanged(participantDevice, isSpeaking);
}
void ConferenceListener::onStateChanged(const std::shared_ptr<linphone::Conference> & conference, linphone::Conference::State newState){

1
linphone-app/src/components/participant/ParticipantDeviceListener.cpp
View file

@ -29,7 +29,6 @@ ParticipantDeviceListener::ParticipantDeviceListener(QObject *parent) : QObject(
//--------------------------------------------------------------------
void ParticipantDeviceListener::onIsSpeakingChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isSpeaking) {
qDebug() << "onIsSpeakingChanged " << isSpeaking;
emit isSpeakingChanged(participantDevice, isSpeaking);
}

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

@ -33,7 +33,7 @@ Item {
property bool d : callModel && callModel.cameraEnabled
property bool isReady: cameraLoader.item && cameraLoader.item.isReady
onCurrentDeviceChanged: resetActive()
onCurrentDeviceChanged: {if(container.isCameraFromDevice) resetActive()}
function resetActive(){
resetTimer.resetActive()
}

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

@ -21,7 +21,7 @@ Item{
property alias isFullscreen: camera.isFullscreen
property alias isCameraFromDevice: camera.isCameraFromDevice
property bool showCloseButton: true
property bool showActiveSpeaker: true
property bool showActiveSpeakerOverlay: true
property color color : CameraViewStyle.outBackgroundColor
signal closeRequested()
@ -36,7 +36,7 @@ Item{
spread: 0.9
color: CameraViewStyle.border.color
cornerRadius: backgroundArea.radius + glowRadius
visible: mainItem.showActiveSpeaker && mainItem.currentDevice && mainItem.currentDevice.isSpeaking
visible: mainItem.showActiveSpeakerOverlay && mainItem.currentDevice && mainItem.currentDevice.isSpeaking
}
Rectangle {
id: backgroundArea

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

@ -46,7 +46,7 @@ Item {
anchors.rightMargin: isRightReducedLayout ? 10 : 140
isPaused: (callModel && callModel.pausedByUser) || (currentDevice && currentDevice.isPaused) //callModel.pausedByUser
showCloseButton: false
showActiveSpeaker: false // This is an active speaker. We don't need to show the indicator.
showActiveSpeakerOverlay: false // This is an active speaker. We don't need to show the indicator.
color: 'black'
}
ScrollableListView{