From a6b128affb09249aa58a2917caff7abad66a384d Mon Sep 17 00:00:00 2001
From: hogliux <fabian.renn@gmail.com>
Date: Mon, 31 Jul 2017 15:25:55 +0100
Subject: [PATCH] Fixed a window naming typo in the DSP module

---
 examples/DSPDemo/JuceLibraryCode/BinaryData.cpp | 4 ++--
 examples/DSPDemo/Source/Demos/FIRFilterDemo.cpp | 4 ++--
 modules/juce_dsp/frequency/juce_Windowing.cpp   | 8 ++++----
 modules/juce_dsp/frequency/juce_Windowing.h     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp b/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp
index 39f6f02ba4..dfd1dd4383 100644
--- a/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp
+++ b/examples/DSPDemo/JuceLibraryCode/BinaryData.cpp
@@ -1629,7 +1629,7 @@ static const unsigned char temp_binary_data_4[] =
 "        sampleRate = spec.sampleRate;\r\n"
 "\r\n"
 "        fir.state = FilterDesign<float>::designFIRLowpassWindowMethod (440.0f, sampleRate, 21,\r\n"
-"                                                                       WindowingFunction<float>::blackmann);\r\n"
+"                                                                       WindowingFunction<float>::blackman);\r\n"
 "        fir.prepare (spec);\r\n"
 "    }\r\n"
 "\r\n"
@@ -1660,7 +1660,7 @@ static const unsigned char temp_binary_data_4[] =
 "    double sampleRate = 0;\r\n"
 "\r\n"
 "    SliderParameter cutoffParam { { 20.0, 20000.0 }, 0.4, 440.0f, \"Cutoff\", \"Hz\" };\r\n"
-"    ChoiceParameter typeParam { { \"Rectangular\", \"Triangular\", \"Hann\", \"Hamming\", \"Blackmann\", \"Blackmann-Harris\", \"Flat Top\", \"Kaiser\" },\r\n"
+"    ChoiceParameter typeParam { { \"Rectangular\", \"Triangular\", \"Hann\", \"Hamming\", \"Blackman\", \"Blackman-Harris\", \"Flat Top\", \"Kaiser\" },\r\n"
 "                                5, \"Windowing Function\" };\r\n"
 "\r\n"
 "    std::vector<DSPDemoParameterBase*> parameters { &cutoffParam, &typeParam };\r\n"
diff --git a/examples/DSPDemo/Source/Demos/FIRFilterDemo.cpp b/examples/DSPDemo/Source/Demos/FIRFilterDemo.cpp
index b383717a9a..1a9ec63974 100644
--- a/examples/DSPDemo/Source/Demos/FIRFilterDemo.cpp
+++ b/examples/DSPDemo/Source/Demos/FIRFilterDemo.cpp
@@ -35,7 +35,7 @@ struct FIRFilterDemo
         sampleRate = spec.sampleRate;
 
         fir.state = FilterDesign<float>::designFIRLowpassWindowMethod (440.0f, sampleRate, 21,
-                                                                       WindowingFunction<float>::blackmann);
+                                                                       WindowingFunction<float>::blackman);
         fir.prepare (spec);
     }
 
@@ -66,7 +66,7 @@ struct FIRFilterDemo
     double sampleRate = 0;
 
     SliderParameter cutoffParam { { 20.0, 20000.0 }, 0.4, 440.0f, "Cutoff", "Hz" };
-    ChoiceParameter typeParam { { "Rectangular", "Triangular", "Hann", "Hamming", "Blackmann", "Blackmann-Harris", "Flat Top", "Kaiser" },
+    ChoiceParameter typeParam { { "Rectangular", "Triangular", "Hann", "Hamming", "Blackman", "Blackman-Harris", "Flat Top", "Kaiser" },
                                 5, "Windowing Function" };
 
     std::vector<DSPDemoParameterBase*> parameters { &cutoffParam, &typeParam };
diff --git a/modules/juce_dsp/frequency/juce_Windowing.cpp b/modules/juce_dsp/frequency/juce_Windowing.cpp
index 332a30b746..bf3fa0531f 100644
--- a/modules/juce_dsp/frequency/juce_Windowing.cpp
+++ b/modules/juce_dsp/frequency/juce_Windowing.cpp
@@ -88,7 +88,7 @@ void WindowingFunction<FloatType>::fillWindowingTables (FloatType* samples, size
         }
         break;
 
-        case blackmann:
+        case blackman:
         {
             constexpr FloatType alpha = 0.16f;
 
@@ -102,7 +102,7 @@ void WindowingFunction<FloatType>::fillWindowingTables (FloatType* samples, size
         }
         break;
 
-        case blackmannHarris:
+        case blackmanHarris:
         {
             for (size_t i = 0; i < size; ++i)
             {
@@ -174,8 +174,8 @@ const char* WindowingFunction<FloatType>::getWindowingMethodName (WindowingMetho
         case triangular:        return "Triangular";
         case hann:              return "Hann";
         case hamming:           return "Hamming";
-        case blackmann:         return "Blackmann";
-        case blackmannHarris:   return "Blackmann-Harris";
+        case blackman:          return "Blackman";
+        case blackmanHarris:    return "Blackman-Harris";
         case flatTop:           return "FlatTop";
         case kaiser:            return "Kaiser";
         default: jassertfalse;  return "";
diff --git a/modules/juce_dsp/frequency/juce_Windowing.h b/modules/juce_dsp/frequency/juce_Windowing.h
index fa06a9b561..09aa720867 100644
--- a/modules/juce_dsp/frequency/juce_Windowing.h
+++ b/modules/juce_dsp/frequency/juce_Windowing.h
@@ -38,8 +38,8 @@ struct WindowingFunction
         triangular,
         hann,
         hamming,
-        blackmann,
-        blackmannHarris,
+        blackman,
+        blackmanHarris,
         flatTop,
         kaiser,
         numWindowingMethods