Merge 95be88d into 33be0ba

src/js/videojs.wavesurfer.js

@@ -72,7 +72,7 @@ class Wavesurfer extends Plugin {
      */
     initialize() {
         // setup tech
-        this.player.tech_.setActivePlayer(this.player);
+        // this.player.tech_.setActivePlayer(this.player);
 
         // hide big play button
         this.player.bigPlayButton.hide();
@@ -476,10 +476,11 @@ class Wavesurfer extends Plugin {
      * @param {number} [duration] - Duration of the waveform (in seconds).
      * @private
      */
-    setCurrentTime(currentTime, duration) {
-        // emit the timeupdate event so that the tech knows about the time change
-        this.trigger('timeupdate');
+    setCurrentTime(currentTime, duration, force = false) {
 
+        this.progressCounter = 0;
+        // emit the timeupdate event so that the tech knows about the time change
+        // this.trigger('timeupdate');
         if (currentTime === undefined) {
             currentTime = this.surfer.getCurrentTime();
         }
@@ -519,6 +520,7 @@ class Wavesurfer extends Plugin {
      * @private
      */
     setDuration(duration) {
+
         if (duration === undefined) {
             duration = this.surfer.getDuration();
         }
@@ -547,6 +549,7 @@ class Wavesurfer extends Plugin {
         this.player.trigger('waveReady');
 
         // update time display
+        this.progressCounter = 50;
         this.setCurrentTime();
         this.setDuration();
 
@@ -574,6 +577,8 @@ class Wavesurfer extends Plugin {
      */
     onWaveFinish() {
         this.log('Finished playback');
+        this.progressCounter = 50;
+        this.setCurrentTime();
 
         // notify listeners
         this.player.trigger('playbackFinish');
@@ -618,6 +623,7 @@ class Wavesurfer extends Plugin {
      * @private
      */
     onWaveSeek() {
+        this.progressCounter = 50;
         this.setCurrentTime();
     }
 
@@ -767,7 +773,7 @@ if (videojs.getPlugin('wavesurfer') === undefined) {
 // register the WavesurferTech as 'Html5' to override the default html5 tech.
 // If we register it as anything other then 'Html5', the <audio> element will
 // be removed by VJS and caption tracks will be lost in the Safari browser.
-videojs.registerTech('Html5', WavesurferTech);
+// videojs.registerTech('Html5', WavesurferTech);
 
 module.exports = {
     Wavesurfer