update panner fallback to extend effect

Author: KevinGrajeda

src/oscillator.js

@@ -135,12 +135,8 @@ class Oscillator {
     // stereo panning
     this.connection = p5sound.input; // connect to p5sound by default
 
-    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);
-    }
+    this.panner = new Panner();
+    this.output.connect(this.panner);
     //array of math operation signal chaining
     this.mathOps = [this.output];
 

src/panner.js

@@ -74,46 +74,38 @@ if (typeof ac.createStereoPanner !== 'undefined') {
         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;
 } else {
   // if there is no createStereoPanner object
   // such as in safari 7.1.7 at the time of writing this
   // use this method to create the effect
-  class Panner {
-    constructor(input, output, numInputChannels) {
-      this.input = ac.createGain();
-      input.connect(this.input);
+  class Panner extends Effect {
+    constructor() {
+      super();
+
+      // 'explicit' channelCountMode will convert any number of channels to stereo
+      this.input.channelCountMode = 'explicit';
 
       this.panValue = 0;
       this.left = ac.createGain();
       this.right = ac.createGain();
       this.left.channelInterpretation = 'discrete';
       this.right.channelInterpretation = 'discrete';
 
-      // if input is stereo
-      if (numInputChannels > 1) {
-        this.splitter = ac.createChannelSplitter(2);
-        this.input.connect(this.splitter);
+      this.splitter = ac.createChannelSplitter(2);
+      this.merger = ac.createChannelMerger(2);
 
-        this.splitter.connect(this.left, 1);
-        this.splitter.connect(this.right, 0);
-      } else {
-        this.input.connect(this.left);
-        this.input.connect(this.right);
-      }
+      this.input.connect(this.splitter);
 
-      this.output = ac.createChannelMerger(2);
-      this.left.connect(this.output, 0, 1);
-      this.right.connect(this.output, 0, 0);
-      this.output.connect(output);
+      this.splitter.connect(this.left, 1);
+      this.splitter.connect(this.right, 0);
+
+      this.left.connect(this.merger, 0, 1);
+      this.right.connect(this.merger, 0, 0);
+
+      this.merger.connect(this.wet);
     }
 
     // -1 is left, +1 is right
@@ -132,44 +124,8 @@ if (typeof ac.createStereoPanner !== 'undefined') {
       return this.panValue;
     }
 
-    inputChannels(numChannels) {
-      if (numChannels === 1) {
-        this.input.disconnect();
-        this.input.connect(this.left);
-        this.input.connect(this.right);
-      } else if (numChannels === 2) {
-        if (typeof this.splitter === 'undefined') {
-          this.splitter = ac.createChannelSplitter(2);
-        }
-        this.input.disconnect();
-        this.input.connect(this.splitter);
-        this.splitter.connect(this.left, 1);
-        this.splitter.connect(this.right, 0);
-      }
-    }
-
-    connect(obj) {
-      this.output.connect(obj);
-      if (obj && obj._onNewInput) {
-        obj._onNewInput(this);
-      }
-    }
-
-    disconnect() {
-      if (this.output) {
-        this.output.disconnect();
-      }
-    }
-
     dispose() {
-      if (this.input) {
-        this.input.disconnect();
-        delete this.input;
-      }
-      if (this.output) {
-        this.output.disconnect();
-        delete this.output;
-      }
+      super.dispose();
       if (this.left) {
         this.left.disconnect();
         delete this.left;
@@ -182,6 +138,10 @@ if (typeof ac.createStereoPanner !== 'undefined') {
         this.splitter.disconnect();
         delete this.splitter;
       }
+      if (this.merger) {
+        this.merger.disconnect();
+        delete this.merger;
+      }
     }
   }
   panner = Panner;

src/soundfile.js

@@ -182,12 +182,8 @@ class SoundFile {
     this.startMillis = null;
 
     // stereo panning
-    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);
-    }
+    this.panner = new Panner();
+    this.output.connect(this.panner);
 
     // it is possible to instantiate a soundfile with no path
     if (this.url || this.file) {
@@ -248,7 +244,6 @@ class SoundFile {
             function (buff) {
               if (!self.panner) return;
               self.buffer = buff;
-              self.panner.inputChannels(buff.numberOfChannels);
               if (callback) {
                 callback(self);
               }
@@ -323,7 +318,6 @@ class SoundFile {
         ac.decodeAudioData(reader.result, function (buff) {
           if (!self.panner) return;
           self.buffer = buff;
-          self.panner.inputChannels(buff.numberOfChannels);
           if (callback) {
             callback(self);
           }
@@ -1357,9 +1351,6 @@ class SoundFile {
     }
 
     this.buffer = newBuffer;
-
-    // set numbers of channels on input to the panner
-    this.panner.inputChannels(numChannels);
   }
 
   // initialize counterNode, set its initial buffer and playbackRate

test/tests/p5.Panner.js

@@ -1,10 +1,9 @@
 const expect = chai.expect;
 
 describe('p5.Panner', function () {
-  let ac, output, input;
+  let ac, input;
   beforeEach(function () {
     ac = p5.prototype.getAudioContext();
-    output = ac.createGain();
     input = ac.createGain();
   });
   it('can be created', function () {
@@ -24,24 +23,11 @@ describe('p5.Panner', function () {
     }, 25);
   });
   it('can be panned with a delay', function (done) {
-    let panner = new p5.Panner(input, output);
+    let panner = new p5.Panner();
     panner.pan(-0.7, 0.1);
     setTimeout(() => {
       expect(panner.getPan()).to.be.approximately(-0.7, 0.01);
       done();
     }, 125);
   });
-  it('can take inputChannels as 1 or 2', function () {
-    let panner = new p5.Panner(input, output);
-    panner.inputChannels(1);
-    panner.inputChannels(2);
-  });
-  it('can execute _onNewInput() hook on connected unit', function (done) {
-    let panner = new p5.Panner(input, output);
-    const gain = new p5.Gain();
-    gain._onNewInput = function () {
-      done();
-    };
-    panner.connect(gain);
-  });
 });

test/tests/p5.SoundFile.js

@@ -31,7 +31,7 @@ describe('p5.SoundFile', function () {
     expect(sf.mode).to.equal('sustain');
     expect(sf.startMillis).to.be.null;
     expect(sf.getPan()).to.equal(0);
-    expect(sf.panner).to.have.property('stereoPanner');
+    expect(sf).to.have.property('panner');
     expect(p5.soundOut.soundArray).to.include(sf);
 
     expect(sf._whileLoading).to.not.throw();