Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 16:43:33 +02:00
Code Issues Releases Wiki Activity

Rename enum value to eWinFuncHann

Browse Source
This commit is contained in:
Paul Licameli
2021-01-17 12:24:38 -05:00
parent cccc7a7c4e
commit 4668e351a5
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/FFT.cpp
View File

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

2
src/FFT.h
View File

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

2
src/Spectrum.h
View File

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

2
src/effects/Paulstretch.cpp
View File

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

4
src/prefs/SpectrogramSettings.cpp
View File

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