minor style tweaks

reillypascal · reillypascal · commit 8d6d26753dfd · 2025-07-29T23:25:16.000-04:00
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ cmake -S . -B build/ -D CMAKE_BUILD_TYPE=Release
 cmake --build build
 ```
 
-You can also use CMake to generate Xcode/Visual Studio projects:
+You can also use CMake to generate Xcode/Visual Studio projects.
 - Run the following to generate an Xcode project:
 ```sh
 cmake -B Builds -G Xcode
diff --git a/Source/ConcertHallB.cpp b/Source/ConcertHallB.cpp
@@ -1,12 +1,4 @@
-/*
-  ==============================================================================
-
-    ConcertHallB.cpp
-    Created: 4 Jun 2023 4:38:39pm
-    Author:  Reilly Spitzfaden
-
-  ==============================================================================
-*/
+// Concert Hall B algorithm, based on Dattorro
 
 #include "ConcertHallB.h"
 
@@ -16,7 +8,7 @@ LargeConcertHallB::~LargeConcertHallB() = default;
 
 void LargeConcertHallB::prepare(const juce::dsp::ProcessSpec& spec)
 {
-    mSampleRate = spec.sampleRate;
+    sampleRate = spec.sampleRate;
     
     // prepare filters
     inputBandwidth.prepare(spec);
@@ -389,7 +381,7 @@ void LargeConcertHallB::reset()
     allpassR4Inner.reset();
     allpassR4Outer.reset();
         
-    lfo.reset(mSampleRate);
+    lfo.reset(sampleRate);
 }
 
 ReverbProcessorParameters& LargeConcertHallB::getParameters() { return parameters; }
diff --git a/Source/ConcertHallB.h b/Source/ConcertHallB.h
@@ -1,12 +1,4 @@
-/*
-  ==============================================================================
-
-    ConcertHallB.h
-    Created: 4 Jun 2023 4:38:39pm
-    Author:  Reilly Spitzfaden
-
-  ==============================================================================
-*/
+// Concert Hall B algorithm, based on Dattorro
 
 #pragma once
 
@@ -98,7 +90,7 @@ class LargeConcertHallB : public ReverbProcessorBase
     std::vector<float> channelFeedback {0, 0};
     std::vector<float> channelOutput {0, 0};
     
-    int mSampleRate = 44100;
+    int sampleRate = 44100;
 };
 
 //class LargeConcertHallB : public ProcessorBase
diff --git a/Source/CustomDelays.cpp b/Source/CustomDelays.cpp
@@ -1,13 +1,8 @@
-/*
-  ==============================================================================
-
-    Tapped delay line, Allpass classes
-
-  ==============================================================================
-*/
+// Tapped delay line, Allpass classes
 
 #include <algorithm>
 #include "CustomDelays.h"
+#include "Utilities.h"
 
 template <typename SampleType>
 DelayLineWithSampleAccess<SampleType>::DelayLineWithSampleAccess(int maximumDelayInSamples)
diff --git a/Source/CustomDelays.h b/Source/CustomDelays.h
@@ -1,16 +1,12 @@
 /*
-  ==============================================================================
-
-    Tapped delay line, Allpass classes
-    Delay based on juce::dsp::DelayLine, but allows access to the underlying buffer at specified sample offsets for multiple-tap delays.
-
-  ==============================================================================
+Tapped delay line, Allpass classes
+Delay based on juce::dsp::DelayLine, but allows access to the underlying buffer at specified sample offsets for multiple-tap delays.
 */
 
 #pragma once
 
 #include <JuceHeader.h>
-#include "Utilities.h"
+// #include "Utilities.h"
 
 template <typename SampleType>
 class DelayLineWithSampleAccess
