# HG changeset patch
# User Chris Cannam
# Date 1542210395 0
# Node ID 07f23b90701a1711e762a4091e45be28cec5d737
# Parent  50fe6d6a5ef0336c11a66eacfb346b3bc87e9aae
Remove oversampling from prefs, now that it's in the spectrogram layer properties

diff -r 50fe6d6a5ef0 -r 07f23b90701a base/Preferences.cpp
--- 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") {
diff -r 50fe6d6a5ef0 -r 07f23b90701a base/Preferences.h
--- 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 {