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

fix #LINQT-1555 grid layout conf

Browse source
This commit is contained in:
Gaelle Braud 2025-01-15 17:32:21 +01:00 committed by Gaëlle Braud
parent ae82cd0ea6
commit 53a6f6768d
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -278,12 +278,8 @@ void CallCore::setSelf(QSharedPointer<CallCore> me) {
const std::string &message) { const std::string &message) {
double speakerVolume = mSpeakerVolumeGain; double speakerVolume = mSpeakerVolumeGain;
double micVolumeGain = mMicrophoneVolumeGain; double micVolumeGain = mMicrophoneVolumeGain;
bool isConf = false; bool isConf = call && call->getConference() != nullptr;
if (state == linphone::Call::State::Connected) { if (state == linphone::Call::State::StreamsRunning) {
// The conference object is not ready until the StreamRunning status,
// so it can't be used at this point
isConf = call->getConference() != nullptr;
} else if (state == linphone::Call::State::StreamsRunning) {
speakerVolume = mCallModel->getSpeakerVolumeGain(); speakerVolume = mCallModel->getSpeakerVolumeGain();
if (speakerVolume < 0) { if (speakerVolume < 0) {
speakerVolume = CoreModel::getInstance()->getCore()->getPlaybackGainDb(); speakerVolume = CoreModel::getInstance()->getCore()->getPlaybackGainDb();
@ -300,6 +296,8 @@ void CallCore::setSelf(QSharedPointer<CallCore> me) {
setRecordable(state == linphone::Call::State::StreamsRunning); setRecordable(state == linphone::Call::State::StreamsRunning);
setPaused(state == linphone::Call::State::Paused || state == linphone::Call::State::PausedByRemote); setPaused(state == linphone::Call::State::Paused || state == linphone::Call::State::PausedByRemote);
if (mConference) mConference->setSubject(subject); if (mConference) mConference->setSubject(subject);
// The conference object is not ready until the StreamRunning status,
// so it can't be used at this point
setIsConference(isConf); setIsConference(isConf);
}); });
mCallModelConnection->invokeToCore([this, state, message]() { setState(LinphoneEnums::fromLinphone(state)); }); mCallModelConnection->invokeToCore([this, state, message]() { setState(LinphoneEnums::fromLinphone(state)); });