Mercurial Mercurial > hashcut / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed media handling
authorveltr
Tue, 23 Jul 2013 16:30:10 +0200
changeset 149 f2daa65fcab6
parent 148 677467e90ad9
child 150 a3246ca92f73
Changed media handling
integration/js/mashupcore.js file | annotate | diff | comparison | revisions
integration/js/mashupplayer.js file | annotate | diff | comparison | revisions
src/hashcut/static/hashcut/js/hashcut.js file | annotate | diff | comparison | revisions 
--- a/integration/js/mashupcore.js	Tue Jul 23 12:05:18 2013 +0200
+++ b/integration/js/mashupcore.js	Tue Jul 23 16:30:10 2013 +0200
@@ -387,79 +387,37 @@
         }
         
         // Binding functions to Media Element Functions
-        
-        var deferredTime = undefined,
-            deferredPlayPause = undefined;
-        
+                
         media.on("setcurrenttime", function(_milliseconds) {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
-                try {
-                    mediaEl.currentTime = (_milliseconds / 1000);
-                    deferredTime = undefined;
-                } catch(err) {
-                    deferredTime = _milliseconds;
-                }
-            } else {
-                deferredTime = _milliseconds;
-            }
+            try {
+                document.getElementById(videoid).currentTime = (_milliseconds / 1000);
+            } catch(err) {}
         });
         
         media.on("setvolume", function(_vol) {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
+            try {
+                document.getElementById(videoid).volume = _vol;
                 media.volume = _vol;
-                mediaEl.volume = _vol;
-            }
+            } catch(err) {}
         });
         
         media.on("setmuted", function(_muted) {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
+            try {
+                document.getElementById(videoid).muted = _muted;
                 media.muted = _muted;
-                mediaEl.muted = _muted;
-            }
+            } catch(err) {}
         });
         
         media.on("setplay", function() {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
-                try {
-                    mediaEl.play();
-                    deferredPlayPause = undefined;
-                } catch(err) {
-                    deferredPlayPause = true;
-                }
-            } else {
-                deferredPlayPause = true;
-            }
+            try {
+                document.getElementById(videoid).play();
+            } catch(err) {}
         });
 
         media.on("setpause", function() {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
-                try {
-                    mediaEl.pause();
-                    deferredPlayPause = undefined;
-                } catch(err) {
-                    deferredPlayPause = false;
-                }
-            } else {
-                deferredPlayPause = false;
-            }
-        });
-        
-        media.on("loadedmetadata", function() {
-            if (typeof deferredTime !== "undefined") {
-                media.setCurrentTime(deferredTime);
-            }
-            if (typeof deferredPlayPause !== "undefined") {
-                if (deferredPlayPause) {
-                    media.play();
-                } else {
-                    media.pause();
-                }
-            }
+            try {
+                document.getElementById(videoid).pause();
+            } catch(err) {}
         });
         
         // Binding UI Events and Mashup Playing to Media
--- a/integration/js/mashupplayer.js	Tue Jul 23 12:05:18 2013 +0200
+++ b/integration/js/mashupplayer.js	Tue Jul 23 16:30:10 2013 +0200
@@ -94,6 +94,7 @@
             }
         });
         
+        mashup.play();
         
     });
 }
--- a/src/hashcut/static/hashcut/js/hashcut.js	Tue Jul 23 12:05:18 2013 +0200
+++ b/src/hashcut/static/hashcut/js/hashcut.js	Tue Jul 23 16:30:10 2013 +0200
@@ -1964,79 +1964,37 @@
         }
         
         // Binding functions to Media Element Functions
-        
-        var deferredTime = undefined,
-            deferredPlayPause = undefined;
-        
+                
         media.on("setcurrenttime", function(_milliseconds) {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
-                try {
-                    mediaEl.currentTime = (_milliseconds / 1000);
-                    deferredTime = undefined;
-                } catch(err) {
-                    deferredTime = _milliseconds;
-                }
-            } else {
-                deferredTime = _milliseconds;
-            }
+            try {
+                document.getElementById(videoid).currentTime = (_milliseconds / 1000);
+            } catch(err) {}
         });
         
         media.on("setvolume", function(_vol) {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
+            try {
+                document.getElementById(videoid).volume = _vol;
                 media.volume = _vol;
-                mediaEl.volume = _vol;
-            }
+            } catch(err) {}
         });
         
         media.on("setmuted", function(_muted) {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
+            try {
+                document.getElementById(videoid).muted = _muted;
                 media.muted = _muted;
-                mediaEl.muted = _muted;
-            }
+            } catch(err) {}
         });
         
         media.on("setplay", function() {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
-                try {
-                    mediaEl.play();
-                    deferredPlayPause = undefined;
-                } catch(err) {
-                    deferredPlayPause = true;
-                }
-            } else {
-                deferredPlayPause = true;
-            }
+            try {
+                document.getElementById(videoid).play();
+            } catch(err) {}
         });
 
         media.on("setpause", function() {
-            var mediaEl = document.getElementById(videoid);
-            if (mediaEl && mediaEl.readyState >= mediaEl.HAVE_METADATA) {
-                try {
-                    mediaEl.pause();
-                    deferredPlayPause = undefined;
-                } catch(err) {
-                    deferredPlayPause = false;
-                }
-            } else {
-                deferredPlayPause = false;
-            }
-        });
-        
-        media.on("loadedmetadata", function() {
-            if (typeof deferredTime !== "undefined") {
-                media.setCurrentTime(deferredTime);
-            }
-            if (typeof deferredPlayPause !== "undefined") {
-                if (deferredPlayPause) {
-                    media.play();
-                } else {
-                    media.pause();
-                }
-            }
+            try {
+                document.getElementById(videoid).pause();
+            } catch(err) {}
         });
         
         // Binding UI Events and Mashup Playing to Media
@@ -3292,6 +3250,7 @@
             }
         });
         
+        mashup.play();
         
     });
 }
hashcut