diff options
Diffstat (limited to 'utils/alsoft-config/mainwindow.cpp')
-rw-r--r-- | utils/alsoft-config/mainwindow.cpp | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/utils/alsoft-config/mainwindow.cpp b/utils/alsoft-config/mainwindow.cpp index 4510781e..c2e36fb4 100644 --- a/utils/alsoft-config/mainwindow.cpp +++ b/utils/alsoft-config/mainwindow.cpp @@ -293,9 +293,6 @@ MainWindow::MainWindow(QWidget *parent) : mPeriodCountValidator = new QIntValidator(2, 16, this); ui->periodCountEdit->setValidator(mPeriodCountValidator); - mRefDelayValidator = new QDoubleValidator(0.0, 1000.0, 3, this); - ui->decoderNFRefDelayEdit->setValidator(mRefDelayValidator); - mSourceCountValidator = new QIntValidator(0, 4096, this); ui->srcCountLineEdit->setValidator(mSourceCountValidator); mEffectSlotValidator = new QIntValidator(0, 64, this); @@ -335,8 +332,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->decoderHQModeCheckBox, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); connect(ui->decoderDistCompCheckBox, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); connect(ui->decoderNFEffectsCheckBox, SIGNAL(stateChanged(int)), this, SLOT(enableApplyButton())); - connect(ui->decoderNFRefDelaySlider, SIGNAL(valueChanged(int)), this, SLOT(updateRefDelayEdit(int))); - connect(ui->decoderNFRefDelayEdit, SIGNAL(editingFinished()), this, SLOT(updateRefDelaySlider())); + connect(ui->decoderNFRefDelaySpinBox, SIGNAL(valueChanged(double)), this, SLOT(enableApplyButton())); connect(ui->decoderQuadLineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton())); connect(ui->decoderQuadButton, SIGNAL(clicked()), this, SLOT(selectQuadDecoderFile())); connect(ui->decoder51LineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableApplyButton())); @@ -430,7 +426,6 @@ MainWindow::~MainWindow() delete ui; delete mPeriodSizeValidator; delete mPeriodCountValidator; - delete mRefDelayValidator; delete mSourceCountValidator; delete mEffectSlotValidator; delete mSourceSendValidator; @@ -675,12 +670,7 @@ void MainWindow::loadConfig(const QString &fname) bool nfeffects = settings.value("decoder/nfc", true).toBool(); ui->decoderNFEffectsCheckBox->setChecked(nfeffects); double refdelay = settings.value("decoder/nfc-ref-delay", 0.0).toDouble(); - ui->decoderNFRefDelayEdit->clear(); - if(refdelay > 0.0) - { - ui->decoderNFRefDelayEdit->insert(QString::number(refdelay)); - updateRefDelaySlider(); - } + ui->decoderNFRefDelaySpinBox->setValue(refdelay); ui->decoderQuadLineEdit->setText(settings.value("decoder/quad").toString()); ui->decoder51LineEdit->setText(settings.value("decoder/surround51").toString()); @@ -913,7 +903,10 @@ void MainWindow::saveConfig(const QString &fname) const settings.setValue("decoder/nfc", ui->decoderNFEffectsCheckBox->isChecked() ? QString(/*"true"*/) : QString("false") ); - settings.setValue("decoder/nfc-ref-delay", ui->decoderNFRefDelayEdit->text()); + double refdelay = ui->decoderNFRefDelaySpinBox->value(); + settings.setValue("decoder/nfc-ref-delay", + (refdelay > 0.0) ? QString::number(refdelay) : QString() + ); settings.setValue("decoder/quad", ui->decoderQuadLineEdit->text()); settings.setValue("decoder/surround51", ui->decoder51LineEdit->text()); @@ -1129,25 +1122,6 @@ void MainWindow::updatePeriodCountSlider() } -void MainWindow::updateRefDelayEdit(int delay) -{ - ui->decoderNFRefDelayEdit->clear(); - if(delay > 0) - ui->decoderNFRefDelayEdit->insert( - QString("%1").arg(delay/1000.0, 0, 'f', 3) - ); - enableApplyButton(); -} - -void MainWindow::updateRefDelaySlider() -{ - double pos = ui->decoderNFRefDelayEdit->text().toDouble(); - if(pos > 1.0) pos = 1.0; - ui->decoderNFRefDelaySlider->setSliderPosition((int)(pos*1000.0)); - enableApplyButton(); -} - - void MainWindow::selectQuadDecoderFile() { selectDecoderFile(ui->decoderQuadLineEdit, "Select Quadrophonic Decoder");} void MainWindow::select51DecoderFile() |