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

Cleanup duplicate slider slots in AVForm

Browse Source 
See #2528
This commit is contained in:
tux3 2015-11-08 13:40:32 +01:00
parent b6d752fd4b
commit a8746e6857
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,8 +64,8 @@ AVForm::AVForm() :
connect(bodyUI->filterAudio, &QCheckBox::toggled, this, &AVForm::onFilterAudioToggled); connect(bodyUI->filterAudio, &QCheckBox::toggled, this, &AVForm::onFilterAudioToggled);
connect(bodyUI->rescanButton, &QPushButton::clicked, this, [=](){getAudioInDevices(); getAudioOutDevices();}); connect(bodyUI->rescanButton, &QPushButton::clicked, this, [=](){getAudioInDevices(); getAudioOutDevices();});
connect(bodyUI->playbackSlider, &QSlider::valueChanged, this, &AVForm::onPlaybackSliderReleased); connect(bodyUI->playbackSlider, &QSlider::valueChanged, this, &AVForm::onPlaybackValueChanged);
connect(bodyUI->microphoneSlider, &QSlider::valueChanged, this, &AVForm::onMicrophoneSliderReleased); connect(bodyUI->microphoneSlider, &QSlider::valueChanged, this, &AVForm::onMicrophoneValueChanged);
bodyUI->playbackSlider->setValue(Settings::getInstance().getOutVolume()); bodyUI->playbackSlider->setValue(Settings::getInstance().getOutVolume());
bodyUI->microphoneSlider->setValue(Settings::getInstance().getInVolume()); bodyUI->microphoneSlider->setValue(Settings::getInstance().getInVolume());
@ -344,26 +344,18 @@ void AVForm::onFilterAudioToggled(bool filterAudio)
Settings::getInstance().setFilterAudio(filterAudio); Settings::getInstance().setFilterAudio(filterAudio);
} }
void AVForm::on_playbackSlider_valueChanged(int value) void AVForm::onPlaybackValueChanged(int value)
{ {
Audio::getInstance().setOutputVolume(value / 100.0); Audio::getInstance().setOutputVolume(value / 100.0);
Settings::getInstance().setOutVolume(bodyUI->playbackSlider->value());
bodyUI->playbackMax->setText(QString::number(value)); bodyUI->playbackMax->setText(QString::number(value));
} }
void AVForm::on_microphoneSlider_valueChanged(int value) void AVForm::onMicrophoneValueChanged(int value)
{ {
Audio::getInstance().setInputVolume(value / 100.0); Audio::getInstance().setInputVolume(value / 100.0);
bodyUI->microphoneMax->setText(QString::number(value));
}
void AVForm::onPlaybackSliderReleased()
{
Settings::getInstance().setOutVolume(bodyUI->playbackSlider->value());
}
void AVForm::onMicrophoneSliderReleased()
{
Settings::getInstance().setInVolume(bodyUI->microphoneSlider->value()); Settings::getInstance().setInVolume(bodyUI->microphoneSlider->value());
bodyUI->microphoneMax->setText(QString::number(value));
} }
bool AVForm::eventFilter(QObject *o, QEvent *e) bool AVForm::eventFilter(QObject *o, QEvent *e)

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

@ -57,10 +57,8 @@ private slots:
void onInDevChanged(QString deviceDescriptor); void onInDevChanged(QString deviceDescriptor);
void onOutDevChanged(QString deviceDescriptor); void onOutDevChanged(QString deviceDescriptor);
void onFilterAudioToggled(bool filterAudio); void onFilterAudioToggled(bool filterAudio);
void on_playbackSlider_valueChanged(int value); void onPlaybackValueChanged(int value);
void on_microphoneSlider_valueChanged(int value); void onMicrophoneValueChanged(int value);
void onPlaybackSliderReleased();
void onMicrophoneSliderReleased();
// camera // camera
void onVideoDevChanged(int index); void onVideoDevChanged(int index);