Merge pull request #738 from KevinGrajeda/onNewInput

davepagurek · web-flow · commit 517a7b78fbdd · 2023-01-27T19:46:29.000-05:00
add `_onNewInput()` hook
diff --git a/src/amplitude.js b/src/amplitude.js
@@ -177,25 +177,6 @@ class Amplitude {
     }
   }
 
-  connect(unit) {
-    if (unit) {
-      if (unit.hasOwnProperty('input')) {
-        this.output.connect(unit.input);
-      } else {
-        this.output.connect(unit);
-      }
-    }
-    // else {
-    //   this.output.connect(this.panner.connect(p5sound.input));
-    // }
-  }
-
-  disconnect() {
-    if (this.output) {
-      this.output.disconnect();
-    }
-  }
-
   /**
    *  Returns a single Amplitude reading at the moment it is called.
    *  For continuous readings, run in the draw loop.
diff --git a/src/audioVoice.js b/src/audioVoice.js
@@ -34,6 +34,9 @@ class AudioVoice {
   connect(unit) {
     var u = unit || p5sound.input;
     this.output.connect(u.input ? u.input : u);
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
diff --git a/src/audioin.js b/src/audioin.js
@@ -211,6 +211,9 @@ class AudioIn {
     } else {
       this.output.connect(p5sound.input);
     }
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
@@ -395,7 +398,7 @@ class AudioIn {
       this.output.disconnect();
     }
     if (this.amplitude) {
-      this.amplitude.disconnect();
+      this.amplitude.dispose();
     }
     delete this.amplitude;
     delete this.output;
diff --git a/src/effect.js b/src/effect.js
@@ -122,6 +122,9 @@ class Effect {
   connect(unit) {
     var u = unit || p5.soundOut.input;
     this.output.connect(u.input ? u.input : u);
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
diff --git a/src/envelope.js b/src/envelope.js
@@ -810,6 +810,9 @@ class Envelope {
     }
 
     this.output.connect(unit);
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   disconnect() {
diff --git a/src/fft.js b/src/fft.js
@@ -614,6 +614,11 @@ class FFT {
 
     return octaveBands;
   }
+
+  _onNewInput() {
+    //  disconnect FFT from sketch when something is connected
+    p5sound.fftMeter.disconnect();
+  }
 }
 
 // helper methods to convert type from float (dB) to int (0-255)
diff --git a/src/gain.js b/src/gain.js
@@ -106,6 +106,9 @@ class Gain {
   connect(unit) {
     var u = unit || p5.soundOut.input;
     this.output.connect(u.input ? u.input : u);
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
diff --git a/src/monosynth.js b/src/monosynth.js
@@ -355,6 +355,9 @@ class MonoSynth extends AudioVoice {
   connect(unit) {
     var u = unit || p5sound.input;
     this.output.connect(u.input ? u.input : u);
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
diff --git a/src/oscillator.js b/src/oscillator.js
@@ -387,6 +387,9 @@ class Oscillator {
       this.panner.connect(unit);
       this.connection = unit;
     }
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
diff --git a/src/panner.js b/src/panner.js
@@ -150,6 +150,9 @@ if (typeof ac.createStereoPanner !== 'undefined') {
 
     connect(obj) {
       this.output.connect(obj);
+      if (obj && obj._onNewInput) {
+        obj._onNewInput(this);
+      }
     }
 
     disconnect() {
diff --git a/src/polysynth.js b/src/polysynth.js
@@ -428,6 +428,9 @@ class PolySynth {
   connect(unit) {
     var u = unit || p5sound.input;
     this.output.connect(u.input ? u.input : u);
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
diff --git a/src/soundfile.js b/src/soundfile.js
@@ -1293,6 +1293,9 @@ class SoundFile {
         this.panner.connect(unit);
       }
     }
+    if (unit && unit._onNewInput) {
+      unit._onNewInput(this);
+    }
   }
 
   /**
diff --git a/test/tests/p5.Amplitude.js b/test/tests/p5.Amplitude.js
@@ -41,21 +41,6 @@ describe('p5.Amplitude', function () {
       amp.setInput();
     });
 
-    it('can be connected and disconnected from a unit', function () {
-      let filter = new p5.Filter();
-
-      //if unit has input property
-      amp.connect(filter);
-      amp.disconnect();
-
-      //if unit doesnot have an input property
-      amp = new p5.Amplitude();
-      amp.connect(filter.input);
-      amp.disconnect();
-
-      filter.dispose();
-    });
-
     it('can toggle normalization', function () {
       expect(amp.normalize).to.be.false;
       amp.toggleNormalize();
diff --git a/test/tests/p5.AudioIn.js b/test/tests/p5.AudioIn.js
@@ -109,5 +109,13 @@ describe('p5.AudioIn', function () {
         done();
       });
     });
+
+    it('can execute _onNewInput() hook on connected unit', function (done) {
+      const gain = new p5.Gain();
+      gain._onNewInput = function () {
+        done();
+      };
+      mic.connect(gain);
+    });
   });
 });
diff --git a/test/tests/p5.AudioVoice.js b/test/tests/p5.AudioVoice.js
@@ -25,4 +25,12 @@ describe('p5.AudioVoice', function () {
     av.connect(filter.input);
     av.disconnect();
   });
+  it('can execute _onNewInput() hook on connected unit', function (done) {
+    let av = new p5.AudioVoice();
+    const gain = new p5.Gain();
+    gain._onNewInput = function () {
+      done();
+    };
+    av.connect(gain);
+  });
 });
diff --git a/test/tests/p5.Effect.js b/test/tests/p5.Effect.js
@@ -81,5 +81,13 @@ describe('p5.Effect', function () {
       expect(effect._drywet.fade.value).to.equal(0.5);
       expect(effect.drywet()).to.equal(0.5);
     });
+    it('can execute _onNewInput() hook on connected unit', function (done) {
+      const effect = new p5.Effect();
+      const gain = new p5.Gain();
+      gain._onNewInput = function () {
+        done();
+      };
+      effect.connect(gain);
+    });
   });
 });
diff --git a/test/tests/p5.Envelope.js b/test/tests/p5.Envelope.js
@@ -264,6 +264,14 @@ describe('p5.Envelope', function () {
       envelope.connect(reverb.output.gain);
       envelope.disconnect();
     });
+    it('can execute _onNewInput() hook on connected unit', function (done) {
+      let envelope = new p5.Envelope(0.1, 0.65, 0.5, 0.5, 0.35, 0.4);
+      const gain = new p5.Gain();
+      gain._onNewInput = function () {
+        done();
+      };
+      envelope.connect(gain);
+    });
 
     //todo: signal math
   });
diff --git a/test/tests/p5.Gain.js b/test/tests/p5.Gain.js
@@ -59,6 +59,13 @@ describe('p5.Gain', function () {
         gain.connect(filter);
         gain.disconnect();
       });
+      it('can execute _onNewInput() hook on connected unit', function (done) {
+        const gainToConnect = new p5.Gain();
+        gainToConnect._onNewInput = function () {
+          done();
+        };
+        gain.connect(gainToConnect);
+      });
     });
     describe('amp', function () {
       it('can take only volume as input', function () {
diff --git a/test/tests/p5.MonoSynth.js b/test/tests/p5.MonoSynth.js
@@ -207,5 +207,13 @@ describe('p5.MonoSynth', function () {
       monosynth.connect(compressor);
       monosynth.disconnect();
     });
+    it('can execute _onNewInput() hook on connected unit', function (done) {
+      let monosynth = new p5.MonoSynth();
+      const gain = new p5.Gain();
+      gain._onNewInput = function () {
+        done();
+      };
+      monosynth.connect(gain);
+    });
   });
 });
diff --git a/test/tests/p5.Oscillator.js b/test/tests/p5.Oscillator.js
@@ -292,5 +292,13 @@ describe('p5.Oscillator', function () {
       osc.add(3).mult(5);
       osc.scale(0, 1, 0, 4);
     });
+    it('can execute _onNewInput() hook on connected unit', function (done) {
+      let osc = new p5.Oscillator();
+      const gain = new p5.Gain();
+      gain._onNewInput = function () {
+        done();
+      };
+      osc.connect(gain);
+    });
   });
 });
diff --git a/test/tests/p5.Panner.js b/test/tests/p5.Panner.js
@@ -36,4 +36,12 @@ describe('p5.Panner', function () {
     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);
+  });
 });
diff --git a/test/tests/p5.PolySynth.js b/test/tests/p5.PolySynth.js
@@ -294,5 +294,13 @@ describe('p5.PolySynth', function () {
       polySynth.connect(compressor);
       polySynth.disconnect();
     });
+    it('can execute _onNewInput() hook on connected unit', function (done) {
+      let polySynth = new p5.PolySynth(p5.MonoSynth, 4);
+      const gain = new p5.Gain();
+      gain._onNewInput = function () {
+        done();
+      };
+      polySynth.connect(gain);
+    });
   });
 });
diff --git a/test/tests/p5.SoundFile.js b/test/tests/p5.SoundFile.js
@@ -882,5 +882,14 @@ describe('p5.SoundFile', function () {
         expect(sf.getBlob().type).to.equal('audio/wav');
       });
     });
+
+    it('can execute _onNewInput() hook on connected unit', function (done) {
+      let sf = new p5.SoundFile();
+      const gain = new p5.Gain();
+      gain._onNewInput = function () {
+        done();
+      };
+      sf.connect(gain);
+    });
   });
 });

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ class AudioVoice {`
`34`	`34`	`connect(unit) {`
`35`	`35`	`var u = unit \|\| p5sound.input;`
`36`	`36`	`this.output.connect(u.input ? u.input : u);`
	`37`	`+ if (unit && unit._onNewInput) {`
	`38`	`+ unit._onNewInput(this);`
	`39`	`+ }`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,9 @@ class AudioIn {`
`211`	`211`	`} else {`
`212`	`212`	`this.output.connect(p5sound.input);`
`213`	`213`	`}`
	`214`	`+ if (unit && unit._onNewInput) {`
	`215`	`+ unit._onNewInput(this);`
	`216`	`+ }`
`214`	`217`	`}`
`215`	`218`
`216`	`219`	`/**`
`@@ -395,7 +398,7 @@ class AudioIn {`
`395`	`398`	`this.output.disconnect();`
`396`	`399`	`}`
`397`	`400`	`if (this.amplitude) {`
`398`		`- this.amplitude.disconnect();`
	`401`	`+ this.amplitude.dispose();`
`399`	`402`	`}`
`400`	`403`	`delete this.amplitude;`
`401`	`404`	`delete this.output;`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,9 @@ class Effect {`
`122`	`122`	`connect(unit) {`
`123`	`123`	`var u = unit \|\| p5.soundOut.input;`
`124`	`124`	`this.output.connect(u.input ? u.input : u);`
	`125`	`+ if (unit && unit._onNewInput) {`
	`126`	`+ unit._onNewInput(this);`
	`127`	`+ }`
`125`	`128`	`}`
`126`	`129`
`127`	`130`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -810,6 +810,9 @@ class Envelope {`
`810`	`810`	`}`
`811`	`811`
`812`	`812`	`this.output.connect(unit);`
	`813`	`+ if (unit && unit._onNewInput) {`
	`814`	`+ unit._onNewInput(this);`
	`815`	`+ }`
`813`	`816`	`}`
`814`	`817`
`815`	`818`	`disconnect() {`
Original file line number	Diff line number	Diff line change
`@@ -614,6 +614,11 @@ class FFT {`
`614`	`614`
`615`	`615`	`return octaveBands;`
`616`	`616`	`}`
	`617`	`+`
	`618`	`+ _onNewInput() {`
	`619`	`+ // disconnect FFT from sketch when something is connected`
	`620`	`+ p5sound.fftMeter.disconnect();`
	`621`	`+ }`
`617`	`622`	`}`
`618`	`623`
`619`	`624`	`// helper methods to convert type from float (dB) to int (0-255)`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ class Gain {`
`106`	`106`	`connect(unit) {`
`107`	`107`	`var u = unit \|\| p5.soundOut.input;`
`108`	`108`	`this.output.connect(u.input ? u.input : u);`
	`109`	`+ if (unit && unit._onNewInput) {`
	`110`	`+ unit._onNewInput(this);`
	`111`	`+ }`
`109`	`112`	`}`
`110`	`113`
`111`	`114`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,9 @@ class MonoSynth extends AudioVoice {`
`355`	`355`	`connect(unit) {`
`356`	`356`	`var u = unit \|\| p5sound.input;`
`357`	`357`	`this.output.connect(u.input ? u.input : u);`
	`358`	`+ if (unit && unit._onNewInput) {`
	`359`	`+ unit._onNewInput(this);`
	`360`	`+ }`
`358`	`361`	`}`
`359`	`362`
`360`	`363`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -387,6 +387,9 @@ class Oscillator {`
`387`	`387`	`this.panner.connect(unit);`
`388`	`388`	`this.connection = unit;`
`389`	`389`	`}`
	`390`	`+ if (unit && unit._onNewInput) {`
	`391`	`+ unit._onNewInput(this);`
	`392`	`+ }`
`390`	`393`	`}`
`391`	`394`
`392`	`395`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,9 @@ if (typeof ac.createStereoPanner !== 'undefined') {`
`150`	`150`
`151`	`151`	`connect(obj) {`
`152`	`152`	`this.output.connect(obj);`
	`153`	`+ if (obj && obj._onNewInput) {`
	`154`	`+ obj._onNewInput(this);`
	`155`	`+ }`
`153`	`156`	`}`
`154`	`157`
`155`	`158`	`disconnect() {`