AnalogTapeModel

commit de7aac05fd849da3ad90c215b8372ca07edd4e59
parent 84b38a602559672e286fd1c7cee33fe20035aa0d
Author: jatinchowdhury18 <[email protected]>
Date:   Thu, 25 Jun 2020 10:06:23 -0700

v2.3.4 release

* Fix phase issues with dry/wet

* Update Win builds

* Travis build- 134 [ci skip]

* Update Mac builds

Co-authored-by: jatinchowdhury18 <[email protected]>
Co-authored-by: Travis CI <[email protected]>
Diffstat:
M
Plugin/Source/PluginProcessor.cpp
 | 
11
+++++++++--
M
Plugin/Source/Processors/DryWetProcessor.h
 | 
1
+
M
Plugin/Source/Processors/Hysteresis/HysteresisProcessor.cpp
 | 
8
++++++--
M
Plugin/Source/Processors/Hysteresis/HysteresisProcessor.h
 | 
1
+

4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Plugin/Source/PluginProcessor.cpp b/Plugin/Source/PluginProcessor.cpp
@@ -212,11 +212,18 @@ void ChowtapeModelAudioProcessor::processBlock (AudioBuffer<float>& buffer, Midi
         lossFilter[ch]->processBlock (buffer.getWritePointer (ch), buffer.getNumSamples());
     
     // delay dry buffer to avoid phase issues
-    setLatencySamples (roundToInt (calcLatencySamples()));
+    const auto latencySamp = roundToInt (calcLatencySamples());
+    setLatencySamples (latencySamp);
     for (int ch = 0; ch < buffer.getNumChannels(); ++ch)
     {
         auto* dryPtr = dryBuffer.getWritePointer (ch);
-        dryDelay[ch].setLengthMs (1000.0f * calcLatencySamples() / (float) getSampleRate());
+
+        // For "true bypass" use integer sample delay to avoid delay
+        // line interpolation freq. response issues
+        if (dryWet.getDryWet() < 0.2f)
+            dryDelay[ch].setLengthMs (1000.0f * latencySamp / (float) getSampleRate());
+        else
+            dryDelay[ch].setLengthMs (1000.0f * calcLatencySamples() / (float) getSampleRate());
         
         for (int n = 0; n < dryBuffer.getNumSamples(); ++n)
             dryPtr[n] = dryDelay[ch].delay (dryPtr[n]);
diff --git a/Plugin/Source/Processors/DryWetProcessor.h b/Plugin/Source/Processors/DryWetProcessor.h
@@ -10,6 +10,7 @@ public:
     DryWetProcessor() {}
 
     void setDryWet (float newDryWet) { dryWet = newDryWet; }
+    float getDryWet() const noexcept { return dryWet; }
 
     void reset() { lastDryWet = dryWet; }
 
diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.cpp b/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.cpp
@@ -13,6 +13,8 @@ HysteresisProcessor::HysteresisProcessor (AudioProcessorValueTreeState& vts)
     widthParam = vts.getRawParameterValue ("width");
     osParam = vts.getRawParameterValue ("os");
 
+    delayParam = vts.getRawParameterValue ("delay_factor");
+
     for (int i = 0; i < 5; ++i)
         overSample[i] = std::make_unique<dsp::Oversampling<float>>
             (2, i, dsp::Oversampling<float>::filterHalfBandPolyphaseIIR);
@@ -32,6 +34,8 @@ void HysteresisProcessor::createParameterLayout (std::vector<std::unique_ptr<Ran
     params.push_back (std::make_unique<AudioParameterFloat> ("sat", "Saturation", 0.0f, 1.0f, 0.5f));
     params.push_back (std::make_unique<AudioParameterFloat> ("width", "Bias", 0.0f, 1.0f, 0.5f));
 
+    params.push_back (std::make_unique<AudioParameterFloat> ("delay_factor", "Delay", 0.0f, 16.0f, 4.0f));
+
     params.push_back (std::make_unique<AudioParameterChoice> ("os", "Oversampling", StringArray ({"1x", "2x", "4x", "8x", "16x"}), 1));
 }
 
@@ -119,8 +123,8 @@ void HysteresisProcessor::releaseResources()
 
 float HysteresisProcessor::getLatencySamples() const noexcept
 {
-    // latency of oversampling + 1/2 sample latency from Runge-Kutta
-    return overSample[(int) *osParam]->getLatencyInSamples() + 0.5f;
+    // latency of oversampling + fudge factor for Runge-Kutta and hysteresis
+    return overSample[(int) *osParam]->getLatencyInSamples() + 1.65f;
 }
 
 void HysteresisProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& /*midi*/)
diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.h b/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.h
@@ -35,6 +35,7 @@ private:
     std::atomic<float>* satParam = nullptr;
     std::atomic<float>* widthParam = nullptr;
     std::atomic<float>* osParam = nullptr;
+    std::atomic<float>* delayParam = nullptr;
 
     SmoothedValue<float, ValueSmoothingTypes::Linear> drive[2];
     SmoothedValue<float, ValueSmoothingTypes::Linear> width[2];