wavesurfer.js 6.6.2 → 6.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wavesurfer.js",
-  "version": "6.6.2",
+  "version": "6.6.3",
   "description": "Interactive navigable audio visualization using Web Audio and Canvas",
   "main": "dist/wavesurfer.js",
   "directories": {

package/src/plugin/markers/index.js

@@ -70,6 +70,9 @@ export default class MarkersPlugin {
                     }
                     return this.markers.add(options);
                 },
+                getMarkers() {
+                    return this.markers;
+                },
                 clearMarkers() {
                     this.markers && this.markers.clear();
                 }
@@ -181,9 +184,13 @@ export default class MarkersPlugin {
     /**
      * Remove a marker
      *
-     * @param {number} index Index of the marker to remove
+     * @param {number|Object} indexOrMarker Index of the marker to remove or the marker object itself
      */
-    remove(index) {
+    remove(indexOrMarker) {
+        let index = indexOrMarker;
+        if (isNaN(index)) {
+            index = this.markers.findIndex(marker => marker === indexOrMarker);
+        }
         let marker = this.markers[index];
         if (!marker) {
             return;

package/src/webaudio.js

@@ -8,16 +8,12 @@ const FINISHED = 'finished';
 /**
  * WebAudio backend
  *
- * @extends {Observer}
+ * @extends {util.Observer}
  */
 export default class WebAudio extends util.Observer {
-    /** scriptBufferSize: size of the processing buffer */
-    static scriptBufferSize = 256;
     /** audioContext: allows to process audio with WebAudio API */
     audioContext = null;
     /** @private */
-    offlineAudioContext = null;
-    /** @private */
     stateBehaviors = {
         [PLAYING]: {
             init() {
@@ -33,7 +29,6 @@ export default class WebAudio extends util.Observer {
         },
         [PAUSED]: {
             init() {
-                this.removeOnAudioProcess();
             },
             getPlayedPercents() {
                 const duration = this.getDuration();
@@ -45,7 +40,6 @@ export default class WebAudio extends util.Observer {
         },
         [FINISHED]: {
             init() {
-                this.removeOnAudioProcess();
                 this.fireEvent('finish');
             },
             getPlayedPercents() {
@@ -233,40 +227,29 @@ export default class WebAudio extends util.Observer {
     createScriptNode() {
         if (this.params.audioScriptProcessor) {
             this.scriptNode = this.params.audioScriptProcessor;
-        } else {
-            if (this.ac.createScriptProcessor) {
-                this.scriptNode = this.ac.createScriptProcessor(
-                    WebAudio.scriptBufferSize
-                );
-            } else {
-                this.scriptNode = this.ac.createJavaScriptNode(
-                    WebAudio.scriptBufferSize
-                );
-            }
+            this.scriptNode.connect(this.ac.destination);
         }
-        this.scriptNode.connect(this.ac.destination);
     }
 
     /** @private */
     addOnAudioProcess() {
-        this.scriptNode.onaudioprocess = () => {
+        const loop = () => {
             const time = this.getCurrentTime();
 
-            if (time >= this.getDuration()) {
+            if (time >= this.getDuration() && this.state !== this.states[FINISHED]) {
                 this.setState(FINISHED);
                 this.fireEvent('pause');
-            } else if (time >= this.scheduledPause) {
+            } else if (time >= this.scheduledPause && this.state !== this.states[PAUSED]) {
                 this.pause();
             } else if (this.state === this.states[PLAYING]) {
                 this.fireEvent('audioprocess', time);
+                util.frame(loop)();
             }
         };
-    }
 
-    /** @private */
-    removeOnAudioProcess() {
-        this.scriptNode.onaudioprocess = null;
+        loop();
     }
+
     /** Create analyser node to perform audio analysis */
     createAnalyserNode() {
         this.analyser = this.ac.createAnalyser();
@@ -526,7 +509,7 @@ export default class WebAudio extends util.Observer {
         this.disconnectFilters();
         this.disconnectSource();
         this.gainNode.disconnect();
-        this.scriptNode.disconnect();
+        this.scriptNode && this.scriptNode.disconnect();
         this.analyser.disconnect();
 
         // close the audioContext if closeAudioContext option is set to true