fixed error caused by many layers of scheduling

Author: jvntf

src/monosynth.js

@@ -37,7 +37,7 @@ define(function (require) {
     AudioVoice.call(this);
 
     this.oscillator = new p5.Oscillator();
-    this.oscillator.disconnect();
+    // this.oscillator.disconnect();
 
     this.env = new p5.Env();
     this.env.setRange(1, 0);
@@ -52,12 +52,13 @@ define(function (require) {
 
     // oscillator --> env --> filter --> this.output (gain) --> p5.soundOut
 
-    this.oscillator.connect(this.filter);
+    // this.oscillator.connect(this.filter);
     this.env.setInput(this.oscillator);
     this.env.connect(this.filter);
     this.filter.connect(this.output);
 
     this.oscillator.start();
+    this.connect();
 
     //Audiovoices are connected to soundout by default
 
@@ -102,7 +103,7 @@ define(function (require) {
     // set range of env (TO DO: allow this to be scheduled in advance)
     var vel = velocity || 1;
 
-    this.triggerAttack(note,velocity,secondsFromNow);
+    this.triggerAttack(note,vel,secondsFromNow);
     this.triggerRelease(secondsFromNow + susTime);
   };
 
@@ -117,15 +118,13 @@ define(function (require) {
      *  @method  triggerAttack
      */  
   p5.MonoSynth.prototype.triggerAttack = function (note, velocity, secondsFromNow) {
-
-    var now = p5sound.audiocontext.currentTime;
+    //scheduling in relation to audioContext.currentTime will be handeled by oscillator.frew() and env.ramp()
     var tFromNow = secondsFromNow || 0;
-    var t = now + tFromNow;
     var n = p5.prototype.midiToFreq(note);
-    
     this._isOn = true;
-    this.oscillator.freq(n, 0, t);
-    this.env.ramp(this.output, t, velocity);
+
+    this.oscillator.freq(n, 0, tFromNow);
+    this.env.ramp(this.output, tFromNow, velocity);
   };
 
   /**
@@ -169,7 +168,7 @@ define(function (require) {
     this.oscillator.setType(options.oscillator.type);
 
     this.env.setADSR(options.env.attack, options.env.decay,
-            options.env.sustain, options.env.release);
+          options.env.sustain, options.env.release);
 
     this.filter.setType(options.filter.type);
     this.filter.set(options.filter.freq, options.filter.res);

src/polysynth.js

@@ -75,6 +75,7 @@ define(function (require) {
     this._voicesInUse = new TimelineSignal(0);
 
     this.output = p5sound.audiocontext.createGain();
+    this.connect();
 
     //Construct the appropriate number of audiovoices
     this._allocateVoices();
@@ -175,7 +176,11 @@ define(function (require) {
    */  
   p5.PolySynth.prototype.noteAttack = function (_note, _velocity, secondsFromNow) {
     var now =  p5sound.audiocontext.currentTime;
+
+    //this value goes to the audiovoices which handle their own scheduling
     var tFromNow = secondsFromNow || 0;
+
+    //this value is used by this._voicesInUse
     var t = now + tFromNow;
 
     var note = _note === undefined ?  60 : _note;
@@ -204,7 +209,7 @@ define(function (require) {
 
     this._newest = currentVoice;
 
-    this.audiovoices[currentVoice].triggerAttack(note, velocity, secondsFromNow);
+    this.audiovoices[currentVoice].triggerAttack(note, velocity, tFromNow);
 
   };
 
@@ -231,7 +236,6 @@ define(function (require) {
       var tFromNow = secondsFromNow || 0;
       var t = now + tFromNow;
 
-
       this._voicesInUse.setValueAtTime(this._voicesInUse.value - 1, t);
       this.audiovoices[ this.notes[note] ].triggerRelease(secondsFromNow);
       this.notes[note] = undefined;