# HG changeset patch # User Chris Cannam # Date 1480955943 0 # Node ID 032bf0b11de9bc30d4cc053dce394fb1ea0d954c # Parent 7b058ba5fa678ac8a1984e3464e2b476e3639a96 Remove resampler quality option (#1760) diff -r 7b058ba5fa67 -r 032bf0b11de9 .hgsubstate --- a/.hgsubstate Mon Dec 05 16:29:13 2016 +0000 +++ b/.hgsubstate Mon Dec 05 16:39:03 2016 +0000 @@ -7,7 +7,7 @@ c37b5598a4beb570417716e30aa649c78312169f icons/scalable 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp 5f67a29f0fc7f1b908f7cde4866173a7af337862 sv-dependency-builds -0d5c3abc965812805053cc2b399b6696178a1cd9 svapp -a421e752d22c71a9cd55db40a62f053f61d9ce57 svcore +167d37937436f87a1836c0933d51404767ecd6ce svapp +ea28ee929034977f941b9713e82583fc3d9b1312 svcore db90fee630bc756c3c64a6f904b551acb13e000f svgui 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk diff -r 7b058ba5fa67 -r 032bf0b11de9 main/PreferencesDialog.cpp --- a/main/PreferencesDialog.cpp Mon Dec 05 16:29:13 2016 +0000 +++ b/main/PreferencesDialog.cpp Mon Dec 05 16:39:03 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); diff -r 7b058ba5fa67 -r 032bf0b11de9 main/PreferencesDialog.h --- a/main/PreferencesDialog.h Mon Dec 05 16:29:13 2016 +0000 +++ b/main/PreferencesDialog.h Mon Dec 05 16:39:03 2016 +0000 @@ -55,7 +55,6 @@ void propertyLayoutChanged(int layout); void tuningFrequencyChanged(double freq); void audioDeviceChanged(int device); - void resampleQualityChanged(int quality); void resampleOnLoadChanged(int state); void gaplessModeChanged(int state); void vampProcessSeparationChanged(int state); @@ -101,7 +100,6 @@ int m_propertyLayout; double m_tuningFrequency; int m_audioDevice; - int m_resampleQuality; bool m_resampleOnLoad; bool m_gapless; bool m_runPluginsInProcess;