fixing levels for delay, chorus, flanger and phaser

src/fx_chorus.cpp

@@ -6,7 +6,7 @@
 #define LFO2_MAX_FREQ 0.35f
 
 Chorus::Chorus(float32_t sampling_rate) :
-    FXElement(sampling_rate, 1.18f),
+    FXElement(sampling_rate, 1.1049f),
     engine_(sampling_rate, 0.0f),
     rate_(0.0f),
     depth_(0.0f),

src/fx_components.h

@@ -24,6 +24,9 @@
 #include <random>
 #include <cassert>
 
+#define LFO_MIN_FREQUENCY 0.01f
+#define LFO_MAX_FREQUENCY 10.0f
+
 struct Constants
 {
     const static float32_t M_PI_POW_2;  // PI^2
@@ -46,7 +49,7 @@ class FastLFO : public FXBase
     DISALLOW_COPY_AND_ASSIGN(FastLFO);
 
 public:
-    FastLFO(float32_t sampling_rate, float32_t min_frequency = 0.01f, float32_t max_frequency = 10.0f, float32_t initial_phase = 0.0f, bool centered = true);
+    FastLFO(float32_t sampling_rate, float32_t min_frequency = LFO_MIN_FREQUENCY, float32_t max_frequency = LFO_MAX_FREQUENCY, float32_t initial_phase = 0.0f, bool centered = true);
     virtual ~FastLFO();
 
     void setNormalizedFrequency(float32_t normalized_frequency);
@@ -143,7 +146,7 @@ class InterpolatedSineOscillator : public FXBase
     DISALLOW_COPY_AND_ASSIGN(InterpolatedSineOscillator);
 
 public:
-    InterpolatedSineOscillator(float32_t sampling_rate, float32_t min_frequency = 0.01f, float32_t max_frequency = 10.0f, float32_t initial_phase = 0.0f, bool centered = true);
+    InterpolatedSineOscillator(float32_t sampling_rate, float32_t min_frequency = LFO_MIN_FREQUENCY, float32_t max_frequency = LFO_MAX_FREQUENCY, float32_t initial_phase = 0.0f, bool centered = true);
     virtual ~InterpolatedSineOscillator();
 
     void setNormalizedFrequency(float32_t normalized_frequency);
@@ -237,7 +240,7 @@ public:
         Noise
     } Waveform;
 
-    ComplexLFO(float32_t sampling_rate, float32_t min_frequency = 0.01f, float32_t max_frequency = 10.0f, float32_t initial_phase = 0.0f, bool centered = true);
+    ComplexLFO(float32_t sampling_rate, float32_t min_frequency = LFO_MIN_FREQUENCY, float32_t max_frequency = LFO_MAX_FREQUENCY, float32_t initial_phase = 0.0f, bool centered = true);
     virtual ~ComplexLFO();
 
     void setWaveform(Waveform waveform);

src/fx_delay.cpp

@@ -50,7 +50,7 @@ void Delay::LowHighPassFilter::processSample(float32_t inL, float32_t inR, float
 }
 
 Delay::Delay(const float32_t sampling_rate, float32_t default_delay_time, float32_t default_flutter_level, float32_t default_feedback_level) :
-    FXElement(sampling_rate, 3.46f),
+    FXElement(sampling_rate, 2.2587f),
     MaxSampleDelayTime((MAX_DELAY_TIME + MAX_FLUTTER_DELAY_TIME) * sampling_rate * MAX_DELAY_TIME),
     read_pos_L_(0),
     read_pos_R_(0),

src/fx_flanger.cpp

@@ -1,7 +1,7 @@
 #include "fx_flanger.h"
 
 Flanger::Flanger(float32_t sampling_rate, float32_t rate, float32_t depth, float32_t feedback) :
-    FXElement(sampling_rate, 1.17f),
+    FXElement(sampling_rate, 0.9288f),
     MaxDelayLineSize(static_cast<unsigned>(MAX_FLANGER_DELAY * sampling_rate)),
     write_index_(0)
 {

src/fx_orbitone.cpp

@@ -4,7 +4,7 @@
 #define LFO_FAST_MAX_FREQUENCY 8.8f
 
 Orbitone::Orbitone(float32_t sampling_rate, float32_t rate, float32_t depth) : 
-    FXElement(sampling_rate, 1.8f),
+    FXElement(sampling_rate, 1.4442f),
     engine_(sampling_rate, 0.0f),
     depth_(0.0f),
     fullscale_depth_(0.0f)

src/fx_phaser.cpp

@@ -33,7 +33,7 @@ void Phaser::AllpassDelay::setDelay(float32_t delayL, float32_t delayR)
 
 
 Phaser::Phaser(float32_t sampling_rate, float32_t rate, float32_t depth, float32_t feedback, unsigned nb_stages) : 
-    FXElement(sampling_rate),
+    FXElement(sampling_rate, 1.3804f),
     depth_(0.0f),
     gain_(1.0f),
     feedback_(0.0f),

src/mixing_console.hpp

@@ -341,15 +341,15 @@ MixingConsole<nb_inputs>::MixingConsole(float32_t sampling_rate, size_t buffer_s
 template<size_t nb_inputs>
 MixingConsole<nb_inputs>::~MixingConsole()
 {
-    for(size_t i = 0; i < nb_inputs; ++i)
+    for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
     {
-        delete this->input_sample_buffer_[StereoChannels::Left ][i];
-        delete this->input_sample_buffer_[StereoChannels::Right][i];
+        delete this->fx_[i];
     }
 
-    for(size_t i = 0; i < MixerOutput::kFXCount; ++i)
+    for(size_t i = 0; i < nb_inputs; ++i)
     {
-        delete this->fx_[i];
+        delete[] this->input_sample_buffer_[StereoChannels::Left ][i];
+        delete[] this->input_sample_buffer_[StereoChannels::Right][i];
     }
 }
 

src/test/test_cpp_performance.cpp

@@ -29,7 +29,7 @@ TEST(CppPerformance, LFOPerformance_ComplexLFO_InterpolatedSineOscillator)
     }
     auto d2 = LAP_TIME("lfo2");
 
-    EXPECT_LE(d1, d2);
+    EXPECT_GE(d1, d2);
 }
 
 TEST(CppPerformance, LFOPerformance_ComplexLFO_FastLFO)
@@ -67,23 +67,27 @@ TEST(CppPerformance, FastLFOTuning)
     full_test_name += test_info->name();
     
     size_t NB = static_cast<size_t>(1.0f * SAMPLING_FREQUENCY);
-    float32_t freq = 5.0f;
+    float32_t freq = 0.5f;
 
     FastLFO lfo1(SAMPLING_FREQUENCY, freq, 440.0f);
     lfo1.setFrequency(freq);
 
-    ComplexLFO lfo2(SAMPLING_FREQUENCY, freq, 440.0f);
+    InterpolatedSineOscillator lfo2(SAMPLING_FREQUENCY, freq, 440.0f);
     lfo2.setFrequency(freq);
 
-    std::ofstream out(getResultFile(full_test_name + ".FastLFOTuning-data.csv", true));
+    ComplexLFO lfo3(SAMPLING_FREQUENCY, freq, 440.0f);
+    lfo3.setFrequency(freq);
+
+    std::ofstream out(getResultFile(full_test_name + ".data.csv", true));
     setupOuputStreamForCSV(out);
-    out << "index;FastLFO;ComplexLFO" << std::endl;
+    out << "index;FastLFO;InterpolatedSineOscillator;ComplexLFO" << std::endl;
     for(size_t i = 0; i < NB; ++i)
     {
         out 
             << i << ";" 
             << lfo1.process() << ";" 
-            << lfo2.process() << std::endl;
+            << lfo2.process() << ";"
+            << lfo3.process() << std::endl;
     }
     out.close();
 }