integration/js/mashupcore.js
changeset 132 a2c2c6b37c41
parent 123 679809037606
child 137 0e1105a35754
--- a/integration/js/mashupcore.js	Thu Dec 06 15:08:15 2012 +0100
+++ b/integration/js/mashupcore.js	Thu Dec 06 15:20:46 2012 +0100
@@ -318,8 +318,6 @@
 /*
             webm_src = $('<source>'),
 */
-            lastseektime,
-            currentseektime;
         mp4_src.attr({
             src: videourl, //mp4_file,
             type: "video/mp4"
@@ -357,14 +355,9 @@
         
         media.on("setcurrenttime", function(_milliseconds) {
             if (media.loaded) {
-                if (!media.seeking) {
-                    lastseektime = currentseektime = _milliseconds.valueOf();
-                    popcorn.currentTime(currentseektime / 1000);
-                    media.seeking = true;
-                    setTimeout(showSeek,200);
-                } else {
-                    lastseektime = _milliseconds.valueOf();
-                }
+                popcorn.currentTime(_milliseconds / 1000);
+                media.seeking = true;
+                setTimeout(showSeek,200);
             }
         });
         
@@ -426,13 +419,7 @@
         });
         
         popcorn.on("seeked", function() {
-            if (currentseektime !== lastseektime) {
-                currentseektime = lastseektime;
-                popcorn.currentTime(currentseektime / 1000);
-                media.seeking = true;
-            } else {
-                media.trigger("seeked");
-            }
+            media.trigger("seeked");
         });
         
         // Binding UI Events and Mashup Playing to Media