From: olivier <>
Date: Mon, 22 Dec 2008 18:28:19 +0000 (+0000)
Subject: simplify and accelerate timeside player loading
X-Git-Tag: 1.1~761
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b7e399e9c02f5593192c3a089b7f85002a00f95f;p=telemeta.git

simplify and accelerate timeside player loading
---

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