rm requestAnimationFrame throttle in onaudioprocess

katspaugh · Jul 30, 2013 · 91a88dc · 91a88dc
1 parent b14c5e3
commit 91a88dc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/src/drawer.js b/src/drawer.js
@@ -5,11 +5,9 @@ WaveSurfer.Drawer = {
         waveColor     : '#999',
         progressColor : '#333',
         cursorColor   : '#ddd',
-        markerColor   : '#eee',
         loaderColor   : '#999',
         loaderHeight  : 2,
         cursorWidth   : 1,
-        loadPercent   : false,
         markerWidth   : 1,
         container     : null
     },
@@ -20,6 +18,7 @@ WaveSurfer.Drawer = {
         this.container = this.params.container;
         this.width = this.container.clientWidth;
         this.height = this.container.clientHeight;
+        this.lastPos = 0;
 
         this.createSvg();
     },
@@ -123,8 +122,9 @@ WaveSurfer.Drawer = {
     },
 
     progress: function (progress) {
-        var pos = Math.round(progress * this.width);
-        if (pos != this.lastPos) {
+        var pos = progress * this.width;
+        var minPxDelta = 0.5;
+        if (pos < this.lastPos || pos - this.lastPos >= minPxDelta) {
             this.progressPath.setAttribute('width', pos);
             this.cursor.setAttribute('x', pos);
             this.lastPos = pos;

diff --git a/src/wavesurfer.js b/src/wavesurfer.js
@@ -21,15 +21,12 @@ var WaveSurfer = {
     createBackend: function () {
         this.backend = Object.create(WaveSurfer.WebAudio);
         this.backend.init(this.params);
+
         var my = this;
         var last;
+
         this.backend.on('audioprocess', function (progress) {
-            last = Date.now();
-            webkitRequestAnimationFrame(function (t) {
-                if (last < t) {
-                    my.onAudioProcess(progress);
-                }
-            });
+            my.onAudioProcess(progress);
         });
     },
 
@@ -241,30 +238,9 @@ var WaveSurfer = {
                 }
             });
         });
-    },
-
-
-    util: {
-        extend: function (dest) {
-            var sources = Array.prototype.slice.call(arguments, 1);
-            sources.forEach(function (source) {
-                if (source != null) {
-                    Object.keys(source).forEach(function (key) {
-                        dest[key] = source[key];
-                    });
-                }
-            });
-            return dest;
-        },
-
-        getId: function () {
-            return 'wavesurfer_' + Math.random().toString(32).substring(2);
-        }
     }
 };
 
-WaveSurfer.util.extend(WaveSurfer, Observer);
-
 
 /* Mark */
 WaveSurfer.Mark = {
@@ -283,4 +259,24 @@ WaveSurfer.Mark = {
     }
 };
 
+/* Common utilities */
+WaveSurfer.util = {
+    extend: function (dest) {
+        var sources = Array.prototype.slice.call(arguments, 1);
+        sources.forEach(function (source) {
+            if (source != null) {
+                Object.keys(source).forEach(function (key) {
+                    dest[key] = source[key];
+                });
+            }
+        });
+        return dest;
+    },
+
+    getId: function () {
+        return 'wavesurfer_' + Math.random().toString(32).substring(2);
+    }
+};
+
+WaveSurfer.util.extend(WaveSurfer, Observer);
 WaveSurfer.util.extend(WaveSurfer.Mark, Observer);