# HG changeset patch
# User veltr
# Date 1342002044 -7200
# Node ID 3aa91bdec03d48b1e46348cedf722d5ef0c5a12e
# Parent  e34f026c87d368a263f5bbf27eef418d51bf7c4f
The classic "Karim" hack for RTMP URLs

diff -r e34f026c87d3 -r 3aa91bdec03d src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Fri Jul 06 18:22:28 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Wed Jul 11 12:20:44 2012 +0200
@@ -88,7 +88,14 @@
         video: '{{ external_url }}',
         type: 'auto',
     {% else %}
-        streamer: 'rtmp://media.iri.centrepompidou.fr/ddc_player/',
+        streamer: function(_url) {
+            var _matches = _url.match(/^[^\/]+\/\/[^\/]+\/[^\/]+\//);
+            if (_matches) {
+                return _matches[0];
+            } else {
+                return _url;
+            }
+        },
         type: 'jwplayer',
         live: true,
         provider: "rtmp",
diff -r e34f026c87d3 -r 3aa91bdec03d src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js	Fri Jul 06 18:22:28 2012 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js	Wed Jul 11 12:20:44 2012 +0200
@@ -258,7 +258,10 @@
             var opts = IriSP.jQuery.extend({}, this.config.player);
             delete opts.container;
             delete opts.type;
-            if (typeof opts.streamer !== "undefined") {
+            if (typeof opts.streamer === "function") {
+                opts.streamer = opts.streamer(opts.video);
+            }
+            if (typeof opts.streamer === "string") {
                 opts.video = opts.video.replace(opts.streamer,"");
             }
             opts.file = opts.video;
@@ -1419,7 +1422,10 @@
     Trace : {
         noCss: true,
         requires: "tracemanager"
-    }
+    },
+    SlideShare: {
+        requires: "swfObject"
+    } 
 }
 
 IriSP.guiDefaults = {
diff -r e34f026c87d3 -r 3aa91bdec03d src/ldt/ldt/static/ldt/metadataplayer/Segments.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/Segments.js	Fri Jul 06 18:22:28 2012 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/Segments.js	Wed Jul 11 12:20:44 2012 +0200
@@ -41,7 +41,7 @@
                 _center = _left + _width / 2,
                 _fulltext = _annotation.title + ( _annotation.description ? ( '<br/>' + _annotation.description ) : '' );
             return {
-                text : _fulltext.replace(/(^.{120,140})[\s].+$/,'$1&hellip;'),
+                text : _fulltext.replace(/(^.{120,140})[\s].+$/m,'$1&hellip;'),
                 color : ( typeof _annotation.color !== "undefined" && _annotation.color ? _annotation.color : _this.colors[_k % _this.colors.length] ),
                 beginseconds : _annotation.begin.getSeconds() ,
                 left : Math.floor( _left ),
diff -r e34f026c87d3 -r 3aa91bdec03d src/ldt/ldt/static/ldt/metadataplayer/Trace.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/Trace.js	Fri Jul 06 18:22:28 2012 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/Trace.js	Wed Jul 11 12:20:44 2012 +0200
@@ -10,7 +10,8 @@
     url: "http://traces.advene.org:5000/",
     requestmode: 'GET',
     syncmode: "sync",
-    default_subject: "IRI"
+    default_subject: "IRI",
+    tracer: null
 }
 
 IriSP.Widgets.Trace.prototype.draw = function() {
@@ -47,13 +48,18 @@
         _this.player.popcorn.listen(_listener, _f);
     });
     
-    this.tracer = window.tracemanager.init_trace("test", {
-        url: this.url,
-        requestmode: this.requestmode,
-        syncmode: this.syncmode,
-        default_subject: this.default_subject
-    });
-    this.tracer.trace("StartTracing", {});
+    if (!this.tracer) {
+    
+        this.tracer = window.tracemanager.init_trace("test", {
+            url: this.url,
+            requestmode: this.requestmode,
+            syncmode: this.syncmode,
+            default_subject: this.default_subject
+        });
+    
+    }
+    
+    this.tracer.trace("TraceWidgetInit", {});
     
     this.mouseLocation = '';
     IriSP.jQuery(".Ldt-Widget").bind("click mouseover mouseout", function(_e) {