Merge branch 'main' of https://github.com/AudioKit/SoundpipeAudioKit

Author: aure

Sources/CSoundpipeAudioKit/Effects/CostelloReverbDSP.mm

@@ -7,18 +7,21 @@
 enum CostelloReverbParameter : AUParameterAddress {
     CostelloReverbParameterFeedback,
     CostelloReverbParameterCutoffFrequency,
+    CostelloReverbParameterBalance,
 };
 
 class CostelloReverbDSP : public SoundpipeDSPBase {
 private:
     sp_revsc *revsc;
     ParameterRamper feedbackRamp;
     ParameterRamper cutoffFrequencyRamp;
+    ParameterRamper balanceRamp{1.0};
 
 public:
     CostelloReverbDSP() {
         parameters[CostelloReverbParameterFeedback] = &feedbackRamp;
         parameters[CostelloReverbParameterCutoffFrequency] = &cutoffFrequencyRamp;
+        parameters[CostelloReverbParameterBalance] = &balanceRamp;
     }
 
     void init(int channelCount, double sampleRate) override {
@@ -47,14 +50,20 @@ void process(FrameRange range) override {
             float leftIn = inputSample(0, i);
             float rightIn = inputSample(1, i);
 
-            float &leftOut = outputSample(0, i);
-            float &rightOut = outputSample(1, i);
+            float leftWet;
+            float rightWet;
 
-            sp_revsc_compute(sp, revsc, &leftIn, &rightIn, &leftOut, &rightOut);
+            sp_revsc_compute(sp, revsc, &leftIn, &rightIn, &leftWet, &rightWet);
+
+            float bal = balanceRamp.getAndStep();
+
+            outputSample(0, i) = bal * leftWet + (1-bal) * leftIn;
+            outputSample(1, i) = bal * rightWet + (1-bal) * rightIn;
         }
     }
 };
 
 AK_REGISTER_DSP(CostelloReverbDSP, "rvsc")
 AK_REGISTER_PARAMETER(CostelloReverbParameterFeedback)
 AK_REGISTER_PARAMETER(CostelloReverbParameterCutoffFrequency)
+AK_REGISTER_PARAMETER(CostelloReverbParameterBalance)

Sources/CSoundpipeAudioKit/Effects/DiodeLadderFilterDSP.mm

@@ -0,0 +1,66 @@
+// Copyright AudioKit. All Rights Reserved.
+
+#include "SoundpipeDSPBase.h"
+#include "ParameterRamper.h"
+#include "Soundpipe.h"
+
+enum DiodeLadderFilterParameter : AUParameterAddress {
+    DiodeLadderFilterParameterCutoffFrequency,
+    DiodeLadderFilterParameterResonance,
+};
+
+class DiodeLadderFilterDSP : public SoundpipeDSPBase {
+private:
+    sp_diode *diode0;
+    sp_diode *diode1;
+    ParameterRamper cutoffFrequencyRamp;
+    ParameterRamper resonanceRamp;
+
+public:
+    DiodeLadderFilterDSP() {
+        parameters[DiodeLadderFilterParameterCutoffFrequency] = &cutoffFrequencyRamp;
+        parameters[DiodeLadderFilterParameterResonance] = &resonanceRamp;
+    }
+
+    void init(int channelCount, double sampleRate) override {
+        SoundpipeDSPBase::init(channelCount, sampleRate);
+        sp_diode_create(&diode0);
+        sp_diode_init(sp, diode0);
+        sp_diode_create(&diode1);
+        sp_diode_init(sp, diode1);
+    }
+
+    void deinit() override {
+        SoundpipeDSPBase::deinit();
+        sp_diode_destroy(&diode0);
+        sp_diode_destroy(&diode1);
+    }
+
+    void reset() override {
+        SoundpipeDSPBase::reset();
+        if (!isInitialized) return;
+        sp_diode_init(sp, diode0);
+        sp_diode_init(sp, diode1);
+    }
+
+    void process(FrameRange range) override {
+        for (int i : range) {
+
+            diode0->freq = diode1->freq = cutoffFrequencyRamp.getAndStep();
+            diode0->res = diode1->res = resonanceRamp.getAndStep();
+
+            float leftIn = inputSample(0, i);
+            float rightIn = inputSample(1, i);
+
+            float &leftOut = outputSample(0, i);
+            float &rightOut = outputSample(1, i);
+
+            sp_diode_compute(sp, diode0, &leftIn, &leftOut);
+            sp_diode_compute(sp, diode1, &rightIn, &rightOut);
+        }
+    }
+};
+
+AK_REGISTER_DSP(DiodeLadderFilterDSP, "diod")
+AK_REGISTER_PARAMETER(DiodeLadderFilterParameterCutoffFrequency)
+AK_REGISTER_PARAMETER(DiodeLadderFilterParameterResonance)

