Rename enum value to eWinFuncHann

Author: Paul-Licameli

src/FFT.cpp

@@ -344,7 +344,7 @@ const TranslatableString WindowFuncName(int whichFunction)
    case eWinFuncHamming:
       /* i18n-hint a proper name */
       return XO("Hamming");
-   case eWinFuncHanning:
+   case eWinFuncHann:
       /* i18n-hint a proper name */
       return XO("Hann");
    case eWinFuncBlackman:
@@ -411,7 +411,7 @@ void NewWindowFunc(int whichFunction, size_t NumSamplesIn, bool extraSample, flo
          in[ii] *= coeff0 + coeff1 * cos(ii * multiplier);
    }
       break;
-   case eWinFuncHanning:
+   case eWinFuncHann:
    {
       // Hann
       const double multiplier = 2 * M_PI / NumSamples;
@@ -519,7 +519,7 @@ void WindowFunc(int whichFunction, size_t NumSamples, float *in)
    switch (whichFunction)
    {
    case eWinFuncHamming:
-   case eWinFuncHanning:
+   case eWinFuncHann:
    case eWinFuncBlackman:
    case eWinFuncBlackmanHarris:
       extraSample = true;
@@ -608,7 +608,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
          in[NumSamples] *= - coeff0 - coeff1 * sin(NumSamples * multiplier);
    }
       break;
-   case eWinFuncHanning:
+   case eWinFuncHann:
    {
       // Hann
       const double multiplier = 2 * M_PI / NumSamples;

src/FFT.h

@@ -107,7 +107,7 @@ enum eWindowFunctions
    eWinFuncRectangular,
    eWinFuncBartlett,
    eWinFuncHamming,
-   eWinFuncHanning,
+   eWinFuncHann,
    eWinFuncBlackman,
    eWinFuncBlackmanHarris,
    eWinFuncWelch,

src/Spectrum.h

@@ -23,6 +23,6 @@
 
 bool ComputeSpectrum(const float * data, size_t width, size_t windowSize,
                      double rate, float *out, bool autocorrelation,
-                     int windowFunc = eWinFuncHanning);
+                     int windowFunc = eWinFuncHann);
 
 #endif

src/effects/Paulstretch.cpp

@@ -462,7 +462,7 @@ void PaulStretch::process(float *smps, size_t nsmps)
    //get the samples from the pool
    for (size_t i = 0; i < poolsize; i++)
       fft_smps[i] = in_pool[i];
-   WindowFunc(eWinFuncHanning, poolsize, fft_smps.get());
+   WindowFunc(eWinFuncHann, poolsize, fft_smps.get());
 
    RealFFT(poolsize, fft_smps.get(), fft_c.get(), fft_s.get());
 

src/prefs/SpectrogramSettings.cpp

@@ -255,7 +255,7 @@ void SpectrogramSettings::LoadPrefs()
    zeroPaddingFactor = gPrefs->Read(wxT("/Spectrum/ZeroPaddingFactor"), 1);
 #endif
 
-   gPrefs->Read(wxT("/Spectrum/WindowType"), &windowType, eWinFuncHanning);
+   gPrefs->Read(wxT("/Spectrum/WindowType"), &windowType, eWinFuncHann);
 
    isGrayscale = (gPrefs->Read(wxT("/Spectrum/Grayscale"), 0L) != 0);
 
@@ -361,7 +361,7 @@ void SpectrogramSettings::UpdatePrefs()
 #endif
 
    if (windowType == defaults().windowType) {
-      gPrefs->Read(wxT("/Spectrum/WindowType"), &windowType, eWinFuncHanning);
+      gPrefs->Read(wxT("/Spectrum/WindowType"), &windowType, eWinFuncHann);
    }
 
    if (isGrayscale == defaults().isGrayscale) {