diff -r 5e76a06b961c -r 3bf7aa8216e5 src/js/init.js
--- a/src/js/init.js	Mon Apr 16 19:10:32 2012 +0200
+++ b/src/js/init.js	Tue Apr 17 15:03:40 2012 +0200
@@ -1,257 +1,205 @@
 /* init.js - initialization and configuration of Popcorn and the widgets
 exemple json configuration:
- 
- */
 
-/**
-    set up the IriSP.__dataloader instance - 
-    we need it because we have to get the metadata
-    about the video before that the widget have even
-    loaded.
 */
-IriSP.setupDataLoader = function() {
-  /* we set it up separately because we need to
-     get data at the very beginning, for instance when
-     setting up the video */
-  IriSP.__dataloader = new IriSP.DataLoader();
-};
 
 /** do some magic to configure popcorn according to the options object passed.
-    Works for html5, jwplayer and youtube videos 
-*/
-IriSP.configurePopcorn = function (layoutManager, options) {
+ Works for html5, jwplayer and youtube videos
+ */
+IriSP.configurePopcorn = function(layoutManager, options) {
     var pop;
-    var ret = layoutManager.createDiv(); 
+    var ret = layoutManager.createDiv();
     var containerDiv = ret[0];
     var spacerDiv = ret[1];
-    
-    /* insert one pixel of margin between the video and the first widget, using the 
-       spacer.
-    */
+
+    /* insert one pixel of margin between the video and the first widget, using the
+     spacer.
+     */
     IriSP.jQuery("#" + spacerDiv).css("height", "1px");
-    
+
     switch(options.type) {
-      /*
-        todo : dynamically create the div/video tag which
-        will contain the video.
-      */
-      case "html5":
-           var tmpId = Popcorn.guid("video"); 
-           IriSP.jQuery("#" + containerDiv).append("<video src='" + options.file + "' id='" + tmpId + "'></video>");
-
-           if (options.hasOwnProperty("width"))
-             IriSP.jQuery("#" + containerDiv).css("width", options.width);
-           
-           if (options.hasOwnProperty("height"))
-             IriSP.jQuery("#" + containerDiv).css("height", options.height);
+        /*
+         todo : dynamically create the div/video tag which
+         will contain the video.
+         */
+        case "html5":
+            var tmpId = Popcorn.guid("video");
+            IriSP.jQuery("#" + containerDiv).append("<video src='" + options.video + "' id='" + tmpId + "'></video>");
 
-           pop = Popcorn("#" + tmpId);
-        break;
-        
-      case "jwplayer":
-          var opts = IriSP.jQuery.extend({}, options);
-          delete opts.container;
-          delete opts.type;
+            if(options.hasOwnProperty("width"))
+                IriSP.jQuery("#" + containerDiv).css("width", options.width);
 
-          
-          /* Try to guess options.file and options.streamer only if file and streamer
-             are not already defined in the configuration */
-          if (options.provider === "rtmp" && !opts.hasOwnProperty("file") && !opts.hasOwnProperty("streamer")) {
-            /* exit if we can't access the metadata */
-            if (typeof(IriSP.__jsonMetadata) === "undefined") {
-                break;
-            };
+            if(options.hasOwnProperty("height"))
+                IriSP.jQuery("#" + containerDiv).css("height", options.height);
+            pop = Popcorn("#" + tmpId);
+            break;
 
-            // the json format is totally illogical
-            //opts.streamer = IriSP.__jsonMetadata["medias"][0]["meta"]["item"]["value"];
-            //var source = IriSP.__jsonMetadata["medias"][0]["href"];
+        case "jwplayer":
+            var opts = IriSP.jQuery.extend({}, options);
+            delete opts.container;
+            delete opts.type;
+            opts.file = opts.video;
+            delete opts.video;
 
-            // the source if a full url but jwplayer wants an url relative to the
-            // streamer url, so we've got to remove the common part.
-            //opts.file = source.slice(opts.streamer.length);
-            
-            /* sometimes we get served a file with a wrong path and streamer.
-               as a streamer is of the form rtmp://domain/path/ and the media is
-               the rest, we uglily do this :
-            */
-            opts.file = "";
-            opts.streamer = "";
-            var fullPath = IriSP.get_aliased(IriSP.__jsonMetadata["medias"][0], ["href","url"]);
-            
-            if (fullPath === null) {
-              console.log("no url or href field defined in the metadata.");
+            if(!options.hasOwnProperty("flashplayer")) {
+                opts.flashplayer = IriSP.jwplayer_swf_path;
             }
-            
-            var pathSplit = fullPath.split('/');
-            
-            for (var i = 0; i < pathSplit.length; i++) {
-              if (i < 4) {
-                 opts.streamer += pathSplit[i] + "/";
-              } else {
-                 opts.file += pathSplit[i];
-                 /* omit the last slash if we're on the last element */
-                 if (i < pathSplit.length - 1)
-                  opts.file += "/";
-              }
-            }            
-          } else {
-            /* other providers type, video for instance -
-               pass everything as is */
-          }
+
+            if(!options.hasOwnProperty("controlbar.position")) {
+                opts["controlbar.position"] = "none";
+            }
+            pop = new IriSP.PopcornReplacement.jwplayer("#" + containerDiv, opts);
+            break;
 
-          if (!options.hasOwnProperty("flashplayer")) {
-            opts.flashplayer = IriSP.jwplayer_swf_path;
-          }
-
-          if (!options.hasOwnProperty("controlbar.position")) {
-            opts["controlbar.position"] = "none";
-          }
+        case "youtube":
+            var opts = IriSP.jQuery.extend({}, options);
+            delete opts.container;
+            opts.controls = 0;
+            opts.autostart = false;
+            // Popcorn.youtube wants us to specify the size of the player in the style attribute of its container div.
+            IriSP.jQuery("#" + containerDiv).css({
+                width : opts.width + "px",
+                height : opts.height + "px"
+            })
+            pop = Popcorn.youtube("#" + containerDiv, opts.video, opts);
+            break;
 
-          pop = new IriSP.PopcornReplacement.jwplayer("#" + containerDiv, opts);
-        break;
-      
-      case "youtube":
-          var opts = IriSP.jQuery.extend({}, options);
-          delete opts.container;
-          opts.controls = 0;
-          opts.autostart = false;
-          templ = "width: {{width}}px; height: {{height}}px;";
-          var str = Mustache.to_html(templ, {width: opts.width, height: opts.height});    
-          // Popcorn.youtube wants us to specify the size of the player in the style attribute of its container div.
-          IriSP.jQuery("#" + containerDiv).attr("style", str);
-          
-          pop = Popcorn.youtube("#" + containerDiv, opts.video, opts);
-        break;
-      
-    case "dailymotion":
-        pop = new IriSP.PopcornReplacement.dailymotion("#" + containerDiv, options);
-        break;
-             
-      case "allocine":
-          /* pass the options as-is to the allocine player and let it handle everything */
-          pop = new IriSP.PopcornReplacement.allocine("#" + containerDiv, options);
-          break;
-          
-      default:
-        pop = undefined;
+        case "dailymotion":
+            pop = new IriSP.PopcornReplacement.dailymotion("#" + containerDiv, options);
+            break;
+
+        case "allocine":
+            /* pass the options as-is to the allocine player and let it handle everything */
+            pop = new IriSP.PopcornReplacement.allocine("#" + containerDiv, options);
+            break;
+
+        default:
+            pop = undefined;
     };
-    
+
     return pop;
 };
-
 /** Configure the gui and instantiate the widgets passed as parameters
-    @param guiOptions the gui object as seen in the examples.
+ @param guiOptions the gui object as seen in the examples.
  */
-IriSP.configureWidgets = function (popcornInstance, layoutManager, guiOptions) {
- 
-  var serialFactory = new IriSP.SerializerFactory(IriSP.__dataloader);
-  var params = {width: guiOptions.width, height: guiOptions.height};
+IriSP.configureWidgets = function(popcornInstance, layoutManager, guiOptions) {
+
+    var serialFactory = new IriSP.SerializerFactory(IriSP.__dataloader);
+    var params = {
+        width : guiOptions.width,
+        height : guiOptions.height
+    };
 
-  var default_options = guiOptions.default_options;
-  if (IriSP.null_or_undefined(default_options))
-    default_options = {};
-  
-  var ret_widgets = [];
-  var index;
-  
-  for (index = 0; index < guiOptions.widgets.length; index++) {    
-    var widget = IriSP.instantiateWidget(popcornInstance, serialFactory, layoutManager, guiOptions.widgets[index], default_options);
-   
-    ret_widgets.push(widget);   
-  };
+    var default_options = guiOptions.default_options;
+    if(IriSP.null_or_undefined(default_options))
+        default_options = {};
+
+    var ret_widgets = [];
+    var index;
 
-  return ret_widgets;
+    for( index = 0; index < guiOptions.widgets.length; index++) {
+        var widget = IriSP.instantiateWidget(popcornInstance, serialFactory, layoutManager, guiOptions.widgets[index], default_options);
+
+        ret_widgets.push(widget);
+    };
+
+    return ret_widgets;
 };
-
 /** configure modules. @see configureWidgets */
-IriSP.configureModules = function (popcornInstance, modulesList) {
-  if (IriSP.null_or_undefined(modulesList))
-    return;
-  
-  var serialFactory = new IriSP.SerializerFactory(IriSP.__dataloader);
-  var ret_modules = [];
-  var index;
-  
-  for (index = 0; index < modulesList.length; index++) {    
-    var moduleConfig = modulesList[index];
-    
-    var serializer = serialFactory.getSerializer(moduleConfig.metadata);
-    var module = new IriSP[moduleConfig.type](popcornInstance, moduleConfig, serializer);    
-    ret_modules.push(module);
-  };
+IriSP.configureModules = function(popcornInstance, modulesList) {
+/*    if(IriSP.null_or_undefined(modulesList))
+        return;
+
+    var serialFactory = new IriSP.SerializerFactory(IriSP.__dataloader);
+    var ret_modules = [];
+    var index;
+
+    for( index = 0; index < modulesList.length; index++) {
+        var moduleConfig = modulesList[index];
 
-  return ret_modules;
-};
+        var serializer = serialFactory.getSerializer(moduleConfig.metadata);
+        var module = new IriSP[moduleConfig.type](popcornInstance, moduleConfig, serializer);
+        ret_modules.push(module);
+    };
 
-/** instantiate a widget - only called by configureWidgets, never by the user. Handles widget 
-    dependencies.
-    @param popcornInstance popcorn instance the widget will user
-    @param serialFactory serializer factory to instantiate the widget with
-    @param layoutManager layout manager
-    @param widgetConfig configuration options for the widget
-    @param defaultOptions a dictionnary with some options defined for every widget.
+    return ret_modules; */
+};
+/** instantiate a widget - only called by configureWidgets, never by the user. Handles widget
+ dependencies.
+ @param popcornInstance popcorn instance the widget will user
+ @param serialFactory serializer factory to instantiate the widget with
+ @param layoutManager layout manager
+ @param widgetConfig configuration options for the widget
+ @param defaultOptions a dictionnary with some options defined for every widget.
  */
 IriSP.instantiateWidget = function(popcornInstance, serialFactory, layoutManager, widgetConfig, defaultOptions) {
 
-    if (IriSP.null_or_undefined(defaultOptions))
-      defaultOptions = {};
-    
+    if(IriSP.null_or_undefined(defaultOptions))
+        defaultOptions = {};
     widgetConfig = IriSP.underscore.defaults(widgetConfig, defaultOptions);
 
     var arr = IriSP.jQuery.extend({}, widgetConfig);
-    
+
     /* create a div for those widgets who didn't already specify a container; */
-    if (!arr.hasOwnProperty("container")) {
-      /* create div returns us a container for the widget and a spacer */    
-      var ret = layoutManager.createDiv(widgetConfig.type);        
-      var container = ret[0];
-      var spacer = ret[1];           
-      arr.container = container;
-      arr.spacer = spacer;
-      arr.layoutManager = layoutManager;
+    if(!arr.hasOwnProperty("container")) {
+        /* create div returns us a container for the widget and a spacer */
+        var ret = layoutManager.createDiv(widgetConfig.type);
+        var container = ret[0];
+        var spacer = ret[1];
+        arr.container = container;
+        arr.spacer = spacer;
+        arr.layoutManager = layoutManager;
     }
-    var serializer = serialFactory.getSerializer(widgetConfig.metadata);    
-    
-    if (typeof serializer == "undefined")   
-      debugger;
-    
+    var serializer = serialFactory.getSerializer(widgetConfig.metadata);
+
+    if( typeof serializer == "undefined")
+        debugger;
+
     // instantiate the object passed as a string
-    var widget = new IriSP[widgetConfig.type](popcornInstance, arr, serializer);    
-    
-    if (widgetConfig.hasOwnProperty("requires")) {
-      // also create the widgets this one depends on.
-      // the dependency widget is available in the parent widget context as
-      // this.WidgetName (for instance, this.TipWidget);
-      
-      var i = 0;
-      for(i = 0; i < widgetConfig.requires.length; i++) {
-        var widgetName = widgetConfig.requires[i]["type"],
-            _configobj = IriSP.jQuery.extend({}, widgetConfig.requires[i]),
-            _div = document.createElement('div'),
-            _container = IriSP.guid(arr.container + '_' + widgetName + '_');
-        _configobj.container = _container;
-        _div.id = _container;
-        widget.selector.append(_div);
-        widget[widgetName] = IriSP.instantiateWidget(popcornInstance, serialFactory, layoutManager, _configobj, defaultOptions);
-      }
-    }       
-     
-    serializer.sync(IriSP.wrap(widget, function() { this.draw(); }));
+    var widget = new IriSP[widgetConfig.type](popcornInstance, arr, serializer);
+
+    if(widgetConfig.hasOwnProperty("requires")) {
+        // also create the widgets this one depends on.
+        // the dependency widget is available in the parent widget context as
+        // this.WidgetName (for instance, this.TipWidget);
+
+        var i = 0;
+        for( i = 0; i < widgetConfig.requires.length; i++) {
+            var widgetName = widgetConfig.requires[i]["type"], _configobj = IriSP.jQuery.extend({}, widgetConfig.requires[i]), _div = document.createElement('div'), _container = IriSP.guid(arr.container + '_' + widgetName + '_');
+            _configobj.container = _container;
+            _div.id = _container;
+            widget.selector.append(_div);
+            widget[widgetName] = IriSP.instantiateWidget(popcornInstance, serialFactory, layoutManager, _configobj, defaultOptions);
+        }
+    }
+
+    serializer.sync(IriSP.wrap(widget, function() {
+        this.draw();
+    }));
     return widget;
 };
-
 /** single point of entry for the metadataplayer */
-IriSP.initPlayer = function(config, metadata_url) {
+IriSP.initPlayer = function(config, metadata_url, format) {
     document.getElementById(config.gui.container).innerHTML = IriSP.templToHTML(IriSP.loading_template, config.gui);
-    IriSP.loadLibs(config, metadata_url,
-      function() {   
-              
-              var layoutManager = new IriSP.LayoutManager(config.gui);
+    IriSP.loadLibs(config, metadata_url, format, function() {
 
-              var pop = IriSP.configurePopcorn(layoutManager, config.player);
-              
-              IriSP._widgets = IriSP.configureWidgets(pop, layoutManager, config.gui); 
-              IriSP._modules = IriSP.configureModules(pop, config.modules); 
-              IriSP.jQuery('#Ldt-loader').detach();
-      });
-};
\ No newline at end of file
+        var layoutManager = new IriSP.LayoutManager(config.gui);
+        
+        if (typeof IriSP._videoData !== "undefined" && typeof config.player.video === "undefined") {
+            var _media = IriSP._videoData.currentMedia;
+            if (typeof _media !== "undefined") {
+                config.player.video = _media.video;
+                if (typeof _media.streamer !== "undefined") {
+                    config.player.streamer = _media.streamer;
+                    config.player.video = _media.video.replace(_media.streamer,'');
+                }
+            }
+            
+        }
+        
+        var pop = IriSP.configurePopcorn(layoutManager, config.player);
+
+        IriSP._widgets = IriSP.configureWidgets(pop, layoutManager, config.gui);
+        IriSP.jQuery('#Ldt-loader').detach();
+    });
+};