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

merge : use remote audio video conf uri if any

Browse source
This commit is contained in:
Gaelle Braud 2024-05-30 15:03:15 +02:00
parent 8f48336d64
commit f45fc98c21
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Linphone/core/call/CallCore.cpp
View file

@ -243,9 +243,11 @@ void CallCore::setSelf(QSharedPointer<CallCore> me) {
setRemoteSas(remoteToken); setRemoteSas(remoteToken);
} }
setEncryption(encryption); setEncryption(encryption);
setIsSecured((encryption == LinphoneEnums::MediaEncryption::Zrtp && tokenVerified) || setIsSecured((encryption == LinphoneEnums::MediaEncryption::Zrtp &&
encryption == LinphoneEnums::MediaEncryption::Srtp || tokenVerified)); // ||
encryption == LinphoneEnums::MediaEncryption::Dtls); // encryption == LinphoneEnums::MediaEncryption::Srtp ||
// encryption == LinphoneEnums::MediaEncryption::Dtls);
// TODO : change this when api available in sdk
}); });
}); });
mCallModelConnection->makeConnectToCore(&CallCore::lSetSpeakerVolumeGain, [this](float gain) { mCallModelConnection->makeConnectToCore(&CallCore::lSetSpeakerVolumeGain, [this](float gain) {

9
Linphone/core/call/CallList.cpp
View file

@ -98,8 +98,15 @@ void CallList::setSelf(QSharedPointer<CallList> me) {
if (currentCall) enablingVideo = currentCall->getCurrentParams()->videoEnabled(); if (currentCall) enablingVideo = currentCall->getCurrentParams()->videoEnabled();
if (!conference) { if (!conference) {
auto parameters = core->createConferenceParams(conference); auto parameters = core->createConferenceParams(conference);
auto audioVideoConfFactoryUri =
core->getDefaultAccount()->getParams()->getAudioVideoConferenceFactoryAddress();
if (audioVideoConfFactoryUri) {
parameters->setConferenceFactoryAddress(audioVideoConfFactoryUri);
parameters->setSubject("Meeting");
} else {
parameters->setSubject("Local meeting");
}
parameters->enableVideo(enablingVideo); parameters->enableVideo(enablingVideo);
parameters->setSubject("Meeting");
conference = core->createConferenceWithParams(parameters); conference = core->createConferenceWithParams(parameters);
} }

2
Linphone/view/Item/Contact/ContactEdition.qml
View file

@ -273,7 +273,7 @@ RightPanelLayout {
Layout.bottomMargin: 100 * DefaultStyle.dp Layout.bottomMargin: 100 * DefaultStyle.dp
Layout.preferredWidth: 165 * DefaultStyle.dp Layout.preferredWidth: 165 * DefaultStyle.dp
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
enabled: mainItem.contact && mainItem.contact.core.givenName.length > 0 enabled: mainItem.contact && mainItem.contact.core.givenName.length > 0 && mainItem.contact.core.allAddresses.length > 0
text: mainItem.saveButtonText text: mainItem.saveButtonText
leftPadding: 20 * DefaultStyle.dp leftPadding: 20 * DefaultStyle.dp
rightPadding: 20 * DefaultStyle.dp rightPadding: 20 * DefaultStyle.dp

2
Linphone/view/Layout/Contact/ContactLayout.qml
View file

@ -126,7 +126,7 @@ ColumnLayout {
Layout.preferredHeight: childrenRect.height Layout.preferredHeight: childrenRect.height
Button { Button {
visible: mainItem.isConference visible: mainItem.isConference
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
text: qsTr("Rejoindre la réunion") text: qsTr("Rejoindre la réunion")
color: DefaultStyle.main2_200 color: DefaultStyle.main2_200
pressedColor: DefaultStyle.main2_400 pressedColor: DefaultStyle.main2_400