Using Ddsp with Dplug >=12.x.x

.travis.yml

@@ -6,7 +6,7 @@ os:
 
 d:
  - ldc-1.8.0
- - dmd-beta
+ - ldc-1.17.0
  - dmd-2.075.0
  - dmd-2.072.1
 

README.md

@@ -1,11 +1,18 @@
-# Ddsp [![Build Status](https://travis-ci.org/ctrecordings/Ddsp.svg?branch=master)](https://travis-ci.org/ctrecordings/Ddsp) [![Dub version](https://img.shields.io/dub/v/ddsp.svg)](https://code.dlang.org/packages/ddsp) 
+# Ddsp [![Build Status](https://travis-ci.org/ctrecordings/Ddsp.svg?branch=master)](https://travis-ci.org/ctrecordings/Ddsp) [![Build Status](https://cutthroughrecordings.visualstudio.com/Ddsp/_apis/build/status/ctrecordings.Ddsp?branchName=master)](https://cutthroughrecordings.visualstudio.com/Ddsp/_build/latest?definitionId=2&branchName=master) [![Dub version](https://img.shields.io/dub/v/ddsp.svg)](https://code.dlang.org/packages/ddsp) 
 A high level library for Digital Signal Processing in D with a focus on audio.
 
 I am not an expert on DSP by any means.  Most of the designs for these plugins are ones that I have found and compiled from various books and websites.
 I have many people to thank for doing the math and work that makes it possible for someone like me to implement and use these complex equations.
 Many of these effects are based on designs from [Designing Audio Effect Plug-Ins in C++](http://www.willpirkle.com/about/books/)
 Another important source is [MusicDSP.org](http://www.musicdsp.org)
 
+# Disclaimer
+**This package is no longer actively maintained and should only be used as a reference.**
+
+I've personally pivoted to using `Faust` as the backend for any plugins I develop and intend to eventually replace all of the Ddsp code I use with it.  The main reason is that Faust has a massive library of functions that I could never hope to replicate.  Faust is also highly efficient and quick to develop with since it is designed specifically for signal processing.
+
+If you are interested in seeing how to use Faust as the backend for a Dplug plugin, see [Dplug Faust Example](https://github.com/ctrecordings/dplug-faust-example)
+
 ## Sub-Packages
 
 ### ddsp:util

azure-pipelines.yml

@@ -0,0 +1,44 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- '*'
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+jobs:
+- job: Linux
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+    - checkout: self
+      fetchDepth: 1
+
+    # Install libx11-dev package, ldc, dub, dplug-build
+    - script: |
+        # exit as soon as any line in the bash script fails
+        set -ex
+
+        # There is no permissions in default directory for system changes, so make sure to cd ..
+        cd ..
+
+        # Install libs
+        sudo apt-get -yq install libx11-dev
+
+        # Install compiler
+        curl -fsS https://dlang.org/install.sh | bash -s ldc-1.17.0 -a
+        ~/dlang/install.sh list
+        source ~/dlang/ldc-1.17.0/activate
+        ldc2 --version
+        dub --version
+
+      displayName: Install
+
+    - script: |
+        source ~/dlang/ldc-1.17.0/activate
+        dub test
+      displayName: Build and Run unit tests
+

dub.json

@@ -55,6 +55,6 @@
         }
     ],
     "dependencies": {
-        "dplug:core": ">=8.0.0 <9.0.0"
+        "dplug:core": ">=13.0.0 <14.0.0"
     }
 }

effect/ddsp/effect/compressor.d

@@ -38,7 +38,7 @@ nothrow:
         return input * calcCompressorGain(detectorValue, _threshold, _ratio, _kneeWidth);
     }
 
-private:
+protected:
 
     /// If set to true, ratio will become infinite and result in limiting
     bool _limit;
@@ -71,6 +71,11 @@ private:
     }
 }
 
+unittest
+{
+    Compressor!float compressor = new Compressor!float();
+}
+
 /// Basic look-ahead limiter that is based on the compressor from before.
 class Limiter(T) : Compressor!T
 {
@@ -113,3 +118,8 @@ private:
     /// Current amount of lookahead being used in samples.
     float _lookAheadAmount;
 }
+
+unittest
+{
+    Limiter!float limiter = new Limiter!float();
+}

effect/ddsp/effect/digitaldelay.d

@@ -8,6 +8,8 @@ module ddsp.effect.digitaldelay;
 import ddsp.effect.effect;
 import ddsp.util.functions;
 
