Mercurial > hg > svcore

changeset 1578:07f23b90701a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove oversampling from prefs, now that it's in the spectrogram layer properties
author Chris Cannam
date Wed, 14 Nov 2018 15:46:35 +0000
parents 50fe6d6a5ef0
children 232d6ddf257d c8fad3c14a2b 9570ef94eaa3
files base/Preferences.cpp base/Preferences.h
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/base/Preferences.cpp	Wed Nov 14 14:21:53 2018 +0000
+++ b/base/Preferences.cpp	Wed Nov 14 15:46:35 2018 +0000
@@ -241,7 +241,7 @@
 {
     if (name == "Spectrogram Y Smoothing") {
         if (min) *min = 0;
-        if (max) *max = 3;
+        if (max) *max = 1;
         if (deflt) *deflt = int(SpectrogramInterpolated);
         return int(m_spectrogramSmoothing);
     }
@@ -353,8 +353,6 @@
         switch (value) {
         case NoSpectrogramSmoothing: return tr("None");
         case SpectrogramInterpolated: return tr("Linear interpolation");
-        case SpectrogramZeroPadded: return tr("4 x Oversampling");
-        case SpectrogramZeroPaddedAndInterpolated: return tr("4 x Oversampling with interpolation");
         }
     }
     if (name == "Spectrogram X Smoothing") {
--- a/base/Preferences.h	Wed Nov 14 14:21:53 2018 +0000
+++ b/base/Preferences.h	Wed Nov 14 15:46:35 2018 +0000
@@ -37,9 +37,7 @@
 
     enum SpectrogramSmoothing {
         NoSpectrogramSmoothing,
-        SpectrogramInterpolated,
-        SpectrogramZeroPadded,
-        SpectrogramZeroPaddedAndInterpolated
+        SpectrogramInterpolated
     };
 
     enum SpectrogramXSmoothing {