remove some of the 44.1 kHz dependencies

hollance · May 2, 2024 · 54527f5 · 54527f5
1 parent c1ba43e
commit 54527f5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/Source/AudioProcessing/Biquads.h b/Source/AudioProcessing/Biquads.h
@@ -1,17 +1,15 @@
 #pragma once
 
-#define MAX_CHANNELS 2
-
 class Biquads
 {
 public:
     Biquads() : a0(0.0f), a1(0.0f), a2(0.0f), b1(0.0f), b2(0.0f), c0(0.0f), d0(0.0f), isModifiedBiquad(false)
     {
     }
 
-    void prepareToPlay(float sampleRate) noexcept
+    void prepareToPlay(float newSampleRate) noexcept
     {
-        // TODO: don't hardcode the SAMPLE_RATE!
+        sampleRate = newSampleRate;
     }
 
     void reset() noexcept
@@ -55,7 +53,7 @@ class Biquads
         c0 = 1.0f;
         d0 = 0.0f;
 
-        float theta = fc * PI / SAMPLE_RATE;
+        float theta = fc * PI / sampleRate;
         if (theta >= 0.49f * PI) {
             theta = 0.49f * PI;
         }
@@ -84,6 +82,10 @@ class Biquads
     }
 
 private:
+    static constexpr int MAX_CHANNELS = 2;
+
+    float sampleRate;
+
     // Filter state:
     float priorIn_2[MAX_CHANNELS];     // x[n - 2]
     float priorIn_1[MAX_CHANNELS];     // x[n - 1]

diff --git a/Source/AudioProcessing/Granulate.cpp b/Source/AudioProcessing/Granulate.cpp
@@ -18,6 +18,9 @@
 #include "Granulate.h"
 #include <cmath>
 
+// TODO: make independent of SAMPLE_RATE
+#define SAMPLE_RATE 44100
+
 Granulate::Granulate(unsigned int nVoices, const char* data, int size)
 {
     rng.setSeedRandomly();

diff --git a/Source/AudioProcessing/Granulate.h b/Source/AudioProcessing/Granulate.h
@@ -24,8 +24,6 @@
 // This code was taken from STK (https://github.com/thestk/stk) and modified to
 // work with JUCE. Also tweaked it a bit for readability and to silence warnings.
 
-// TODO: make independent of SAMPLE_RATE
-
 
 class Granulate
 {

diff --git a/Source/AudioProcessing/InputSaturation.h b/Source/AudioProcessing/InputSaturation.h
@@ -17,8 +17,9 @@ class InputSaturation
         evenGain = 0.3f;
     }
 
-    void prepareToPlay(float sampleRate) noexcept
+    void prepareToPlay(float newSampleRate) noexcept
     {
+        sampleRate = newSampleRate;
         coef = 0.0f;
         setFrequencyRolloff(4000.0f);
     }
@@ -69,8 +70,7 @@ class InputSaturation
     {
         if (f < 0.0f) { f = 0.0f; }
 
-        // TODO: don't hardcode sample rate here!
-        coef = f * (2.0f * PI) / SAMPLE_RATE;
+        coef = f * (2.0f * PI) / sampleRate;
         if (coef > 1.0f) {
             coef = 1.0f;
         } else if (coef < 0.0f) {
@@ -182,6 +182,8 @@ class InputSaturation
     }
 
 private:
+    float sampleRate;
+
     float evenGain;
     float oddGain;
 

diff --git a/Source/shameConfig.h b/Source/shameConfig.h
@@ -4,9 +4,6 @@
 
 #define PI 3.14159265359f
 
-// TODO: don't hardcode the sample rate
-#define SAMPLE_RATE 44100
-
 enum EShameEnvironments
 {
     eEnvironmentEnvironment,