StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

initialize gain/volume after initialization of audio in/out device

Browse Source 
The gain/volume values are now applied to the settings once, when releasing the slider instead of continuously.
This commit is contained in:
Nils Fenner 2016-01-16 22:31:33 +01:00 committed by tux3
parent 719def932b
commit 6f7df25f4a
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/widget/form/settings/avform.cpp
View File

@ -64,13 +64,19 @@ AVForm::AVForm() :
getAudioOutDevices();
getVideoDevices();
});
bodyUI->playbackSlider->setValue(Settings::getInstance().getOutVolume());
bodyUI->microphoneSlider->setValue(Settings::getInstance().getInVolume());
connect(bodyUI->playbackSlider, &QSlider::valueChanged, this, &AVForm::onPlaybackValueChanged);
connect(bodyUI->microphoneSlider, &QSlider::valueChanged, this, &AVForm::onMicrophoneValueChanged);
bodyUI->playbackSlider->setTracking(false);
bodyUI->playbackSlider->installEventFilter(this);
connect(bodyUI->playbackSlider, &QSlider::sliderMoved,
this, &AVForm::onPlaybackSliderMoved);
connect(bodyUI->playbackSlider, &QSlider::valueChanged,
this, &AVForm::onPlaybackValueChanged);
bodyUI->microphoneSlider->setTracking(false);
bodyUI->microphoneSlider->installEventFilter(this);
connect(bodyUI->microphoneSlider, &QSlider::sliderMoved,
this, &AVForm::onMicrophoneSliderMoved);
connect(bodyUI->microphoneSlider, &QSlider::valueChanged,
this, &AVForm::onMicrophoneValueChanged);
for (QComboBox* cb : findChildren<QComboBox*>())
{
@ -328,7 +334,9 @@ void AVForm::onInDevChanged(QString deviceDescriptor)
deviceDescriptor = "none";
Settings::getInstance().setInDev(deviceDescriptor);
Audio::getInstance().reinitInput(deviceDescriptor);
Audio& audio = Audio::getInstance();
audio.reinitInput(deviceDescriptor);
bodyUI->microphoneSlider->setSliderPosition(audio.inputVolume() * 100.f);
}
void AVForm::onOutDevChanged(QString deviceDescriptor)
@ -337,7 +345,9 @@ void AVForm::onOutDevChanged(QString deviceDescriptor)
deviceDescriptor = "none";
Settings::getInstance().setOutDev(deviceDescriptor);
Audio::getInstance().reinitOutput(deviceDescriptor);
Audio& audio = Audio::getInstance();
audio.reinitOutput(deviceDescriptor);
bodyUI->playbackSlider->setSliderPosition(audio.outputVolume() * 100.f);
}
void AVForm::onFilterAudioToggled(bool filterAudio)
@ -345,16 +355,29 @@ void AVForm::onFilterAudioToggled(bool filterAudio)
Settings::getInstance().setFilterAudio(filterAudio);
}
void AVForm::onPlaybackSliderMoved(int value)
{
Audio& audio = Audio::getInstance();
if (audio.isOutputReady()) {
const qreal percentage = value / 100.0;
audio.setOutputVolume(percentage);
}
}
void AVForm::onPlaybackValueChanged(int value)
{
Audio::getInstance().setOutputVolume(value / 100.0);
Settings::getInstance().setOutVolume(bodyUI->playbackSlider->value());
Settings::getInstance().setOutVolume(value);
}
void AVForm::onMicrophoneSliderMoved(int value)
{
const qreal percentage = value / 100.0;
Audio::getInstance().setInputVolume(percentage);
}
void AVForm::onMicrophoneValueChanged(int value)
{
Audio::getInstance().setInputVolume(value / 100.0);
Settings::getInstance().setInVolume(bodyUI->microphoneSlider->value());
Settings::getInstance().setInVolume(value);
}
void AVForm::createVideoSurface()

2
src/widget/form/settings/avform.h
View File

@ -57,7 +57,9 @@ private slots:
void onInDevChanged(QString deviceDescriptor);
void onOutDevChanged(QString deviceDescriptor);
void onFilterAudioToggled(bool filterAudio);
void onPlaybackSliderMoved(int value);
void onPlaybackValueChanged(int value);
void onMicrophoneSliderMoved(int value);
void onMicrophoneValueChanged(int value);
// camera