diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index e5dd2dc86..73e6d6cc1 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -1239,7 +1239,8 @@ void Settings::setOutVolume(int volume) bool Settings::getFilterAudio() const { QMutexLocker locker{&bigLock}; - return filterAudio; + // temporary disable filteraudio, as it doesn't work as expected + return false; } void Settings::setFilterAudio(bool newValue) diff --git a/src/widget/form/settings/avform.cpp b/src/widget/form/settings/avform.cpp index 849eaa3f2..ab40173b4 100644 --- a/src/widget/form/settings/avform.cpp +++ b/src/widget/form/settings/avform.cpp @@ -47,20 +47,12 @@ AVForm::AVForm() : bodyUI->btnPlayTestSound->setToolTip( tr("Play a test sound while changing the output volume.")); -#ifdef QTOX_FILTER_AUDIO - bodyUI->filterAudio->setChecked(Settings::getInstance().getFilterAudio()); -#else - bodyUI->filterAudio->setDisabled(true); -#endif - auto qcbxIndexChangedStr = (void(QComboBox::*)(const QString&)) &QComboBox::currentIndexChanged; auto qcbxIndexChangedInt = (void(QComboBox::*)(int)) &QComboBox::currentIndexChanged; connect(bodyUI->inDevCombobox, qcbxIndexChangedStr, this, &AVForm::onInDevChanged); connect(bodyUI->outDevCombobox, qcbxIndexChangedStr, this, &AVForm::onOutDevChanged); connect(bodyUI->videoDevCombobox, qcbxIndexChangedInt, this, &AVForm::onVideoDevChanged); connect(bodyUI->videoModescomboBox, qcbxIndexChangedInt, this, &AVForm::onVideoModesIndexChanged); - - connect(bodyUI->filterAudio, &QCheckBox::toggled, this, &AVForm::onFilterAudioToggled); connect(bodyUI->rescanButton, &QPushButton::clicked, this, [=]() { getAudioInDevices(); @@ -87,11 +79,6 @@ AVForm::AVForm() : cb->setFocusPolicy(Qt::StrongFocus); } - for (QCheckBox *cb : findChildren()) // this one is to allow scrolling on checkboxes - { - cb->installEventFilter(this); - } - Translator::registerHandler(std::bind(&AVForm::retranslateUi, this), this); } @@ -415,7 +402,7 @@ void AVForm::killVideoSurface() bool AVForm::eventFilter(QObject *o, QEvent *e) { if ((e->type() == QEvent::Wheel) && - (qobject_cast(o) || qobject_cast(o) || qobject_cast(o) || qobject_cast(o))) + (qobject_cast(o) || qobject_cast(o) || qobject_cast(o))) { e->ignore(); return true; diff --git a/src/widget/form/settings/avsettings.ui b/src/widget/form/settings/avsettings.ui index ee2cada0a..187f6f391 100644 --- a/src/widget/form/settings/avsettings.ui +++ b/src/widget/form/settings/avsettings.ui @@ -30,8 +30,8 @@ 0 0 - 830 - 495 + 824 + 489 @@ -41,27 +41,13 @@ Audio Settings - - - - Playback device - - - - - - - Volume - - - - - + + - Use slider to set volume of your speakers. + Use slider to set volume of your microphone. 100 @@ -71,6 +57,23 @@ + + + + Gain + + + + + + + + + + Playback device + + + @@ -85,27 +88,10 @@ - - - - Capture device - - - - - - - - - - Gain - - - - - + + - Use slider to set volume of your microphone. + Use slider to set volume of your speakers. 100 @@ -115,13 +101,17 @@ - - - - Filter sound from your microphone, so that people hearing you would get better sound. - + + - Filter audio + Capture device + + + + + + + Volume