rebuild lib

Author: therewasaguy

lib/p5.sound.js

@@ -9648,18 +9648,32 @@ reverb = function () {
    */
   p5.Reverb = function () {
     Effect.call(this);
-    this.convolverNode = this.ac.createConvolver();
+    this._initConvolverNode();
     // otherwise, Safari distorts
     this.input.gain.value = 0.5;
-    this.input.connect(this.convolverNode);
-    this.convolverNode.connect(this.wet);
     // default params
     this._seconds = 3;
     this._decay = 2;
     this._reverse = false;
     this._buildImpulse();
   };
   p5.Reverb.prototype = Object.create(Effect.prototype);
+  p5.Reverb.prototype._initConvolverNode = function () {
+    this.convolverNode = this.ac.createConvolver();
+    this.input.connect(this.convolverNode);
+    this.convolverNode.connect(this.wet);
+  };
+  p5.Reverb.prototype._teardownConvolverNode = function () {
+    if (this.convolverNode) {
+      this.convolverNode.disconnect();
+      delete this.convolverNode;
+    }
+  };
+  p5.Reverb.prototype._setBuffer = function (audioBuffer) {
+    this._teardownConvolverNode();
+    this._initConvolverNode();
+    this.convolverNode.buffer = audioBuffer;
+  };
   /**
    *  Connect a source to the reverb, and assign reverb parameters.
    *
@@ -9759,14 +9773,11 @@ reverb = function () {
       impulseL[i] = (Math.random() * 2 - 1) * Math.pow(1 - n / length, decay);
       impulseR[i] = (Math.random() * 2 - 1) * Math.pow(1 - n / length, decay);
     }
-    this.convolverNode.buffer = impulse;
+    this._setBuffer(impulse);
   };
   p5.Reverb.prototype.dispose = function () {
     Effect.prototype.dispose.apply(this);
-    if (this.convolverNode) {
-      this.convolverNode.buffer = null;
-      this.convolverNode = null;
-    }
+    this._teardownConvolverNode();
   };
   // =======================================================================
   //                          *** p5.Convolver ***
@@ -9825,19 +9836,17 @@ reverb = function () {
    *  </code></div>
    */
   p5.Convolver = function (path, callback, errorCallback) {
-    Effect.call(this);
+    p5.Reverb.call(this);
     /**
      *  Internally, the p5.Convolver uses the a
      *  <a href="http://www.w3.org/TR/webaudio/#ConvolverNode">
      *  Web Audio Convolver Node</a>.
      *
-     *  @property {ConvolverNode} convolverNod
+     *  @property {ConvolverNode} convolverNode
      */
-    this.convolverNode = this.ac.createConvolver();
+    this._initConvolverNode();
     // otherwise, Safari distorts
     this.input.gain.value = 0.5;
-    this.input.connect(this.convolverNode);
-    this.convolverNode.connect(this.wet);
     if (path) {
       this.impulses = [];
       this._loadBuffer(path, callback, errorCallback);
@@ -9935,7 +9944,7 @@ reverb = function () {
           buffer.name = chunks[chunks.length - 1];
           buffer.audioBuffer = buff;
           self.impulses.push(buffer);
-          self.convolverNode.buffer = buffer.audioBuffer;
+          self._setBuffer(buffer.audioBuffer);
           if (callback) {
             callback(buffer);
           }
@@ -10072,29 +10081,25 @@ reverb = function () {
    */
   p5.Convolver.prototype.toggleImpulse = function (id) {
     if (typeof id === 'number' && id < this.impulses.length) {
-      this.convolverNode.buffer = this.impulses[id].audioBuffer;
+      this._setBuffer(this.impulses[id].audioBuffer);
     }
     if (typeof id === 'string') {
       for (var i = 0; i < this.impulses.length; i++) {
         if (this.impulses[i].name === id) {
-          this.convolverNode.buffer = this.impulses[i].audioBuffer;
+          this._setBuffer(this.impulses[i].audioBuffer);
           break;
         }
       }
     }
   };
   p5.Convolver.prototype.dispose = function () {
-    Effect.prototype.dispose.apply(this);
+    p5.Reverb.prototype.dispose.apply(this);
     // remove all the Impulse Response buffers
     for (var i in this.impulses) {
       if (this.impulses[i]) {
         this.impulses[i] = null;
       }
     }
-    if (this.convolverNode) {
-      this.convolverNode.disconnect();
-      this.concolverNode = null;
-    }
   };
 }(errorHandler, effect);
 /** Tone.js module by Yotam Mann, MIT License 2016  http://opensource.org/licenses/MIT **/