diff --git a/Source/DattorroVerb.cpp b/Source/DattorroVerb.cpp
@@ -1,10 +1,4 @@
-/*
-  ==============================================================================
-
-	Plate reverb "in the style of Griesinger" from Dattorro 1997
-
-  ==============================================================================
-*/
+// Plate reverb "in the style of Griesinger" from Dattorro 1997
 
 #include "DattorroVerb.h"
 
diff --git a/Source/DattorroVerb.h b/Source/DattorroVerb.h
@@ -1,10 +1,4 @@
-/*
-  ==============================================================================
-
-    Plate reverb "in the style of Griesinger" from Dattorro 1997
-
-  ==============================================================================
-*/
+// Plate reverb "in the style of Griesinger" from Dattorro 1997
 
 #pragma once
 
diff --git a/Source/EarlyReflections.cpp b/Source/EarlyReflections.cpp
@@ -1,12 +1,4 @@
-/*
-  ==============================================================================
-
-    EarlyReflections.cpp
-    Created: 9 Jun 2024 3:48:05pm
-    Author:  Reilly Spitzfaden
-
-  ==============================================================================
-*/
+// FIR-based early reflections with 6 taps and HRTF for binaural stereo. Based on Dattorro
 
 #include "EarlyReflections.h"
 
diff --git a/Source/EarlyReflections.h b/Source/EarlyReflections.h
@@ -1,13 +1,8 @@
+// FIR-based early reflections with 6 taps and HRTF for binaural stereo. Based on Dattorro
 /*
-  ==============================================================================
- 
-	FIR-based early reflections with 6 taps and HRTF for binaural stereo. Based on Dattorro
- 
  TODO:
  - implement predelay
  - diffusion?
-
-  ==============================================================================
 */
 
 #pragma once
diff --git a/Source/FDNs.cpp b/Source/FDNs.cpp
@@ -1,12 +1,7 @@
-/*
-  ==============================================================================
-
-    Collection of FDN (feedback delay network) algorithms
-
-  ==============================================================================
-*/
+// Collection of FDN (feedback delay network) algorithms
 
 #include "FDNs.h"
+#include <cstddef>
 
 GeneralizedFDN::GeneralizedFDN() = default;
 
@@ -22,7 +17,7 @@ GeneralizedFDN::GeneralizedFDN(int order, std::string type)
         { "Householder", 4 }
     };
     
-    int switchCase { 1 };
+    int switchCase = 1;
     
     auto iter = typeMapping.find(type);
     if (iter != typeMapping.end())
@@ -45,7 +40,7 @@ GeneralizedFDN::GeneralizedFDN(int order, std::string type)
             inDelays = { 4, 6 };
             modDelays = { 1, 3 };
             
-            feedbackScalar = 1 / sqrt(2.0);
+            feedbackScalar = 1.0f / sqrt(2.0f);
             break;
         
         case 2: // circulant
@@ -168,7 +163,7 @@ void GeneralizedFDN::processBlock(juce::AudioBuffer<float>& buffer, juce::MidiBu
     }
     
     // set delay times
-    for (int i = 0; i < delayCount; ++i)
+    for (size_t i = 0; i < delayCount; ++i)
         delays[i].setDelay(delayTimes[i] * parameters.roomSize);
     
     // set damping
