Mercurial > hg > webaudioevaluationtool

changeset 2818:c241f0aee8a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Fri, 28 Apr 2017 12:21:05 +0100
parents 88649008134d (current diff) 6b38dc641812 (diff)
children a39750ca3954
files
diffstat 1 files changed, 5 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Tue Apr 25 16:21:05 2017 +0100
+++ b/js/core.js	Fri Apr 28 12:21:05 2017 +0100
@@ -2903,32 +2903,20 @@
                     }
                 }
             }
+            if (this.playbackObject !== undefined && this.interval === undefined) {
+                window.requestAnimationFrame(this.update.bind(this));
+            }
         };
 
         playhead.interval = undefined;
 
         playhead.start = function () {
             if (this.playbackObject !== undefined && this.interval === undefined) {
-                if (this.maxTime < 60) {
-                    this.interval = window.setInterval(function () {
-                        interfaceContext.playhead.update();
-                    }, 10);
-                } else {
-                    this.interval = window.setInterval(function () {
-                        interfaceContext.playhead.update();
-                    }, 100);
-                }
+                window.requestAnimationFrame(this.update.bind(this));
             }
         };
         playhead.stop = function () {
-            window.clearInterval(this.interval);
-            this.interval = undefined;
-            this.scrubberHead.style.left = '0px';
-            if (this.maxTime < 60) {
-                this.curTimeSpan.textContent = '0.00';
-            } else {
-                this.curTimeSpan.textContent = '00:00';
-            }
+            this.timePerPixel = 0;
         };
         return playhead;
     })();