Merge pull request #449 from endurance21/processPeaks

fixed extra callback calls in while using cue to the soundFiles
processing · Jun 1, 2020 · 3992740 · 3992740
2 parents b3e61a3 + 37fe4a5
commit 3992740
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/soundfile.js b/src/soundfile.js
@@ -1772,17 +1772,17 @@ define(function (require) {
       var cue = this._cues[i];
       var callbackTime = cue.time;
       var val = cue.val;
+      var leftLimit = this._prevUpdateTime || 0 ;
+      var rightLimit = playbackTime ;
+      if ( leftLimit <= callbackTime  && callbackTime <= rightLimit ) {
 
-      if (
-        ~~this._prevUpdateTime <= callbackTime &&
-        callbackTime <= playbackTime
-      ) {
         // pass the scheduled callbackTime as parameter to the callback
         cue.callback(val);
       }
     }
 
     this._prevUpdateTime = playbackTime;
+
   };
 
   /**

diff --git a/test/tests/p5.SoundFile.js b/test/tests/p5.SoundFile.js
@@ -115,5 +115,30 @@ define(['chai'], function (chai) {
         done();
       }, 100);
     });
+    it('calls the cueCallbacks correct number of times', function (done) {
+      this.timeout(2000);
+      let sf = new p5.SoundFile('./testAudio/drum', onloaded);
+
+      function onloaded() {
+        let audioLength = sf.duration();
+        let numberOfCuesCalls = 0;
+
+        let callback = () => {
+          numberOfCuesCalls++;
+        };
+
+        sf.addCue(audioLength / 5, callback);
+        sf.addCue((audioLength * 2) / 5, callback);
+        sf.addCue((audioLength * 3) / 5, callback);
+        sf.addCue((audioLength * 4) / 5, callback);
+
+        sf.play();
+
+        sf.onended(() => {
+          expect(numberOfCuesCalls).to.equal(4);
+          done();
+        });
+      }
+    });
   });
 });