@@ -201,6 +196,7 @@ void GeneralizedFDN::processBlock(juce::AudioBuffer<float>& buffer, juce::MidiBu
             for (int del = 0; del < delayCount; ++del)
             {
                 // only include input if this delay is the input for the channel
+                // inDelays is input delay *indices*
                 if (channel < 2 && del == inDelays[channel])
                 {
                     delays[del].pushSample(channel, channelData[sample] + dampingFilters[del].processSample(channel, feedbackSigMatrix[channel][del] * parameters.decayTime));
diff --git a/Source/FDNs.h b/Source/FDNs.h
@@ -1,10 +1,4 @@
-/*
-  ==============================================================================
-
-    Collection of FDN (feedback delay network) algorithms
-
-  ==============================================================================
-*/
+// Collection of FDN (feedback delay network) algorithms
 
 #pragma once
 
@@ -50,7 +44,7 @@ class GeneralizedFDN : public ReverbProcessorBase
     SignalGenData lfoOutput;
     std::vector<LFO> lfo;
     
-    float feedbackScalar { sqrt(2.0f) };
+    float feedbackScalar = sqrt(2.0f);
     
     std::vector<std::vector<float>> feedbackMatrix {
         { 0, 0, 0, 0, 0, 0, 1, 1 },
@@ -67,7 +61,7 @@ class GeneralizedFDN : public ReverbProcessorBase
     std::vector<int> inDelays { 4, 6 };
     std::vector<int> modDelays { 1, 3 };
     
-    int delayCount { 8 };
+    int delayCount = 8;
 };
 
 //===================================================================
diff --git a/Source/Freeverb.cpp b/Source/Freeverb.cpp
@@ -1,12 +1,4 @@
-/*
-  ==============================================================================
-
-    Freeverb.cpp
-    Created: 3 Jun 2023 4:34:15pm
-    Author:  Reilly Spitzfaden
-
-  ==============================================================================
-*/
+// "Freeverb"-style Schroeder reverb; 8 parallel combs -> 4 series allpasses
 
 #include "Freeverb.h"
 
diff --git a/Source/Freeverb.h b/Source/Freeverb.h
@@ -1,10 +1,4 @@
-/*
-  ==============================================================================
-
-    "Freeverb"-style Schroeder reverb; 8 parallel combs -> 4 series allpasses
-
-  ==============================================================================
-*/
+// "Freeverb"-style Schroeder reverb; 8 parallel combs -> 4 series allpasses
 
 #pragma once
 
diff --git a/Source/GardnerRooms.cpp b/Source/GardnerRooms.cpp
@@ -24,6 +24,9 @@ void GardnerSmallRoom::prepare(const juce::dsp::ProcessSpec &spec)
     delay5.prepare(spec);
     delay6.prepare(spec);
     
+    // for (auto& delay : delays)
+    //     delay.prepare(spec);
+    
     dampingFilter.prepare(spec);
     dampingFilter.setType(juce::dsp::FirstOrderTPTFilterType::lowpass);
     
@@ -67,6 +70,8 @@ void GardnerSmallRoom::processBlock(juce::AudioBuffer<float> &buffer, juce::Midi
         delay5.setDelay(delay5Time);
         delay6.setDelay(36 * samplesPerMs * parameters.roomSize + channelDelayOffset[channel]);
         
+        // for (size_t delay = 0; delay < delayTimesMs.size(); ++delay) {}
+        
         for (int sample = 0; sample < buffer.getNumSamples(); ++sample)
         {
             // LFO
@@ -160,7 +165,7 @@ GardnerMediumRoom::~GardnerMediumRoom() = default;
 
 void GardnerMediumRoom::prepare(const juce::dsp::ProcessSpec& spec)
 {
-    mSampleRate = spec.sampleRate;
+    sampleRate = spec.sampleRate;
         
     delay1.prepare(spec);
     delay2.prepare(spec);
@@ -197,7 +202,7 @@ void GardnerMediumRoom::processBlock(juce::AudioBuffer<float>& buffer, juce::Mid
     input2Buffer.clear();
     input2Buffer.makeCopyOf(buffer, false);
     
-    float samplesPerMs = mSampleRate / 1000;
+    float samplesPerMs = sampleRate / 1000;
     
     dampingFilter.setCutoffFrequency(parameters.damping);
     
@@ -349,7 +354,7 @@ GardnerLargeRoom::~GardnerLargeRoom() = default;
 
 void GardnerLargeRoom::prepare(const juce::dsp::ProcessSpec& spec)
 {
-    mSampleRate = spec.sampleRate;
+    sampleRate = spec.sampleRate;
         
     delay1.prepare(spec);
     delay2.prepare(spec);
@@ -383,7 +388,7 @@ void GardnerLargeRoom::processBlock(juce::AudioBuffer<float>& buffer, juce::Midi
 {
     juce::ScopedNoDenormals noDenormals;
     
-    float samplesPerMs = mSampleRate / 1000;
+    float samplesPerMs = sampleRate / 1000;
     
     dampingFilter.setCutoffFrequency(parameters.damping);
     
diff --git a/Source/GardnerRooms.h b/Source/GardnerRooms.h
@@ -14,6 +14,8 @@
 #include "ProcessorBase.h"
 #include "Utilities.h"
 
+// want shorter alias because of repetitive syntax for std::vector with size as *member* variable
+typedef juce::dsp::DelayLine<float> DelayLine;
 
 //==============================================================================
 class GardnerSmallRoom :public ReverbProcessorBase
@@ -42,6 +44,9 @@ class GardnerSmallRoom :public ReverbProcessorBase
     juce::dsp::DelayLine<float> delay4 { 22050 };
     juce::dsp::DelayLine<float> delay5 { 22050 };
     juce::dsp::DelayLine<float> delay6 { 22050 };
+    // need to use this verbose syntax for initializing with size as *member* variable
+    std::vector<DelayLine> delays = std::vector<DelayLine>(6, DelayLine(22050));
+    std::vector<float> delayTimesMs { 24.0f, 22.0f, 8.3f, 4.7f, 30.0f, 36.0f };
     
     juce::dsp::FirstOrderTPTFilter<float> dampingFilter;
     
@@ -113,7 +118,7 @@ class GardnerMediumRoom : public ReverbProcessorBase
     
     std::vector<float> channelDelayOffset {0, 15};
     
-    int mSampleRate { 44100 };
+    int sampleRate = 44100;
 };
 
 
@@ -167,7 +172,7 @@ class GardnerLargeRoom : public ReverbProcessorBase
     
     std::vector<float> channelDelayOffset {0, 23};
     
-    int mSampleRate { 44100 };
+    int sampleRate = 44100;
 };
 
 //class GardnerSmallRoom : public ProcessorBase
diff --git a/Source/GuiStyles.h b/Source/GuiStyles.h
@@ -1,13 +1,9 @@
-/*
-  ==============================================================================
-
-    LookAndFeel class definition
- 
-  ==============================================================================
-*/
+// LookAndFeel class definition
 
 #pragma once
 
+#include <JuceHeader.h>
+
 //look and feel of sliders/labels
 class GrayBlueLookAndFeel : public juce::LookAndFeel_V4
 {
diff --git a/Source/LFO.cpp b/Source/LFO.cpp
@@ -1,10 +1,4 @@
-/*
-  ==============================================================================
-
-	Sine/tri/saw LFO with quadrature output
-
-  ==============================================================================
-*/
+// Sine/tri/saw LFO with quadrature output
 
 #include "LFO.h"
 LFO::LFO() { srand(static_cast<uint32_t>(time(NULL))); }
diff --git a/Source/LFO.h b/Source/LFO.h
@@ -1,14 +1,8 @@
-/*
-  ==============================================================================
-
-    Sine/tri/saw LFO with quadrature output
-
-  ==============================================================================
-*/
+// Sine/tri/saw LFO with quadrature output
 
 #pragma once
 
-#include <cmath>
+// #include <cmath>
 
 #include <JuceHeader.h>
 
diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp
diff --git a/Source/PluginEditor.h b/Source/PluginEditor.h
diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
diff --git a/Source/PluginProcessor.h b/Source/PluginProcessor.h
diff --git a/Source/ProcessorBase.h b/Source/ProcessorBase.h
diff --git a/Source/SpecialFX.cpp b/Source/SpecialFX.cpp
diff --git a/Source/SpecialFX.h b/Source/SpecialFX.h
diff --git a/Source/Utilities.h b/Source/Utilities.h
