mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 11:28:07 +00:00
Add debug info for speaking and mute events.
Limit video size on mosaic from linphonerc-factory (choice). Fix active speaking name display.
This commit is contained in:
parent
35c6f8f205
commit
24ebb44d98
4 changed files with 11 additions and 6 deletions
|
|
@ -9,4 +9,7 @@ record_aware=1
|
|||
|
||||
[sip]
|
||||
chat_messages_aggregation_delay=1000
|
||||
chat_messages_aggregation=1
|
||||
chat_messages_aggregation=1
|
||||
|
||||
[video]
|
||||
max_mosaic_size=vga
|
||||
|
|
@ -289,9 +289,10 @@ void ParticipantDeviceListModel::onParticipantDeviceIsSpeakingChanged(const std:
|
|||
|
||||
void ParticipantDeviceListModel::onParticipantDeviceSpeaking(){
|
||||
auto deviceModel = qobject_cast<ParticipantDeviceModel*>(sender());
|
||||
bool changed = (mActiveSpeakers.removeAll(deviceModel) > 0);
|
||||
bool changed = false;
|
||||
// Me should not be in the list.
|
||||
if( !deviceModel->isMe() && (mActiveSpeakers.size() == 0 || deviceModel->getIsSpeaking())) {// Ensure to have at least one last active speaker
|
||||
changed = mActiveSpeakers.removeAll(deviceModel) > 0;
|
||||
mActiveSpeakers.push_front(deviceModel);
|
||||
changed = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,16 +29,17 @@ ParticipantDeviceListener::ParticipantDeviceListener(QObject *parent) : QObject(
|
|||
|
||||
//--------------------------------------------------------------------
|
||||
void ParticipantDeviceListener::onIsSpeakingChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isSpeaking) {
|
||||
qInfo() << "onIsSpeakingChanged " << participantDevice->getAddress()->asString().c_str() << " " << isSpeaking;
|
||||
emit isSpeakingChanged(participantDevice, isSpeaking);
|
||||
}
|
||||
|
||||
void ParticipantDeviceListener::onIsMuted(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, bool isMutedVar) {
|
||||
qDebug() << "onIsMuted " << isMutedVar << " vs " << participantDevice->getIsMuted();
|
||||
qInfo() << "onIsMuted " << isMutedVar << " vs " << participantDevice->getIsMuted();
|
||||
emit isMuted(participantDevice, isMutedVar);
|
||||
}
|
||||
|
||||
void ParticipantDeviceListener::onStateChanged(const std::shared_ptr<linphone::ParticipantDevice> & participantDevice, linphone::ParticipantDeviceState state){
|
||||
qDebug() << "onStateChanged: " << participantDevice->getAddress()->asString().c_str() << " " << (int)state;
|
||||
qInfo() << "onStateChanged: " << participantDevice->getAddress()->asString().c_str() << " " << (int)state;
|
||||
emit stateChanged(participantDevice, state);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ Mosaic {
|
|||
property bool cameraEnabled: true
|
||||
property int participantCount: gridModel.count
|
||||
|
||||
// On grid view, we limit the quality if there are enough participants
|
||||
onParticipantCountChanged: participantCount > ConstantsCpp.maxMosaicParticipants ? SettingsModel.setLimitedMosaicQuality() : SettingsModel.setHighMosaicQuality()
|
||||
// On grid view, we limit the quality if there are enough participants// The vga mode has been activated from the factory rc
|
||||
//onParticipantCountChanged: participantCount > ConstantsCpp.maxMosaicParticipants ? SettingsModel.setLimitedMosaicQuality() : SettingsModel.setHighMosaicQuality()
|
||||
function clearAll(layoutMode){
|
||||
if( layoutMode != 2 && layoutMode != LinphoneEnums.ConferenceLayoutGrid){
|
||||
clear()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue