Cleanup

CMakeLists.txt

@@ -9,7 +9,8 @@ set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "13")
 
 set(CLANG_COMPILER_OPTION ${CLANG_COMPILER_OPTION} -Wall -Wpedantic -Werror)
-set(MSVC_COMPILER_OPTION /W4 /WX /analyze)
+set(MSVC_COMPILER_OPTION /W4 /analyze)
+set(GCC_COMPILER_OPTION ${CLANG_COMPILER_OPTION})
 
 include_directories(include)
 

include/bowed_string.h

@@ -83,7 +83,7 @@ class BowedString
     /// @brief Tick the string.
     /// @param input Energy coming from the bridge. Optional.
     /// @return The output sample at the bridge.
-    float Tick(float input = 0.f);
+    float Tick(float input);
 
     /// @brief Set the finger pressure.
     /// @param pressure 0 is no pressure, 1 is full pressure.
@@ -105,12 +105,18 @@ class BowedString
     float samplerate_;
     float freq_;
     float velocity_ = 0.f;
+    float bow_force_ = 0.f;
     bool note_on_ = false;
 
     constexpr static float max_velocity_ = 0.2f;
     constexpr static float velocity_offset_ = 0.03f;
 
     OnePoleFilter decay_filter_;
     OnePoleFilter noise_lp_filter_;
+
+    // Smoothing filters
+    OnePoleFilter velocity_filter_;
+    OnePoleFilter force_filter_;
+    OnePoleFilter bow_position_filter_;
 };
 } // namespace sfdsp

include/string_ensemble.h

@@ -23,36 +23,6 @@ class StringEnsemble
 
     void TuneStrings(uint8_t string_num, float frequencies);
 
-    /// @brief Set the frequency of the string
-    /// @param string_number The string number to set the frequency of
-    /// @param f The frequency of the string in Hz
-    void SetFrequency(uint8_t string_number, float f);
-
-    /// @brief Returns the frequency of the string in Hz
-    /// @param string_number The string number to get the frequency of
-    /// @return The frequency of the string in Hz
-    float GetFrequency(uint8_t string_number) const;
-
-    /// @brief Set the velocity of the bow for a given string
-    /// @param string_number The string number to set the velocity of
-    /// @param v The velocity of the bow for the given string
-    void SetVelocity(uint8_t string_number, float v);
-
-    /// @brief Get the velocity of the bow for a given string
-    /// @param string_number The string number to get the velocity of
-    /// @return The velocity of the bow for the given string
-    float GetVelocity(uint8_t string_number) const;
-
-    /// @brief Set the force of the bow for a given string
-    /// @param string_number The string number to set the force of
-    /// @param f The force of the bow for the given string
-    void SetForce(uint8_t string_number, float f);
-
-    /// @brief Get the force of the bow for a given string
-    /// @param string_number The string number to get the force of
-    /// @return The force of the bow for the given string
-    float GetForce(uint8_t string_number) const;
-
     /// @brief Lift the finger off the string. Pitch of the string goes back to the open string pitch.
     /// @param string_number
     void FingerOff(uint8_t string_number);
@@ -61,10 +31,18 @@ class StringEnsemble
     /// @param t
     void SetBridgeTransmission(float t);
 
+    float GetBridgeTransmission() const;
+
     float Tick();
 
+    void ProcessBlock(float* out, size_t size);
+
+    const BowedString& operator[](uint8_t string_number) const;
+
+    BowedString& operator[](uint8_t string_number);
+
   private:
-    std::array<sfdsp::BowedString, kStringCount> strings_;
+    std::array<BowedString, kStringCount> strings_;
     std::array<float, kStringCount> openTuning_;
     float bridgeTransmission_ = 0.1f;
 

src/CMakeLists.txt

