From 2673e28f4a0a6dd950ab168549187bf7a69dda8c Mon Sep 17 00:00:00 2001
From: Steve Daulton <stevedaulton@gmail.com>
Date: Thu, 14 Mar 2019 10:10:20 +0000
Subject: [PATCH] Correct "Hanning window" to "Hann window"

Updated in user facing text and comments. Variable names left as is.
---
 src/FFT.cpp                    | 6 +++---
 src/effects/Equalization.cpp   | 2 +-
 src/effects/NoiseReduction.cpp | 2 +-
 src/effects/NoiseRemoval.cpp   | 4 ++--
 src/effects/ToneGen.cpp        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/FFT.cpp b/src/FFT.cpp
index 5b1acc768..ac79c81fb 100644
--- a/src/FFT.cpp
+++ b/src/FFT.cpp
@@ -343,7 +343,7 @@ const wxChar *WindowFuncName(int whichFunction)
    case eWinFuncHamming:
       return wxT("Hamming");
    case eWinFuncHanning:
-      return wxT("Hanning");
+      return wxT("Hann");
    case eWinFuncBlackman:
       return wxT("Blackman");
    case eWinFuncBlackmanHarris:
@@ -404,7 +404,7 @@ void NewWindowFunc(int whichFunction, size_t NumSamplesIn, bool extraSample, flo
       break;
    case eWinFuncHanning:
    {
-      // Hanning
+      // Hann
       const double multiplier = 2 * M_PI / NumSamples;
       static const double coeff0 = 0.5, coeff1 = -0.5;
       for (int ii = 0; ii < NumSamples; ++ii)
@@ -601,7 +601,7 @@ void DerivativeOfWindowFunc(int whichFunction, size_t NumSamples, bool extraSamp
       break;
    case eWinFuncHanning:
    {
-      // Hanning
+      // Hann
       const double multiplier = 2 * M_PI / NumSamples;
       const double coeff1 = -0.5 * multiplier;
       for (int ii = 0; ii < (int)NumSamples; ++ii)
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index 9393d3adb..da57fe7be 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -28,7 +28,7 @@
    Also allows the curve to be specified with a series of 'graphic EQ'
    sliders.
 
-   The filter is applied using overlap/add of Hanning windows.
+   The filter is applied using overlap/add of Hann windows.
 
    Clone of the FFT Filter effect, no longer part of Audacity.
 
diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp
index 29292377b..1d6af1f7d 100644
--- a/src/effects/NoiseReduction.cpp
+++ b/src/effects/NoiseReduction.cpp
@@ -29,7 +29,7 @@
   but if it were, there would be a significant delay.
 
   The gain controls are applied to the complex FFT of the signal,
-  and then the inverse FFT is applied.  A Hanning window may be
+  and then the inverse FFT is applied.  A Hann window may be
   applied (depending on the advanced window types setting), and then
   the output signal is then pieced together using overlap/add.
 
diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp
index 9921d4801..98ca16d16 100644
--- a/src/effects/NoiseRemoval.cpp
+++ b/src/effects/NoiseRemoval.cpp
@@ -27,7 +27,7 @@
   but if it were, there would be a significant delay.
 
   The gain controls are applied to the complex FFT of the signal,
-  and then the inverse FFT is applied, followed by a Hanning window;
+  and then the inverse FFT is applied, followed by a Hann window;
   the output signal is then pieced together using overlap/add of
   half the window size.
 
@@ -288,7 +288,7 @@ void EffectNoiseRemoval::Initialize()
    mWindow.reinit(mWindowSize);
    mOutOverlapBuffer.reinit(mWindowSize);
 
-   // Create a Hanning window function
+   // Create a Hann window function
    for(size_t i=0; i<mWindowSize; i++)
       mWindow[i] = 0.5 - 0.5 * cos((2.0*M_PI*i) / mWindowSize);
 
diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp
index 76112917e..7835c678e 100644
--- a/src/effects/ToneGen.cpp
+++ b/src/effects/ToneGen.cpp
@@ -217,7 +217,7 @@ size_t EffectToneGen::ProcessBlock(float **WXUNUSED(inBlock), float **outBlock,
          f = pre4divPI * sin(pre2PI * mPositionInCycles / mSampleRate);
          for (k = 3; (k < 200) && (k * BlendedFrequency < mSampleRate / 2.0); k += 2)
          {
-            //Hanning Window in freq domain
+            //Hann Window in freq domain
             a = 1.0 + cos((pre2PI * k * BlendedFrequency) / mSampleRate);
             //calc harmonic, apply window, scale to amplitude of fundamental
             f += a * sin(pre2PI * mPositionInCycles / mSampleRate * k) / (b * k);