update panner.js to extend effect.js

Author: KevinGrajeda

src/oscillator.js

@@ -133,10 +133,14 @@ class Oscillator {
 
     this.oscillator.connect(this.output);
     // stereo panning
-    this.panPosition = 0.0;
     this.connection = p5sound.input; // connect to p5sound by default
-    this.panner = new Panner(this.output, this.connection, 1);
 
+    if (typeof p5sound.audiocontext.createStereoPanner !== 'undefined') {
+      this.panner = new Panner();
+      this.output.connect(this.panner);
+    } else {
+      this.panner = new Panner(this.output, this.connection, 1);
+    }
     //array of math operation signal chaining
     this.mathOps = [this.output];
 
@@ -415,21 +419,20 @@ class Oscillator {
    *                                seconds from now
    */
   pan(pval, tFromNow) {
-    this.panPosition = pval;
     this.panner.pan(pval, tFromNow);
   }
 
   /**
-   *  Returns the current value of panPosition , between Left (-1) and Right (1)
+   *  Returns the current value of pan position , between Left (-1) and Right (1)
    *
    *  @method  getPan
    *  @for p5.Oscillator
    *
-   *  @returns {number} panPosition of oscillator , between Left (-1) and Right (1)
+   *  @returns {number} pan position of oscillator , between Left (-1) and Right (1)
    */
 
   getPan() {
-    return this.panPosition;
+    return this.panner.getPan();
   }
 
   // get rid of the oscillator
@@ -442,7 +445,7 @@ class Oscillator {
       var now = p5sound.audiocontext.currentTime;
       this.stop(now);
       this.disconnect();
-      this.panner = null;
+      this.panner.dispose();
       this.oscillator = null;
     }
     // if it is a Pulse

src/panner.js

@@ -1,38 +1,49 @@
+import Effect from './effect.js';
+
 import p5sound from './main';
 var ac = p5sound.audiocontext;
 var panner;
 // Stereo panner
 // if there is a stereo panner node use it
 if (typeof ac.createStereoPanner !== 'undefined') {
-  class Panner {
-    constructor(input, output) {
-      this.stereoPanner = this.input = ac.createStereoPanner();
-      input.connect(this.stereoPanner);
-      this.stereoPanner.connect(output);
+  class Panner extends Effect {
+    constructor() {
+      super();
+      this.stereoPanner = this.ac.createStereoPanner();
+
+      this.input.connect(this.stereoPanner);
+      this.stereoPanner.connect(this.wet);
     }
 
     pan(val, tFromNow) {
-      var time = tFromNow || 0;
-      var t = ac.currentTime + time;
-
-      this.stereoPanner.pan.linearRampToValueAtTime(val, t);
+      if (typeof val === 'number') {
+        let time = tFromNow || 0;
+        this.stereoPanner.pan.linearRampToValueAtTime(
+          val,
+          this.ac.currentTime + 0.02 + time
+        );
+      } else if (typeof val !== 'undefined') {
+        val.connect(this.stereoPanner.pan);
+      }
     }
 
-    //not implemented because stereopanner
-    //node does not require this and will automatically
-    //convert single channel or multichannel to stereo.
-    //tested with single and stereo, not with (>2) multichannel
-    inputChannels() {}
-
-    connect(obj) {
-      this.stereoPanner.connect(obj);
+    getPan() {
+      return this.stereoPanner.pan.value;
     }
 
-    disconnect() {
+    dispose() {
+      super.dispose();
       if (this.stereoPanner) {
         this.stereoPanner.disconnect();
+        delete this.stereoPanner;
       }
     }
+
+    //not implemented because stereopanner
+    //node does not require this and will automatically
+    //convert single channel or multichannel to stereo.
+    //tested with single and stereo, not with (>2) multichannel
+    inputChannels() {}
   }
 
   panner = Panner;

src/soundfile.js

@@ -182,8 +182,12 @@ class SoundFile {
     this.startMillis = null;
 
     // stereo panning
-    this.panPosition = 0.0;
-    this.panner = new Panner(this.output, p5sound.input, 2);
+    if (typeof p5sound.audiocontext.createStereoPanner !== 'undefined') {
+      this.panner = new Panner();
+      this.output.connect(this.panner);
+    } else {
+      this.panner = new Panner(this.output, p5sound.input, 2);
+    }
 
     // it is possible to instantiate a soundfile with no path
     if (this.url || this.file) {
@@ -795,7 +799,6 @@ class SoundFile {
    *  </div></code>
    */
   pan(pval, tFromNow) {
-    this.panPosition = pval;
     this.panner.pan(pval, tFromNow);
   }
 
@@ -809,7 +812,7 @@ class SoundFile {
    *                          0.0 is center and default.
    */
   getPan() {
-    return this.panPosition;
+    return this.panner.getPan();
   }
 
   /**
@@ -1264,7 +1267,7 @@ class SoundFile {
       this.output = null;
     }
     if (this.panner) {
-      this.panner.disconnect();
+      this.panner.dispose();
       this.panner = null;
     }
   }