+import dplug.core.nogc;
+
 /**
 * A general purpose Digital Delay with support for external feedback,
   fractional delay, and feedback path effects.
@@ -28,7 +30,7 @@ public:
         _mix = 0.0f;
         _useExternalFeedback = false;
 
-        _readIndex = 0;
+        _readIndex = 1;
         _writeIndex = 0;
 
         feedbackFX = makeVec!(AudioEffect!T);
@@ -42,12 +44,12 @@ public:
         _sampleRate = sampleRate;
         _feedback = 0;
         _mix = 0;
-        _size = cast(uint)sampleRate * 2;
+        _size = cast(uint)sampleRate + 1;
 
         if(buffer != null)
             free(buffer);
 
-        buffer = cast(float*) malloc(_size * float.sizeof);
+        buffer = cast(float*) mallocSlice!float(_size);
         reset();
     }
 
@@ -57,6 +59,8 @@ public:
         _delayInSamples = msToSamples(msDelay, _sampleRate);
         if(_delayInSamples > _size)
         {
+            _size = cast(size_t)_delayInSamples + 1;
+            resizeOnNextReset = true;
             reset();
         }
         else
@@ -116,6 +120,10 @@ public:
     //set all elements in the buffer to 0, and reset indices.
     override void reset() nothrow @nogc
     {
+        if(resizeOnNextReset) {
+            resizeOnNextReset = false;
+            buffer = cast(float*) mallocSlice!float(_size);
+        }
         memset(buffer, 0, _size * float.sizeof);
 
         resetIndices();
@@ -167,6 +175,7 @@ protected:
     long _readIndex;
 
     bool _useExternalFeedback;
+    bool resizeOnNextReset;
     float _feedbackIn;
 
     Vec!(AudioEffect!T) feedbackFX;

effect/ddsp/effect/dynamics.d

@@ -97,4 +97,9 @@ protected:
     float[]  x, y;
 
     //DynamicsProcessor _linkedProcessor;
+}
+
+unittest
+{
+    DynamicsProcessor!float dynamicsProcessor = new DynamicsProcessor!float();
 }

effect/ddsp/effect/expander.d

@@ -60,6 +60,11 @@ private:
     }
 }
 
+unittest
+{
+    Expander!float expander = new Expander!float();
+}
+
 class Gate(T) : Expander!T
 {
 public:
@@ -69,4 +74,9 @@ nothrow:
     {
         _gate = true;
     }
+}
+
+unittest
+{
+    Gate!float gate = new Gate!float();
 }

effect/ddsp/effect/moddelay.d

@@ -12,6 +12,8 @@ import ddsp.util.memory;
 
 import std.math;
 
+import std.algorithm : max;
+
 /// General purpose class for Modulated Delay effects. This class is used with 
 /// contraints on depth, offset, mix, and feedback to create other effects. (Flanger, Chorus, Tremolo, etc)
 class ModDelay(T) : AudioEffect!T
@@ -22,8 +24,8 @@ nothrow:
 
     this()
     {
-        lfo = calloc!WTOscillator.init();
-        delay = calloc!DigitalDelay.init();
+        lfo = calloc!(WTOscillator!T).init();
+        delay = calloc!(DigitalDelay!T).init();
     }
 
     override void setSampleRate(float sampleRate)
@@ -37,7 +39,7 @@ nothrow:
     {
         float startDelay = _min_delay + _delay_offset;
         float lfoOffset = _mod_depth * ((lfoValue + 1) / 2 * (_max_delay - _min_delay)) + _min_delay;
-        return lfoOffset + startDelay;
+        return max(lfoOffset + startDelay, 0);
     }
 
     /// Must be set before processing audio
@@ -89,8 +91,13 @@ private:
     float _max_delay;
     float _min_delay;
 
-    WTOscillator lfo;
-    DigitalDelay delay;
+    WTOscillator!T lfo;
+    DigitalDelay!T delay;
+}
+
+unittest 
+{
+    ModDelay!float modDelay = new ModDelay!float();
 }
 
 class Flanger(T) : AudioEffect!T
@@ -101,7 +108,7 @@ nothrow:
 
     this()
     {
-        _modDelay = calloc!ModDelay.init();
+        _modDelay = calloc!(ModDelay!T).init();
     }
 
 	override void setSampleRate(float sampleRate)
@@ -127,7 +134,12 @@ nothrow:
     }
 
 private:
-    ModDelay _modDelay;
+    ModDelay!T _modDelay;
+}
+
+unittest
+{
+    Flanger!float flanger = new Flanger!float();
 }
 
 class Vibrato(T) : AudioEffect!T
@@ -138,7 +150,7 @@ nothrow:
 
     this()
     {
-        _modDelay = calloc!ModDelay.init();
+        _modDelay = calloc!(ModDelay!T).init();
     }
 
 	override void setSampleRate(float sampleRate)
@@ -164,7 +176,12 @@ nothrow:
     }
 
 private:
-    ModDelay _modDelay;
+    ModDelay!T _modDelay;
+}
+
+unittest
+{
+    Vibrato!float vibrato = new Vibrato!float();
 }
 
 class Chorus(T) : AudioEffect!T
@@ -175,7 +192,7 @@ nothrow:
 
     this()
     {
-        _modDelay = calloc!ModDelay.init();
+        _modDelay = calloc!(ModDelay!T).init();
     }
 
 	override void setSampleRate(float sampleRate)
@@ -201,5 +218,10 @@ nothrow:
     }
 
 private:
-    ModDelay _modDelay;
+    ModDelay!T _modDelay;
+}
+
+unittest
+{
+    Chorus!float chorus = new Chorus!float();
 }