diff options
| -rw-r--r-- | utils/alsoft-config/mainwindow.cpp | 19 | ||||
| -rw-r--r-- | utils/alsoft-config/mainwindow.ui | 60 |
2 files changed, 7 insertions, 72 deletions
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index 8abde1fd..09c7ca72 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -123,7 +123,7 @@ static const struct NameValuePair { { "", "" } }, stereoEncList[] = { { "Default", "" }, - { "Pan Pot", "panpot" }, + { "Basic", "panpot" }, { "UHJ", "uhj" }, { "Binaural", "hrtf" }, @@ -308,7 +308,6 @@ MainWindow::MainWindow(QWidget *parent) : for(count = 0;hrtfModeList[count].name[0];count++) { } ui->hrtfmodeSlider->setRange(0, count-1); - ui->hrtfStateComboBox->adjustSize(); #if !defined(HAVE_NEON) && !defined(HAVE_SSE) ui->cpuExtDisabledLabel->move(ui->cpuExtDisabledLabel->x(), ui->cpuExtDisabledLabel->y() - 60); @@ -417,7 +416,6 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->decoder3D71Button, &QPushButton::clicked, this, &MainWindow::select3D71DecoderFile); connect(ui->preferredHrtfComboBox, qcb_cicint, this, &MainWindow::enableApplyButton); - connect(ui->hrtfStateComboBox, qcb_cicint, this, &MainWindow::enableApplyButton); connect(ui->hrtfmodeSlider, &QSlider::valueChanged, this, &MainWindow::updateHrtfModeLabel); connect(ui->hrtfAddButton, &QPushButton::clicked, this, &MainWindow::addHrtfFile); @@ -815,14 +813,6 @@ void MainWindow::loadConfig(const QString &fname) ui->hrtfFileList->addItems(hrtf_paths); updateHrtfRemoveButton(); - QString hrtfstate{settings.value("hrtf").toString().toLower()}; - if(hrtfstate == "true") - ui->hrtfStateComboBox->setCurrentIndex(1); - else if(hrtfstate == "false") - ui->hrtfStateComboBox->setCurrentIndex(2); - else - ui->hrtfStateComboBox->setCurrentIndex(0); - ui->preferredHrtfComboBox->clear(); ui->preferredHrtfComboBox->addItem("- Any -"); if(ui->defaultHrtfPathsCheckBox->isChecked()) @@ -1055,13 +1045,6 @@ void MainWindow::saveConfig(const QString &fname) const settings.setValue("hrtf-mode", hrtfModeList[ui->hrtfmodeSlider->value()].value); - if(ui->hrtfStateComboBox->currentIndex() == 1) - settings.setValue("hrtf", "true"); - else if(ui->hrtfStateComboBox->currentIndex() == 2) - settings.setValue("hrtf", "false"); - else - settings.setValue("hrtf", QString{}); - if(ui->preferredHrtfComboBox->currentIndex() == 0) settings.setValue("default-hrtf", QString{}); else diff --git a/utils/alsoft-config/mainwindow.ui b/utils/alsoft-config/mainwindow.ui index 659807c7..2a997995 100644 --- a/utils/alsoft-config/mainwindow.ui +++ b/utils/alsoft-config/mainwindow.ui @@ -116,9 +116,9 @@ float and converted to the output sample type as needed.</string> </rect> </property> <property name="toolTip"> - <string>The output channel configuration. Note that not all backends -can properly detect the channel configuration and may default -to stereo output.</string> + <string>The default output channel configuration. Note that not all +backends can properly detect the channel configuration and +may default to stereo output.</string> </property> <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToContents</enum> @@ -436,7 +436,7 @@ frames needed for each mixing update.</string> </rect> </property> <property name="toolTip"> - <string>Pan Pot uses standard amplitude panning (aka + <string>Basic uses standard amplitude panning (aka pair-wise, stereo pair, etc). UHJ creates a stereo-compatible two-channel @@ -444,8 +444,8 @@ UHJ mix, which encodes some surround sound information into stereo output that can be decoded with a surround sound receiver. -Binaural applies HRTF filters to create a sense -of 3D space with headphones.</string> +Binaural applies HRTF filters to create an +illusion of 3D placement with headphones.</string> </property> </widget> <widget class="QLabel" name="label_19"> @@ -1090,54 +1090,6 @@ listed above.</string> </widget> </widget> </widget> - <widget class="QLabel" name="label_16"> - <property name="geometry"> - <rect> - <x>50</x> - <y>60</y> - <width>71</width> - <height>31</height> - </rect> - </property> - <property name="text"> - <string>HRTF Mode:</string> - </property> - <property name="alignment"> - <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> - </property> - </widget> - <widget class="QComboBox" name="hrtfStateComboBox"> - <property name="geometry"> - <rect> - <x>130</x> - <y>60</y> - <width>161</width> - <height>31</height> - </rect> - </property> - <property name="toolTip"> - <string>Forces HRTF processing on or off, or leaves it to the -application or system to determine if it should be used.</string> - </property> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToContentsOnFirstShow</enum> - </property> - <item> - <property name="text"> - <string>Application preference</string> - </property> - </item> - <item> - <property name="text"> - <string>Force on</string> - </property> - </item> - <item> - <property name="text"> - <string>Force off</string> - </property> - </item> - </widget> <widget class="QLabel" name="label_12"> <property name="geometry"> <rect> |