aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2015-10-28 03:09:15 -0700
committerChris Robinson <[email protected]>2015-10-28 03:09:15 -0700
commit63259872d19967da8c2960fbbf74d97aadab9693 (patch)
tree8009b2bafd88f38e3f98d2aae73b74868e38a176 /utils
parent9ce2b8f9a72845d4eeba2abaea6b23880a3b4c82 (diff)
Remove the Reverb Bost option from alsoft-config
It's not really an appropriate setting for most users to play with. The option still exists, but it's no longer editable in the GUI.
Diffstat (limited to 'utils')
-rw-r--r--utils/alsoft-config/mainwindow.cpp31
-rw-r--r--utils/alsoft-config/mainwindow.h4
-rw-r--r--utils/alsoft-config/mainwindow.ui78
3 files changed, 2 insertions, 111 deletions
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp
index c01bdb38..dff8b930 100644
--- a/utils/alsoft-config/mainwindow.cpp
+++ b/utils/alsoft-config/mainwindow.cpp
@@ -172,8 +172,7 @@ MainWindow::MainWindow(QWidget *parent) :
mSourceCountValidator(NULL),
mEffectSlotValidator(NULL),
mSourceSendValidator(NULL),
- mSampleRateValidator(NULL),
- mReverbBoostValidator(NULL)
+ mSampleRateValidator(NULL)
{
ui->setupUi(this);
@@ -246,9 +245,6 @@ MainWindow::MainWindow(QWidget *parent) :
mSampleRateValidator = new QIntValidator(8000, 192000, this);
ui->sampleRateCombo->lineEdit()->setValidator(mSampleRateValidator);
- mReverbBoostValidator = new QDoubleValidator(-12.0, +12.0, 1, this);
- ui->reverbBoostEdit->setValidator(mReverbBoostValidator);
-
connect(ui->actionLoad, SIGNAL(triggered()), this, SLOT(loadConfigFromFile()));
connect(ui->actionSave_As, SIGNAL(triggered()), this, SLOT(saveConfigAsFile()));
@@ -269,9 +265,6 @@ MainWindow::MainWindow(QWidget *parent) :
ui->disabledBackendList->setContextMenuPolicy(Qt::CustomContextMenu);
connect(ui->disabledBackendList, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showDisabledBackendMenu(QPoint)));
- connect(ui->reverbBoostSlider, SIGNAL(valueChanged(int)), this, SLOT(updateReverbBoostEdit(int)));
- connect(ui->reverbBoostEdit, SIGNAL(textEdited(QString)), this, SLOT(updateReverbBoostSlider(QString)));
-
loadConfig(getDefaultConfigName());
}
@@ -284,7 +277,6 @@ MainWindow::~MainWindow()
delete mEffectSlotValidator;
delete mSourceSendValidator;
delete mSampleRateValidator;
- delete mReverbBoostValidator;
}
void MainWindow::loadConfigFromFile()
@@ -492,8 +484,6 @@ void MainWindow::loadConfig(const QString &fname)
}
ui->emulateEaxCheckBox->setChecked(settings.value("reverb/emulate-eax", false).toBool());
- ui->reverbBoostEdit->clear();
- ui->reverbBoostEdit->insert(settings.value("reverb/boost").toString());
QStringList excludefx = settings.value("excludefx").toStringList();
if(excludefx.size() == 1)
@@ -644,12 +634,6 @@ void MainWindow::saveConfig(const QString &fname) const
else
settings.setValue("reverb/emulate-eax", QString()/*"false"*/);
- // TODO: Remove check when we can properly match global values.
- if(ui->reverbBoostSlider->sliderPosition() == 0)
- settings.setValue("reverb/boost", QString());
- else
- settings.setValue("reverb/boost", ui->reverbBoostEdit->text());
-
strlist.clear();
if(!ui->enableEaxReverbCheck->isChecked())
strlist.append("eaxreverb");
@@ -840,16 +824,3 @@ void MainWindow::showDisabledBackendMenu(QPoint pt)
ui->disabledBackendList->addItem(iter.value());
}
}
-
-void MainWindow::updateReverbBoostEdit(int value)
-{
- ui->reverbBoostEdit->clear();
- if(value != 0)
- ui->reverbBoostEdit->insert(QString::number(value/10.0, 'f', 1));
-}
-
-void MainWindow::updateReverbBoostSlider(QString value)
-{
- int pos = int(value.toFloat()*10.0f);
- ui->reverbBoostSlider->setSliderPosition(pos);
-}
diff --git a/utils/alsoft-config/mainwindow.h b/utils/alsoft-config/mainwindow.h
index 0421aabb..b5a1ae7c 100644
--- a/utils/alsoft-config/mainwindow.h
+++ b/utils/alsoft-config/mainwindow.h
@@ -35,9 +35,6 @@ private slots:
void showEnabledBackendMenu(QPoint pt);
void showDisabledBackendMenu(QPoint pt);
- void updateReverbBoostEdit(int size);
- void updateReverbBoostSlider(QString value);
-
private:
Ui::MainWindow *ui;
@@ -47,7 +44,6 @@ private:
QValidator *mEffectSlotValidator;
QValidator *mSourceSendValidator;
QValidator *mSampleRateValidator;
- QValidator *mReverbBoostValidator;
void loadConfig(const QString &fname);
void saveConfig(const QString &fname) const;
diff --git a/utils/alsoft-config/mainwindow.ui b/utils/alsoft-config/mainwindow.ui
index f4929091..3be8adee 100644
--- a/utils/alsoft-config/mainwindow.ui
+++ b/utils/alsoft-config/mainwindow.ui
@@ -904,87 +904,11 @@ some quality.</string>
<string>Emulate EAX Reverb:</string>
</property>
</widget>
- <widget class="QGroupBox" name="groupBox_4">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>100</y>
- <width>511</width>
- <height>61</height>
- </rect>
- </property>
- <property name="toolTip">
- <string>Global amplification for reverb output, expressed in decibels.
-+6 will be a scale of (approximately) 2x, +12 will be a scale of
-4x, etc. Similarly, -6 will be about half, and -12 about 1/4th. A
-value of 0 means no change.</string>
- </property>
- <property name="title">
- <string>Reverb Boost</string>
- </property>
- <widget class="QSlider" name="reverbBoostSlider">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>30</y>
- <width>391</width>
- <height>23</height>
- </rect>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="minimum">
- <number>-120</number>
- </property>
- <property name="maximum">
- <number>120</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="tickPosition">
- <enum>QSlider::TicksBelow</enum>
- </property>
- <property name="tickInterval">
- <number>10</number>
- </property>
- </widget>
- <widget class="QLineEdit" name="reverbBoostEdit">
- <property name="geometry">
- <rect>
- <x>410</x>
- <y>30</y>
- <width>51</width>
- <height>22</height>
- </rect>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="placeholderText">
- <string>0.0</string>
- </property>
- </widget>
- <widget class="QLabel" name="label_12">
- <property name="geometry">
- <rect>
- <x>460</x>
- <y>30</y>
- <width>31</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>dB</string>
- </property>
- </widget>
- </widget>
<widget class="QGroupBox" name="groupBox_5">
<property name="geometry">
<rect>
<x>10</x>
- <y>170</y>
+ <y>100</y>
<width>511</width>
<height>191</height>
</rect>