diff --git a/src/FFT.cpp b/src/FFT.cpp index 984bc9c40..9bac8edd1 100644 --- a/src/FFT.cpp +++ b/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; diff --git a/src/FFT.h b/src/FFT.h index 7acc6fa30..3e6fa29f2 100644 --- a/src/FFT.h +++ b/src/FFT.h @@ -107,7 +107,7 @@ enum eWindowFunctions eWinFuncRectangular, eWinFuncBartlett, eWinFuncHamming, - eWinFuncHanning, + eWinFuncHann, eWinFuncBlackman, eWinFuncBlackmanHarris, eWinFuncWelch, diff --git a/src/Spectrum.h b/src/Spectrum.h index 1fa81d943..674b20230 100644 --- a/src/Spectrum.h +++ b/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 diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 98bd02f26..3ddda7c6c 100644 --- a/src/effects/Paulstretch.cpp +++ b/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()); diff --git a/src/prefs/SpectrogramSettings.cpp b/src/prefs/SpectrogramSettings.cpp index bad5c276f..c275c395c 100644 --- a/src/prefs/SpectrogramSettings.cpp +++ b/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) {