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

Fix volumes :

Browse source 
- In settings : apply volume to general setting.
- In call : use general volume if it cannot be set/get directly from call.
- ALSA : allow get/set
This commit is contained in:
Julien Wadel 2021-11-05 08:29:08 +01:00
parent 6e82b0347f
commit f0b0c845c0
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## 4.4.0 - [Undefined]
## Added
## Fixed
- Changing volume in settings has a overall effect.
- ALSA volumes can be view/changed while being in call.
## 4.3.1 - 2021-11-04
### Added

20
linphone-app/src/components/call/CallModel.cpp
View file

@ -199,22 +199,34 @@ void CallModel::updateStats (const shared_ptr<const linphone::CallStats> &callSt
// -----------------------------------------------------------------------------
float CallModel::getSpeakerVolumeGain () const {
return mCall->getSpeakerVolumeGain();
float gain = mCall->getSpeakerVolumeGain();
if( gain < 0)
gain = CoreManager::getInstance()->getSettingsModel()->getPlaybackGain();
return gain;
}
void CallModel::setSpeakerVolumeGain (float volume) {
Q_ASSERT(volume >= 0.0f && volume <= 1.0f);
mCall->setSpeakerVolumeGain(volume);
if( mCall->getSpeakerVolumeGain() >= 0)
mCall->setSpeakerVolumeGain(volume);
else
CoreManager::getInstance()->getSettingsModel()->setPlaybackGain(volume);
emit speakerVolumeGainChanged(getSpeakerVolumeGain());
}
float CallModel::getMicroVolumeGain () const {
return mCall->getMicrophoneVolumeGain();
float gain = mCall->getMicrophoneVolumeGain();
if( gain < 0)
gain = CoreManager::getInstance()->getSettingsModel()->getCaptureGain();
return gain;
}
void CallModel::setMicroVolumeGain (float volume) {
Q_ASSERT(volume >= 0.0f && volume <= 1.0f);
mCall->setMicrophoneVolumeGain(volume);
if(mCall->getMicrophoneVolumeGain() >= 0)
mCall->setMicrophoneVolumeGain(volume);
else
CoreManager::getInstance()->getSettingsModel()->setCaptureGain(volume);
emit microVolumeGainChanged(getMicroVolumeGain());
}

2
linphone-app/src/components/settings/SettingsModel.cpp
View file

@ -224,6 +224,7 @@ float SettingsModel::getPlaybackGain() const {
}
void SettingsModel::setPlaybackGain(float gain) {
CoreManager::getInstance()->getCore()->setPlaybackGainDb(MediastreamerUtils::linearToDb(gain));
if (mSimpleCaptureGraph && mSimpleCaptureGraph->isRunning()) {
mSimpleCaptureGraph->setPlaybackGain(gain);
}
@ -235,6 +236,7 @@ float SettingsModel::getCaptureGain() const {
}
void SettingsModel::setCaptureGain(float gain) {
CoreManager::getInstance()->getCore()->setMicGainDb(MediastreamerUtils::linearToDb(gain));
if (mSimpleCaptureGraph && mSimpleCaptureGraph->isRunning()) {
mSimpleCaptureGraph->setCaptureGain(gain);
}