diff js/core.js @ 2868:c3e444d743f1

Merge branch 'master' into Dev_main

--- a/js/core.js	Fri Apr 28 12:02:09 2017 +0100
+++ b/js/core.js	Fri May 05 09:35:58 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;
     })();