hack

tote-bag-labs · Aug 31, 2024 · 6fa9e3c · 6fa9e3c
1 parent 550029a
commit 6fa9e3c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/libs/tote_bag/dsp/Compressor.cpp b/libs/tote_bag/dsp/Compressor.cpp
@@ -62,7 +62,8 @@ void Compressor::setOversampleMultiplier (const int o)
     overSampleMultiplier = o - 1;
 }
 
-inline void Compressor::makeMonoSidechain (const juce::dsp::AudioBlock<float>& inAudio, juce::AudioBuffer<float>& scSignal)
+inline void Compressor::makeMonoSidechain (const juce::dsp::AudioBlock<float>& inAudio,
+                                           juce::AudioBuffer<float>& scSignal)
 {
     scSignal.clear();
     auto* scWritePointer = scSignal.getWritePointer (0);
@@ -101,7 +102,9 @@ inline float Compressor::calculateGain (float inputSample)
 
         else if (abs (doubleOvershoot) <= W)
         {
-            cvOutput = inputSample + ((1.0f / R - 1.0f) * powf (overshoot + W / 2.0f, 2)) / (2.0f * W);
+            cvOutput =
+                inputSample
+                + ((1.0f / R - 1.0f) * powf (overshoot + W / 2.0f, 2)) / (2.0f * W);
         }
         else
         {
@@ -133,7 +136,8 @@ void Compressor::process (juce::dsp::AudioBlock<float>& inAudio,
     {
         auto controlVoltage = juce::Decibels::gainToDecibels (abs (sidechain[sample]));
         // TODO: level detector methods should be float or templated
-        controlVoltage = static_cast<float> (levelDetector.processSampleDecoupledBranched (controlVoltage));
+        controlVoltage = static_cast<float> (
+            levelDetector.processSampleDecoupledBranched (controlVoltage));
 
         controlVoltage = calculateGain (controlVoltage);
         controlVoltage = juce::Decibels::decibelsToGain (controlVoltage);

diff --git a/libs/tote_bag/dsp/Compressor.h b/libs/tote_bag/dsp/Compressor.h
@@ -29,7 +29,8 @@ class Compressor
                     float inThreshold,
                     float inKnee);
 
-    void makeMonoSidechain (const juce::dsp::AudioBlock<float>& inAudio, juce::AudioBuffer<float>& scSignal);
+    void makeMonoSidechain (const juce::dsp::AudioBlock<float>& inAudio,
+                            juce::AudioBuffer<float>& scSignal);
 
     void makeKneeCoeffs();
 
@@ -52,16 +53,13 @@ class Compressor
 private:
     juce::WeakReference<FFAU::LevelMeterSource> meterSource;
 
-    juce::Atomic<float> ratio { -1.0f },
-        knee { -1.0f },
-        msAttack { -1.0f },
-        msRelease { -1.0f },
-        threshold { -1.0 };
+    juce::Atomic<float> ratio {-1.0f}, knee {-1.0f}, msAttack {-1.0f}, msRelease {-1.0f},
+        threshold {-1.0};
 
     EnvelopeDetector levelDetector;
     juce::AudioBuffer<float> analysisSignal;
 
-    int overSampleMultiplier { 1 };
+    int overSampleMultiplier {1};
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Compressor)
 };
diff --git a/src/PluginProcessor.cpp b/src/PluginProcessor.cpp
@@ -368,8 +368,22 @@ void ValentineAudioProcessor::processBlock (juce::AudioBuffer<float>& buffer,
     }
 
     auto g = compressValue.get();
-    for (int i = 0; i < totalNumOutputChannels; ++i)
-        processBuffer.applyGainRamp (i, 0, bufferSize, currentGain, g);
+
+    if (sidechainInput.getNumChannels() > 0)
+    {
+        for (int i = 0; i < totalNumOutputChannels; ++i)
+        {
+            sidechainInput.applyGainRamp (i, 0, bufferSize, currentGain, g);
+        }
+    }
+    else
+    {
+        for (int i = 0; i < totalNumOutputChannels; ++i)
+            processBuffer.applyGainRamp (i, 0, bufferSize, currentGain, g);
+    }
+
+    // for (int i = 0; i < totalNumOutputChannels; ++i)
+    //     processBuffer.applyGainRamp (i, 0, bufferSize, currentGain, g);
     currentGain = g;
 
     // Upsample then do non-linear processing

diff --git a/src/PluginProcessor.h b/src/PluginProcessor.h
@@ -199,8 +199,8 @@ class ValentineAudioProcessor : public juce::AudioProcessor,
         FFCompParameterDefaults[static_cast<size_t> (VParameter::outputClipEnable)]
         > 0.5f};
     bool clipOnState = clipOn.get();
-    juce::Atomic<bool> saturateOn = FFCompParameterDefaults[static_cast<size_t> (VParameter::saturateEnable)]
-        > 0.5f;
+    juce::Atomic<bool> saturateOn =
+        FFCompParameterDefaults[static_cast<size_t> (VParameter::saturateEnable)] > 0.5f;
     bool saturateOnState = saturateOn.get();
 
     // This is used for, yes you guessed it, processing