Merge branch 'main' of https://github.com/processing/p5.js-sound into adding-new-tests-for-uncovered-files

satyasaibhushan · satyasaibhushan · commit 6cc8dda4489c · 2021-08-17T11:55:55.000+05:30
diff --git a/.eslintrc b/.eslintrc
@@ -34,7 +34,7 @@
    
   },
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 8,
     "sourceType": "module",
     "allowImportExportEverywhere": true
     }
diff --git a/lib/p5.sound.js b/lib/p5.sound.js
diff --git a/lib/p5.sound.js.map b/lib/p5.sound.js.map
diff --git a/lib/p5.sound.min.js b/lib/p5.sound.min.js
diff --git a/lib/p5.sound.min.js.map b/lib/p5.sound.min.js.map
diff --git a/src/looper.js b/src/looper.js
@@ -392,7 +392,9 @@ class Score {
     var thisScore = this;
     for (var i in arguments) {
       this.parts[i] = arguments[i];
-      if (i > 0) this.parts[i - 1].nextPart = this.parts[i];
+      if (i > 0) {
+        this.parts[i - 1].nextPart = this.parts[i];
+      }
       this.parts[i].onended = function () {
         thisScore.resetPart(i);
         playNextPart(thisScore);
diff --git a/src/polysynth.js b/src/polysynth.js
@@ -1,6 +1,6 @@
 import p5sound from './main';
 import TimelineSignal from 'Tone/signal/TimelineSignal.js';
-import { noteToFreq, freqToMidi } from './helpers';
+import { noteToFreq } from './helpers';
 
 /**
  *  An AudioVoice is used as a single voice for sound synthesis.
@@ -274,9 +274,7 @@ class PolySynth {
     else {
       currentVoice = this._oldest;
 
-      oldestNote = freqToMidi(
-        this.audiovoices[this._oldest].oscillator.freq().value
-      );
+      let oldestNote = this.audiovoices[this._oldest].oscillator.freq().value;
       this.noteRelease(oldestNote);
       this._oldest = (this._oldest + 1) % (this.maxVoices - 1);
     }
@@ -389,6 +387,8 @@ class PolySynth {
         this.notes[n].dispose();
         delete this.notes[n];
       }
+      this._newest = 0;
+      this._oldest = 0;
       return;
     }
 
@@ -400,10 +400,7 @@ class PolySynth {
     } else {
       //Find the scheduled change in this._voicesInUse that will be previous to this new note
       //subtract 1 and schedule this value at time 't', when this note will stop playing
-      var previousVal = Math.max(
-        ~~this._voicesInUse.getValueAtTime(t).value,
-        1
-      );
+      var previousVal = Math.max(~~this._voicesInUse.getValueAtTime(t), 1);
       this._voicesInUse.setValueAtTime(previousVal - 1, t);
       //Then update all scheduled values that follow to decrease by 1 but never go below 0
       if (previousVal > 0) {
diff --git a/src/reverb.js b/src/reverb.js
@@ -103,20 +103,7 @@ class Reverb extends Effect {
    */
   process(src, seconds, decayRate, reverse) {
     src.connect(this.input);
-    var rebuild = false;
-    if (seconds) {
-      this._seconds = seconds;
-      rebuild = true;
-    }
-    if (decayRate) {
-      this._decay = decayRate;
-    }
-    if (reverse) {
-      this._reverse = reverse;
-    }
-    if (rebuild) {
-      this._buildImpulse();
-    }
+    this.set(seconds, decayRate, reverse);
   }
 
   /**
diff --git a/src/soundRecorder.js b/src/soundRecorder.js
@@ -91,7 +91,7 @@ class SoundRecorder {
     this._inputChannels = 2;
     this._outputChannels = 2; // stereo output, even if input is mono
 
-    const workletBufferSize = safeBufferSize(1024);
+    const workletBufferSize = (this.bufferSize = safeBufferSize(1024));
 
     this._workletNode = new AudioWorkletNode(
       ac,
diff --git a/src/soundfile.js b/src/soundfile.js
@@ -515,11 +515,11 @@ class SoundFile {
    * </code></div>
    */
   playMode(str) {
-    var s = str.toLowerCase();
+    var s = str.toLowerCase().trim();
 
     // if restart, stop all other sounds from playing
     if (s === 'restart' && this.buffer && this.bufferSourceNode) {
-      for (var i = 0; i < this.bufferSourceNodes.length - 1; i++) {
+      for (var i = 0; i < this.bufferSourceNodes.length; i++) {
         var now = p5sound.audiocontext.currentTime;
         this.bufferSourceNodes[i].stop(now);
       }
@@ -715,10 +715,9 @@ class SoundFile {
       this._paused = false;
     } else if (this.buffer && this.bufferSourceNode) {
       var now = p5sound.audiocontext.currentTime;
-      var t = time || 0;
       this.pauseTime = 0;
-      this.bufferSourceNode.stop(now + t);
-      this._counterNode.stop(now + t);
+      this.bufferSourceNode.stop(now + time);
+      this._counterNode.stop(now + time);
       this._playing = false;
       this._paused = false;
     }
@@ -999,7 +998,7 @@ class SoundFile {
    * @return {Number} [channels]
    */
   channels() {
-    return this.buffer.numberOfChannels;
+    if (this.buffer) return this.buffer.numberOfChannels;
   }
 
   /**
@@ -1010,7 +1009,7 @@ class SoundFile {
    * @return {Number} [sampleRate]
    */
   sampleRate() {
-    return this.buffer.sampleRate;
+    if (this.buffer) return this.buffer.sampleRate;
   }
 
   /**
@@ -1022,7 +1021,7 @@ class SoundFile {
    * @return {Number} [sampleCount]
    */
   frames() {
-    return this.buffer.length;
+    if (this.buffer) return this.buffer.length;
   }
 
   /**
@@ -1045,7 +1044,7 @@ class SoundFile {
     if (this.buffer) {
       // set length to window's width if no length is provided
       if (!length) {
-        length = window.width * 5;
+        length = window.innerWidth * 5;
       }
       if (this.buffer) {
         var buffer = this.buffer;
diff --git a/test/tests.js b/test/tests.js
@@ -27,3 +27,4 @@ import('./tests/p5.Noise.js');
 import('./tests/p5.Panner.js');
 import('./tests/p5.Panner3d.js');
 import('./tests/p5.Listener3d.js');
+import('./tests/p5.Reverb.js');
diff --git a/test/tests/p5.EQ.js b/test/tests/p5.EQ.js
@@ -36,22 +36,30 @@ describe('p5.EQ', function () {
     expect(eq.bands[2].biquad.type).to.equal('peaking');
   });
 
-  it('a bands gain value can be changed', function () {
+  it("a band's gain value can be changed", function () {
     const eq = new p5.EQ(8);
     expect(eq.bands[2].gain()).to.equal(0);
     eq.bands[2].gain(30);
     expect(eq.bands[2].gain()).to.equal(30);
   });
 
-  it('a bands freq value can be changed', function () {
+  it('a band has correct default value', function () {
+    const eq = new p5.EQ(8);
+    setTimeout(() => {
+      expect(eq.bands[0].freq()).to.equal(100);
+    }, 100);
+  });
+
+  it("a band's freq value can be changed", function () {
     const eq = new p5.EQ(8);
-    expect(eq.bands[0].freq()).to.equal(100);
     eq.bands[0].freq(200);
-    expect(eq.bands[0].gain()).to.equal(0);
-    expect(eq.bands[0].freq()).to.equal(200);
+    setTimeout(() => {
+      expect(eq.bands[0].gain()).to.equal(0);
+      expect(eq.bands[0].freq()).to.equal(200);
+    }, 100);
   });
 
-  it('a bands type can be changed', function () {
+  it("a band's type can be changed", function () {
     const eq = new p5.EQ();
     expect(eq.bands[2]._untoggledType).to.equal('peaking');
     eq.bands[2].setType('highshelf');
diff --git a/test/tests/p5.Helpers.js b/test/tests/p5.Helpers.js
@@ -8,12 +8,12 @@ describe('Testing helpers function', function () {
 
   it('p5.prototype.midiToFreq helper function', function () {
     const freq = p5.prototype.midiToFreq(100);
-    expect(freq).to.equal(2637.0204553029594);
+    expect(freq).to.be.approximately(2637.0204553029594, 0.00000000001);
   });
 
   it('p5.prototype.noteToFreq helper function', function () {
     const freq = p5.prototype.noteToFreq('C4');
-    expect(freq).to.equal(261.6255653005986);
+    expect(freq).to.be.approximately(261.6255653005986, 0.00000000001);
   });
 
   it('p5.prototype.soundFormats helper function', function () {
diff --git a/test/tests/p5.MonoSynth.js b/test/tests/p5.MonoSynth.js
@@ -15,6 +15,6 @@ describe('p5.MonoSynth', function () {
       expect(monoSynth.oscillator.freq().value).to.equal(110);
       monoSynth.dispose();
       done();
-    }, 1);
+    }, 10);
   });
 });
diff --git a/test/tests/p5.PolySynth.js b/test/tests/p5.PolySynth.js
@@ -12,20 +12,20 @@ describe('p5.PolySynth', function () {
     const polySynth = new p5.PolySynth();
     const noteDuration = 0.01;
 
-    const noteTriggerTime = audioContext.currentTime;
-    const noteActiveTime = noteTriggerTime + noteDuration / 2;
-    const noteDoneTime = noteTriggerTime + noteDuration;
+    const getTriggerTime = () => audioContext.currentTime;
+    const getActiveTime = () => getTriggerTime() + noteDuration / 2;
+    const getDoneTime = () => getTriggerTime() + noteDuration;
 
-    expect(polySynth._voicesInUse.getValueAtTime(noteTriggerTime)).to.equal(0);
+    expect(polySynth._voicesInUse.getValueAtTime(getTriggerTime())).to.equal(0);
 
     polySynth.play('A2', 0, 0, noteDuration);
-    expect(polySynth._voicesInUse.getValueAtTime(noteActiveTime)).to.equal(1);
+    expect(polySynth._voicesInUse.getValueAtTime(getActiveTime())).to.equal(1);
     polySynth.play('A3', 0, 0, noteDuration);
-    expect(polySynth._voicesInUse.getValueAtTime(noteActiveTime)).to.equal(2);
+    expect(polySynth._voicesInUse.getValueAtTime(getActiveTime())).to.equal(2);
     polySynth.play('A4', 0, 0, noteDuration);
-    expect(polySynth._voicesInUse.getValueAtTime(noteActiveTime)).to.equal(3);
+    expect(polySynth._voicesInUse.getValueAtTime(getActiveTime())).to.equal(3);
 
-    expect(polySynth._voicesInUse.getValueAtTime(noteDoneTime)).to.equal(0);
+    expect(polySynth._voicesInUse.getValueAtTime(getDoneTime())).to.equal(0);
 
     polySynth.dispose();
   });
diff --git a/test/tests/p5.SoundRecorder.js b/test/tests/p5.SoundRecorder.js
@@ -53,18 +53,21 @@ describe('p5.SoundRecorder', function () {
 
     const mic = new p5.AudioIn();
     mic.start(function () {
+      recorder.setInput(mic);
       const outputSoundFile = new p5.SoundFile();
-      recorder.record(outputSoundFile, recordingDuration, function () {
-        expect(outputSoundFile.duration()).to.eq(recordingDuration);
-
-        const outputChannel = outputSoundFile.buffer.getChannelData(0);
-        expect(outputChannel[0]).to.not.eq(0);
-
-        outputSoundFile.dispose();
-        mic.dispose();
-        p5.prototype.outputVolume(0);
-        done();
-      });
+      setTimeout(() => {
+        recorder.record(outputSoundFile, recordingDuration, function () {
+          expect(outputSoundFile.duration()).to.eq(recordingDuration);
+
+          const outputChannel = outputSoundFile.buffer.getChannelData(0);
+          expect(outputChannel[0]).to.not.eq(0);
+
+          outputSoundFile.dispose();
+          mic.dispose();
+          p5.prototype.outputVolume(0);
+          done();
+        });
+      }, 130);
     });
   });
 
@@ -74,8 +77,9 @@ describe('p5.SoundRecorder', function () {
     const recordingDuration =
       recorder.bufferSize / p5.soundOut.audiocontext.sampleRate;
     const inputChannel = inputSoundFile.buffer.getChannelData(0);
+    const inputChannelSampleValue = inputChannel[sampleIndex];
     // input SoundFile should contain all 1s
-    expect(inputChannel[sampleIndex]).to.eq(1);
+    expect(inputChannelSampleValue).to.eq(1);
 
     const outputSoundFile = new p5.SoundFile();
     inputSoundFile.loop();
@@ -84,7 +88,7 @@ describe('p5.SoundRecorder', function () {
       expect(outputSoundFile.duration()).to.eq(recordingDuration);
 
       var outputChannel = outputSoundFile.buffer.getChannelData(0);
-      expect(outputChannel[sampleIndex]).to.eq(inputChannel[sampleIndex]);
+      expect(outputChannel[sampleIndex]).to.eq(inputChannelSampleValue);
 
       outputSoundFile.dispose();
       done();
@@ -106,16 +110,18 @@ describe('p5.SoundRecorder', function () {
     inputSoundFile.connect();
     inputSoundFile.loop();
     recorder.setInput();
-    recorder.record(outputSoundFile, recordingDuration, function () {
-      expect(outputSoundFile.duration()).to.eq(recordingDuration);
+    setTimeout(() => {
+      recorder.record(outputSoundFile, recordingDuration, function () {
+        expect(outputSoundFile.duration()).to.eq(recordingDuration);
 
-      const outputChannel = outputSoundFile.buffer.getChannelData(0);
-      expect(outputChannel[0]).to.not.eq(0);
+        const outputChannel = outputSoundFile.buffer.getChannelData(0);
+        expect(outputChannel[0]).to.not.eq(0);
 
-      outputSoundFile.dispose();
-      p5.prototype.outputVolume(0);
-      done();
-    });
+        outputSoundFile.dispose();
+        p5.prototype.outputVolume(0);
+        done();
+      });
+    }, 20);
   });
 
   it('can save a recorded buffer to a .wav file', function (done) {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`
`35`	`35`	`},`
`36`	`36`	`"parserOptions": {`
`37`		`- "ecmaVersion": 6,`
	`37`	`+ "ecmaVersion": 8,`
`38`	`38`	`"sourceType": "module",`
`39`	`39`	`"allowImportExportEverywhere": true`
`40`	`40`	`}`