Unify sample rate in the internal audio engine

Author: juzzlin

src/CMakeLists.txt

@@ -66,8 +66,8 @@ set(HEADER_FILES
   domain/arpeggiator.hpp
   domain/column.hpp
   domain/column_settings.hpp
-  domain/devices/device.hpp
   domain/devices/delay_effect.hpp
+  domain/devices/device.hpp
   domain/devices/effect.hpp
   domain/devices/high_pass_filter_effect.hpp
   domain/devices/low_pass_filter_effect.hpp
@@ -219,6 +219,7 @@ set(SOURCE_FILES
   domain/song.cpp
   domain/track.cpp
   domain/devices/device.cpp
+  domain/devices/effect.cpp
   domain/devices/delay_effect.cpp
   domain/devices/high_pass_filter_effect.cpp
   domain/devices/low_pass_filter_effect.cpp
@@ -229,6 +230,7 @@ set(SOURCE_FILES
   domain/devices/volume_effect.cpp
   domain/dsp/adsr_envelope.cpp
   domain/dsp/cascaded_svf.cpp
+  domain/dsp/dsp_component.cpp
   domain/dsp/lfo.cpp
   domain/dsp/multi_engine.cpp
   domain/dsp/polyblep_oscillator.cpp

src/application/service/jack_service.cpp

@@ -15,6 +15,7 @@
 
 #include "jack_service.hpp"
 
+#include "../../common/constants.hpp"
 #include "../../contrib/SimpleLogger/src/simple_logger.hpp"
 #include "../../infra/audio/audio_engine.hpp"
 #include "settings_service.hpp"
@@ -156,7 +157,7 @@ double JackService::bpm() const
 
 uint32_t JackService::sampleRate() const
 {
-    return m_client ? jack_get_sample_rate(m_client) : 48000;
+    return m_client ? jack_get_sample_rate(m_client) : static_cast<uint32_t>(Constants::defaultSampleRate());
 }
 
 jack_nframes_t JackService::currentFrame() const

src/application/service/sampler_controller.cpp

@@ -1,5 +1,7 @@
 #include "sampler_controller.hpp"
 #include "../models/sampler/sampler_pad_model.hpp"
+#include "../../common/constants.hpp"
+#include "../../common/utils.hpp"
 #include "../../common/waveform_generator.hpp"
 #include "../../domain/devices/sampler_device.hpp"
 
@@ -43,7 +45,12 @@ void SamplerController::setSampler(SamplerDevice::SamplerDeviceS sampler)
 
 uint32_t SamplerController::sampleRate() const
 {
-    return m_sampler ? m_sampler->sampleRate() : 44100;
+    return m_sampler ? m_sampler->sampleRate() : static_cast<uint32_t>(Constants::defaultSampleRate());
+}
+
+float SamplerController::cutoffToHz(float cutoff) const
+{
+    return Utils::Dsp::cutoffToHz(cutoff / 100.0f, static_cast<float>(sampleRate()));
 }
 
 int SamplerController::selectedPad() const

src/application/service/sampler_controller.hpp

@@ -48,6 +48,7 @@ class SamplerController : public QObject
     ~SamplerController() override;
 
     uint32_t sampleRate() const;
+    Q_INVOKABLE float cutoffToHz(float cutoff) const;
 
     SamplerPadModel * padModel() const;
     SamplerDevice::SamplerDeviceS sampler() const;

src/application/service/synth_controller.cpp

@@ -14,6 +14,8 @@
 // along with Noteahead. If not, see <http://www.gnu.org/licenses/>.
 
 #include "synth_controller.hpp"
+#include "../../common/constants.hpp"
+#include "../../common/utils.hpp"
 #include "../../domain/devices/synth_device.hpp"
 #include "../../domain/devices/synth_presets.hpp"
 
@@ -130,7 +132,12 @@ void SynthController::setMasterPan(int p) { if (m_synth) { m_synth->setMasterPan
 int SynthController::masterVolume() const { return m_synth ? static_cast<int>(std::round(m_synth->masterVolume() * 100.0f)) : 0; }
 void SynthController::setMasterVolume(int v) { if (m_synth) { m_synth->setMasterVolume(v / 100.0f); emit masterVolumeChanged(); } }
 
-uint32_t SynthController::sampleRate() const { return m_synth ? m_synth->sampleRate() : 44100; }
+uint32_t SynthController::sampleRate() const { return m_synth ? m_synth->sampleRate() : static_cast<uint32_t>(Constants::defaultSampleRate()); }
+
+float SynthController::cutoffToHz(float cutoff) const
+{
+    return Utils::Dsp::cutoffToHz(cutoff / 100.0f, static_cast<float>(sampleRate()));
+}
 
 QStringList SynthController::presetNames() const
 {

src/application/service/synth_controller.hpp

@@ -151,6 +151,7 @@ class SynthController : public QObject
     int masterVolume() const; void setMasterVolume(int v);
 
     uint32_t sampleRate() const;
+    Q_INVOKABLE float cutoffToHz(float cutoff) const;
 
     QStringList presetNames() const;
 

src/common/constants.cpp

@@ -87,6 +87,11 @@ QString synthDeviceName()
     return "Notealogue";
 }
 
+double defaultSampleRate()
+{
+    return 48000.0;
+}
+
 namespace NahdXml {
 
 QString xmlKeyFileFormatVersion()

src/common/constants.hpp

@@ -44,6 +44,8 @@ int transposeMax();
 QString samplerDeviceName();
 QString synthDeviceName();
 
+double defaultSampleRate();
+
 namespace NahdXml {
 
 QString xmlKeyFileFormatVersion();

src/common/utils.cpp

@@ -150,4 +150,15 @@ std::optional<std::chrono::milliseconds> readMSecAttribute(QXmlStreamReader & re
 }
 
 } // namespace Xml
+namespace Dsp {
+float cutoffToHz(float cutoff, float sampleRate)
+{
+    const float maxFreq = std::min(20000.0f, sampleRate * 0.49f);
+    if (cutoff <= 0.0f) return 0.0f;
+    // Map 0..1 to 0..maxFreq using a formula that goes through 0.
+    // We'll use f = maxFreq * (pow(1000.0, cutoff) - 1.0) / 999.0
+    // This gives a nice logarithmic feel.
+    return maxFreq * (std::pow(1000.0f, cutoff) - 1.0f) / 999.0f;
+}
+} // namespace Dsp
 } // namespace noteahead::Utils

src/common/utils.hpp

@@ -45,6 +45,9 @@ std::optional<size_t> readUIntAttribute(QXmlStreamReader & reader, QString name,
 std::optional<QString> readStringAttribute(QXmlStreamReader & reader, QString name, bool required = true);
 std::optional<std::chrono::milliseconds> readMSecAttribute(QXmlStreamReader & reader, QString name, bool required = true);
 } // namespace Xml
+namespace Dsp {
+float cutoffToHz(float cutoff, float sampleRate);
+} // namespace Dsp
 } // namespace noteahead::Utils
 
 #endif // UTILS_HPP