Merge branch 'synths' into jvntf-synths

Author: jvntf

examples/polyphonicSynth-Keyboard/sketch.js

@@ -26,6 +26,7 @@ function setup() {
   description = createP('p5.PolySynth is a handler class for monophonic extensions '+
                 'of the p5.AudioVoice class. Use the computer keyboard to play notes on '+
                 'the piano roll. Use UP_ARROW and DOWN_ARROW to change octave');
+
 }
 
 function draw() {

src/monosynth.js

@@ -138,92 +138,6 @@ define(function (require) {
     this._isOn = false;
   };
 
-
-  /**
-     *  Set cutoms parameters to a specific synth implementation.
-     *  This method does nothing by default unless you implement
-     *  something for it.
-     *  For instance if you want to build a complex synthesizer
-     *  with one or more filters, effects etc. this is where you
-     *  will want to set their values.
-     *
-     *  @method  setParams
-     *  @param
-     *
-     */
-
-  p5.MonoSynth.prototype.setParams = function(params) {
-  };
-
-  /**
-   * loads preset values
-   * @param  {String} preset  A preset that has been written for MonoSynth
-   * @return {Object}        Return the MonoSynth
-   */
-  p5.MonoSynth.prototype.loadPreset = function(preset) {
-    var options = this[preset];
-    this.oscillator.setType(options.oscillator.type);
-
-    this.env.setADSR(options.env.attack, options.env.decay,
-          options.env.sustain, options.env.release);
-
-    this.filter.setType(options.filter.type);
-    this.filter.set(options.filter.freq, options.filter.res);
-    return this;
-  };
-
-  //PRESETS
-  p5.MonoSynth.prototype.default = {
-    'oscillator' : {
-      'type' : 'sine'
-    },
-    'env' : {
-      'attack' : 0.02,
-      'decay' : 0.25,
-      'sustain': 0.05,
-      'release': 0.35
-    },
-    'filter': {
-      'type' : 'highpass',
-      'freq' : 5,
-      'res' : 1
-    }
-  };
-
-  p5.MonoSynth.prototype.simpleBass = {
-    'oscillator' : {
-      'type' : 'square'
-    },
-    'env' : {
-      'attack': 0,
-      'decay': .60,
-      'sustain': 0.1,
-      'release': .28
-    },
-    'filter' : {
-      'type' : 'lowpass',
-      'freq' : 15000,
-      'res' : 1
-    }
-  };
-
-  p5.MonoSynth.prototype.electricPiano = {
-    'oscillator' : {
-      'type' : 'sine'
-    },
-    'env' : {
-      'attack': 0.029,
-      'decay': .16,
-      'sustain': 0.1,
-      'release': .1
-    },
-    'filter': {
-      'type' : 'lowpass',
-      'freq' : 15000,
-      'res' : 1
-    }
-  };
-
   /**
      *  Set values like a traditional
      *  <a href="https://en.wikipedia.org/wiki/Synthesizer#/media/File:ADSR_parameter.svg">

src/polysynth.js

@@ -16,7 +16,7 @@ define(function (require) {
     *  @constructor
     *  
     *  @param {Number} [synthVoice]   A monophonic synth voice inheriting
-    *                                 the AudioVoice class. Defaults ot p5.MonoSynth
+    *                                 the AudioVoice class. Defaults to p5.MonoSynth
     *
     *  @param {Number} [polyValue] Number of voices, defaults to 8;
     *
@@ -158,10 +158,10 @@ define(function (require) {
    *  @param {Number} [releaseTime]   Time in seconds from now (defaults to 0)
    **/
   p5.PolySynth.prototype.setADSR = function(a,d,s,r) {
-    this.audiovoices.forEach(function(voice){
+    this.audiovoices.forEach(function(voice) {
       voice.setADSR(a,d,s,r);
-    })
-  }
+    });
+  };
 
   /**
    *  Trigger the Attack, and Decay portion of a MonoSynth.
@@ -205,16 +205,33 @@ define(function (require) {
 
     this.notes[note] = currentVoice;
 
-    this._voicesInUse.setValueAtTime(this._voicesInUse.getValueAtTime(t) + 1, t);
+    //this._voicesInUse.setValueAtTime(this._voicesInUse.getValueAtTime(t) + 1, t);
+
+    var previousVal = this._voicesInUse._searchBefore(t) === null ? 0 : this._voicesInUse._searchBefore(t).value;
+    this._voicesInUse.setValueAtTime(previousVal + 1, t);
+    this._updateAfter(t, 1);
 
     this._newest = currentVoice;
 
     this.audiovoices[currentVoice].triggerAttack(note, velocity, tFromNow);
 
   };
 
+  p5.PolySynth.prototype._updateAfter = function(time, value) {
+
+    if(this._voicesInUse._searchAfter(time) === null) {
+      return;
+    } else{
+      this._voicesInUse._searchAfter(time).value += value;
+      var nextTime = this._voicesInUse._searchAfter(time).time;
+      this._updateAfter(nextTime, value);
+    }
+  }
+
+
+
   /**
-   *  Trigger the Release of a MonoSynth note. This is similar to releasing
+   *  Trigger the Release of an AudioVoice note. This is similar to releasing
    *  the key on a piano and letting the sound fade according to the
    *  release level and release time.
    *  
@@ -236,8 +253,14 @@ define(function (require) {
       var tFromNow = secondsFromNow || 0;
       var t = now + tFromNow;
 
-      this._voicesInUse.setValueAtTime(this._voicesInUse.getValueAtTime(t) - 1, t);
-      this.audiovoices[ this.notes[note] ].triggerRelease(secondsFromNow);
+      // this._voicesInUse.setValueAtTime(this._voicesInUse.getValueAtTime(t)-1, t);
+      // console.log('value at time: '+ t +' value '+this._voicesInUse.getValueAtTime(t));
+      var previousVal = this._voicesInUse._searchBefore(t) === null ? 0 : this._voicesInUse._searchBefore(t).value;
+      this._voicesInUse.setValueAtTime(previousVal - 1, t);
+      this._updateAfter(t, -1);
+
+
+      this.audiovoices[ this.notes[note] ].triggerRelease(tFromNow);
       this.notes[note] = undefined;
 
       this._newest = this._newest === 0 ? 0 : (this._newest - 1) % (this.polyValue - 1);