@@ -21,8 +21,11 @@ add_library(dsp STATIC ${LIB_SOURCES})
 
 target_include_directories(dsp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-if(NOT MSVC)
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   target_compile_options(dsp PRIVATE ${CLANG_COMPILER_OPTION})
-else()
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   target_compile_options(dsp PRIVATE ${MSVC_COMPILER_OPTION})
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    MESSAGE("GNU")
+  target_compile_options(dsp PRIVATE ${GCC_COMPILER_OPTION})
 endif()

src/basic_oscillators.cpp

@@ -10,6 +10,10 @@ namespace sfdsp
 
 float Sine(float phase)
 {
+    while (phase < 0.f)
+    {
+        phase += 1.f;
+    }
     phase = std::fmod(phase, 1.f);
     float idx = phase * SIN_LUT_SIZE;
     int idx0 = static_cast<int>(idx);

src/bowed_string.cpp

@@ -36,6 +36,13 @@ void BowedString::Init(float samplerate, float tuning)
     decay_filter_.SetGain(1.f);
 
     noise_lp_filter_.SetPole(0.8f);
+
+    // Smoothing filter
+    constexpr float smoothingDb = -24.f;
+    constexpr float smoothingTimeMs = 10.f;
+    velocity_filter_.SetDecayFilter(smoothingDb, smoothingTimeMs, samplerate);
+    force_filter_.SetDecayFilter(smoothingDb, smoothingTimeMs, samplerate);
+    bow_position_filter_.SetDecayFilter(smoothingDb, smoothingTimeMs, samplerate);
 }
 
 void BowedString::SetFrequency(float f)
@@ -74,12 +81,12 @@ void BowedString::SetVelocity(float v)
 
 void BowedString::SetForce(float f)
 {
-    bow_table_.SetForce(f);
+    bow_force_ = f;
 }
 
 float BowedString::GetForce() const
 {
-    return bow_table_.GetForce();
+    return bow_force_;
 }
 
 void BowedString::SetBowPosition(float pos)
@@ -136,6 +143,9 @@ float BowedString::NextOut()
 
 float BowedString::Tick(float input)
 {
+    float vel = velocity_filter_.Tick(velocity_);
+    bow_table_.SetForce(force_filter_.Tick(bow_force_));
+
     float bridge, nut;
     waveguide_.NextOut(nut, bridge);
 
@@ -145,7 +155,7 @@ float BowedString::Tick(float input)
     float bow_output = 0.f;
     if (note_on_)
     {
-        float velocity_delta = velocity_ - (vsl_plus + vsr_plus);
+        float velocity_delta = vel - (vsl_plus + vsr_plus);
         constexpr float noise_db = -30;
         const float noise_gain = std::pow(10.f, noise_db / 20.f);
 

src/string_ensemble.cpp

@@ -1,12 +1,10 @@
 #include "string_ensemble.h"
 
-#include <span>
-
 using namespace sfdsp;
 
 void StringEnsemble::Init(float samplerate, const std::array<float, kStringCount>& frequencies)
 {
-    for (auto i = 0; i < kStringCount; ++i)
+    for (size_t i = 0; i < kStringCount; ++i)
     {
         strings_[i].Init(samplerate, frequencies[i]);
     }
@@ -32,95 +30,73 @@ void StringEnsemble::TuneStrings(uint8_t string_number, float frequencies)
     strings_[string_number].SetFrequency(frequencies);
 }
 
-void StringEnsemble::SetFrequency(uint8_t string_number, float f)
+void StringEnsemble::FingerOff(uint8_t string_number)
 {
     assert(string_number < kStringCount);
-    assert(f > 0.f);
-    strings_[string_number].SetFrequency(f);
+
+    strings_[string_number].SetFrequency(openTuning_[string_number]);
 }
 
-float StringEnsemble::GetFrequency(uint8_t string_number) const
+void StringEnsemble::SetBridgeTransmission(float t)
 {
-    assert(string_number < kStringCount);
+    assert(t >= 0.f && t <= 1.f);
 
-    return strings_[string_number].GetFrequency();
+    bridgeTransmission_ = t;
 }
 
-void StringEnsemble::SetVelocity(uint8_t string_number, float v)
+float StringEnsemble::GetBridgeTransmission() const
 {
-    assert(string_number < kStringCount);
-
-    strings_[string_number].SetVelocity(v);
+    return bridgeTransmission_;
 }
 
-float StringEnsemble::GetVelocity(uint8_t string_number) const
+float StringEnsemble::Tick()
 {
-    assert(string_number < kStringCount);
-
-    return strings_[string_number].GetVelocity();
+    float out = 0;
+    ProcessBlock(&out, 1);
+    return out;
 }
 
-void StringEnsemble::SetForce(uint8_t string_number, float f)
+void StringEnsemble::ProcessBlock(float* out, size_t size)
 {
-    assert(string_number < kStringCount);
-
-    strings_[string_number].SetForce(f);
+    assert(out != nullptr);
 
-    if (f > 0.f)
+    for (size_t i = 0; i < size; ++i)
     {
-        strings_[string_number].SetNoteOn(true);
-    }
-    else
-    {
-        strings_[string_number].SetNoteOn(false);
+        std::array<float, kStringCount> string_outs;
+
+        float transmission = 0.f;
+        float output = 0.f;
+        for (size_t j = 0; i < kStringCount; ++j)
+        {
+            string_outs[j] = strings_[j].NextOut();
+            output += string_outs[j];
+            transmission += string_outs[j] * bridgeTransmission_;
+            string_outs[j] *= (1.f - bridgeTransmission_);
+        }
+
+        // filter the bridge output
+        transmission = transmission_filter_.Tick(transmission) * 0.25f;
+
+        for (size_t j = 0; i < kStringCount; ++j)
+        {
+            strings_[j].Tick(string_outs[j] + transmission);
+        }
+
+        out[i] = 0.1248f * body_filters_[5].Tick(body_filters_[4].Tick(body_filters_[3].Tick(
+                               body_filters_[2].Tick(body_filters_[1].Tick(body_filters_[0].Tick(output))))));
     }
 }
 
-float StringEnsemble::GetForce(uint8_t string_number) const
+const BowedString& StringEnsemble::operator[](uint8_t string_number) const
 {
     assert(string_number < kStringCount);
 
-    return strings_[string_number].GetForce();
+    return strings_[string_number];
 }
 
-void StringEnsemble::FingerOff(uint8_t string_number)
+BowedString& StringEnsemble::operator[](uint8_t string_number)
 {
     assert(string_number < kStringCount);
 
-    strings_[string_number].SetFrequency(openTuning_[string_number]);
-}
-
-void StringEnsemble::SetBridgeTransmission(float t)
-{
-    assert(t >= 0.f && t <= 1.f);
-
-    bridgeTransmission_ = t;
-}
-
-float StringEnsemble::Tick()
-{
-    std::array<float, kStringCount> string_outs;
-
-    float transmission = 0.f;
-    float output = 0.f;
-    for (auto i = 0; i < kStringCount; ++i)
-    {
-        string_outs[i] = strings_[i].NextOut();
-        output += string_outs[i];
-        transmission += string_outs[i] * bridgeTransmission_;
-        string_outs[i] *= (1.f - bridgeTransmission_);
-    }
-
-    // filter the bridge output
-    transmission = transmission_filter_.Tick(transmission) * 0.25f;
-
-    for (size_t i = 0; i < kStringCount; ++i)
-    {
-        strings_[i].Tick(string_outs[i] + transmission);
-    }
-
-    float out = 0.1248f * body_filters_[5].Tick(body_filters_[4].Tick(body_filters_[3].Tick(
-                              body_filters_[2].Tick(body_filters_[1].Tick(body_filters_[0].Tick(output))))));
-
-    return out;
+    return strings_[string_number];
 }

src/waveguide_gate.cpp

@@ -46,16 +46,6 @@ void WaveguideGate::SetCoeff(float c)
     coeff_ = c;
 }
 
-void PrintDelayline(const sfdsp::Delayline& line)
-{
-    printf("    ");
-    for (auto i = 0; i < 4; ++i)
-    {
-        printf("%5.2f ", line[i + 1]);
-    }
-    printf("\n");
-}
-
 void WaveguideGate::Process(Delayline& left_traveling_line, Delayline& right_traveling_line)
 {
     if (delay_ == 0 || delay_ >= left_traveling_line.GetDelay() - 2)

tests/basic_oscillators_tests.cpp

@@ -11,7 +11,7 @@
 TEST(BasicOscillatorsTest, Sine)
 {
     float inc = 1.f / 1024;
-    for (auto i = 0.f; i < TWO_PI; i += inc)
+    for (auto i = -TWO_PI; i < TWO_PI * 4; i += inc)
     {
         auto s = sfdsp::Sine(i);
         auto t = std::sin(i * TWO_PI);

tests/rms_tests.cpp

@@ -25,7 +25,7 @@ TEST_P(RMSTest, PureSine)
 
     float phase = 0.f;
 
-    for (auto i = 0; i < kLoopLength; i++)
+    for (size_t i = 0; i < kLoopLength; i++)
     {
         auto s = kAmplitude * std::sin(phase * TWO_PI);
         phase = std::fmod(phase + kPhaseInc, 1.f);

tests/test_utils.cpp

@@ -1,5 +1,7 @@
 #include "test_utils.h"
 
+#include <cstdio>
+
 void PrintWaveguide(sfdsp::Waveguide& wave, size_t delay_size)
 {
     std::vector<float> right_samples, left_samples;