diff main/PreferencesDialog.cpp @ 1390:4c5533df5d72 levelpanwidget

Merge from branch 3.0-integration

--- a/main/PreferencesDialog.cpp	Mon Dec 05 15:47:40 2016 +0000
+++ b/main/PreferencesDialog.cpp	Mon Dec 05 17:03:09 2016 +0000
@@ -202,20 +202,6 @@
     connect(audioDevice, SIGNAL(currentIndexChanged(int)),
             this, SLOT(audioDeviceChanged(int)));
     */
-    QComboBox *resampleQuality = new QComboBox;
-
-    int rsq = prefs->getPropertyRangeAndValue("Resample Quality", &min, &max,
-                                              &deflt);
-    m_resampleQuality = rsq;
-
-    for (i = min; i <= max; ++i) {
-        resampleQuality->addItem(prefs->getPropertyValueLabel("Resample Quality", i));
-    }
-
-    resampleQuality->setCurrentIndex(rsq);
-
-    connect(resampleQuality, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(resampleQualityChanged(int)));
 
     QCheckBox *resampleOnLoad = new QCheckBox;
     m_resampleOnLoad = prefs->getResampleOnLoad();
@@ -386,11 +372,6 @@
 //!!!    subgrid->addWidget(new QLabel(tr("Playback audio device:")), row, 0);
 //!!!    subgrid->addWidget(audioDevice, row++, 1, 1, 2);
 
-    subgrid->addWidget(new QLabel(tr("%1:").arg(prefs->getPropertyLabel
-                                                ("Resample Quality"))),
-                       row, 0);
-    subgrid->addWidget(resampleQuality, row++, 1, 1, 2);
-
     subgrid->setRowStretch(row, 10);
     
     m_tabOrdering[GeneralTab] = m_tabs->count();
@@ -641,13 +622,6 @@
 }
 
 void
-PreferencesDialog::resampleQualityChanged(int q)
-{
-    m_resampleQuality = q;
-    m_applyButton->setEnabled(true);
-}
-
-void
 PreferencesDialog::resampleOnLoadChanged(int state)
 {
     m_resampleOnLoad = (state == Qt::Checked);
@@ -783,7 +757,6 @@
     prefs->setPropertyBoxLayout(Preferences::PropertyBoxLayout
                                 (m_propertyLayout));
     prefs->setTuningFrequency(m_tuningFrequency);
-    prefs->setResampleQuality(m_resampleQuality);
     prefs->setResampleOnLoad(m_resampleOnLoad);
     prefs->setUseGaplessMode(m_gapless);
     prefs->setRunPluginsInProcess(m_runPluginsInProcess);