simplify and accelerate timeside player loading

diff --git a/telemeta/htdocs/css/player.css b/telemeta/htdocs/css/player.css
index 38a8bda37f30fd3972e7e9d5c1972fe7485be919..3db91bbb44a628b0c11cdcef54a46d3d47fa4dc4 100644 (file)
--- a/telemeta/htdocs/css/player.css
+++ b/telemeta/htdocs/css/player.css
@@ -1,3 +1,7 @@
 .ts-player {
     padding-bottom: 0;
 }
+
+.ts-player .ts-wave {
+    height: 200px;
+}

diff --git a/telemeta/templates/mediaitem_detail.html b/telemeta/templates/mediaitem_detail.html
index 992986c08093c7a54df3993b2eccf812e7c20481..540168d0d717141f1cb5fd945d09def9579af2ad 100644 (file)
--- a/telemeta/templates/mediaitem_detail.html
+++ b/telemeta/templates/mediaitem_detail.html
@@ -20,6 +20,18 @@ var map;
 var provider;\r
 var player;\r
 \r
+TimeSide.load(function() {\r
+    map = new TimeSide.MarkerMap();\r
+    provider = new TimeSide.SoundProvider({\r
+        duration: {{ item.get_duration }}\r
+    });\r
+    controller = new TimeSide.Controller({\r
+        player: '#player',\r
+        soundProvider: provider, \r
+        map: map\r
+    });\r
+});\r
+\r
 soundManager.url = '{% url telemeta-swf "./" %}';\r
 soundManager.flashVersion = 9;\r
 soundManager.consoleOnly = true;\r
@@ -29,22 +41,11 @@ soundManager.onload = function() {
         id: 'sound',\r
         url: '{% url telemeta-item-export item.id|urlencode,"mp3" %}'\r
     });\r
-\r
+    \r
     TimeSide.load(function() {\r
-        map = new TimeSide.MarkerMap();\r
-        provider = new TimeSide.SoundProvider(sound);\r
-        provider.forceDuration({{ item.get_duration }});\r
-        player = new TimeSide.Player({\r
-            container: $('#player').get(0), \r
-            image: '{% url telemeta-item-visualize item.id|urlencode,visualizer_id %}'\r
-        });\r
-        controller = new TimeSide.Controller({\r
-            player: player,\r
-            soundProvider: provider, \r
-            map: map\r
-        });\r
-        sound.load();\r
+        provider.setSource(sound);\r
     });\r
+    //sound.load(); // Auto-loading overloads the Django test server\r
 }        \r
 \r
 </script>\r
@@ -68,7 +69,7 @@ soundManager.onload = function() {
             <div class="ts-wave">\r
                 <div class="ts-image-container">\r
                     <img class="ts-image" src="{% url telemeta-item-visualize item.id|urlencode,visualizer_id %}" \r
-                      style="width: 334px; height: 200px;" alt="" />\r
+                      alt="" />\r
                 </div>\r
             </div>  \r
         </div>\r