Pitch is no longer a special view type... && bug fixes 1040, 1041

... It is a choice of algorithm in spectrogram settings, and any frequency
scale may be chosen with it.  Spectral selection works in it.

src/prefs/SpectrogramSettings.h

@@ -64,6 +64,7 @@ public:
 
    static void InvalidateNames(); // in case of language change
    static const wxArrayString &GetScaleNames();
+   static const wxArrayString &GetAlgorithmNames();
 
    static SpectrogramSettings &defaults();
    SpectrogramSettings();
@@ -87,7 +88,7 @@ public:
 
    // If "bins" is false, units are Hz
    NumberScale SpectrogramSettings::GetScale
-      (double rate, bool bins, bool autocorrelation) const;
+      (double rate, bool bins) const;
 
 private:
    int minFreq;
@@ -117,7 +118,7 @@ public:
    int zeroPaddingFactor;
 #endif
 
-   int GetFFTLength(bool autocorrelation) const; // window size (times zero padding, if STFT)
+   int GetFFTLength() const; // window size (times zero padding, if STFT)
 
    bool isGrayscale;
 
@@ -127,6 +128,14 @@ public:
    bool spectralSelection; // But should this vary per track? -- PRL
 #endif
 
+   enum Algorithm {
+      algSTFT = 0,
+      algPitchEAC,
+
+      algNumAlgorithms,
+   };
+   Algorithm algorithm;
+
 #ifdef EXPERIMENTAL_FFT_Y_GRID
    bool fftYGrid;
 #endif //EXPERIMENTAL_FFT_Y_GRID