Sources/SoundpipeAudioKit/Effects/CostelloReverb.swift

@@ -46,6 +46,19 @@ public class CostelloReverb: Node {
     /// Low-pass cutoff frequency.
     @Parameter(cutoffFrequencyDef) public var cutoffFrequency: AUValue
 
+    /// Dry/wet mix.
+    public static let balanceDef = NodeParameterDef(
+        identifier: "balance",
+        name: "Balance",
+        address: akGetParameterAddress("CostelloReverbParameterBalance"),
+        defaultValue: 1,
+        range: 0 ... 1,
+        unit: .percent
+    )
+
+    /// Dry/wet mix. Should be a value between 0-1.
+    @Parameter(balanceDef) public var balance: AUValue
+
     // MARK: - Initialization
 
     /// Initialize this reverb node

Sources/SoundpipeAudioKit/Effects/DiodeLadderFilter.swift

@@ -0,0 +1,70 @@
+// Copyright AudioKit. All Rights Reserved. Revision History at http://github.com/AudioKit/SoundpipeAudioKit/
+
+import AudioKit
+import AudioKitEX
+import AVFoundation
+import CAudioKitEX
+
+/// Diode Ladder Filter is an new digital implementation of the VCS3 ladder filter
+/// based on the work of Will Pirkle
+/// "Virtual Analog (VA) Diode Ladder Filter"
+///
+public class DiodeLadderFilter: Node {
+    let input: Node
+
+    /// Connected nodes
+    public var connections: [Node] { [input] }
+
+    /// Underlying AVAudioNode
+    public var avAudioNode = instantiate(effect: "diod")
+
+    // MARK: - Parameters
+
+    /// Specification for cutoffFrequency (still determining best ranges)
+    public static let cutoffFrequencyDef = NodeParameterDef(
+        identifier: "cutoffFrequency",
+        name: "Cutoff Frequency",
+        address: akGetParameterAddress("DiodeLadderFilterParameterCutoffFrequency"),
+        defaultValue: 1000.0,
+        range: 12.0 ... 20000.0,
+        unit: .hertz
+    )
+
+    /// Filter cutoff frequency
+    @Parameter(cutoffFrequencyDef) public var cutoffFrequency: AUValue
+
+    /// Specification for resonance (still determining best ranges)
+    public static let resonanceDef = NodeParameterDef(
+        identifier: "resonance",
+        name: "Resonance",
+        address: akGetParameterAddress("DiodeLadderFilterParameterResonance"),
+        defaultValue: 0.5,
+        range: 0.0 ... 1.0,
+        unit: .generic
+    )
+
+    /// Resonance
+    @Parameter(resonanceDef) public var resonance: AUValue
+
+    // MARK: - Initialization
+
+    /// Initialize this filter node
+    ///
+    /// - Parameters:
+    ///   - input: Input node to process
+    ///   - cutoffFrequency: Filter cutoff frequency
+    ///   - resonance: Resonance
+    ///
+    public init(
+        _ input: Node,
+        cutoffFrequency: AUValue = cutoffFrequencyDef.defaultValue,
+        resonance: AUValue = resonanceDef.defaultValue
+    ) {
+        self.input = input
+
+        setupParameters()
+
+        self.cutoffFrequency = cutoffFrequency
+        self.resonance = resonance
+    }
+}