# HG changeset patch
# User veltr
# Date 1330619632 -3600
# Node ID 45083178c1d2a0afe9230725beecbf60a27c9e59
# Parent  49013af6d50b77ba60a51ffe9a10a15830964850
Corrections

diff -r 49013af6d50b -r 45083178c1d2 src/js/init.js
--- a/src/js/init.js	Thu Mar 01 17:28:36 2012 +0100
+++ b/src/js/init.js	Thu Mar 01 17:33:52 2012 +0100
@@ -76,14 +76,9 @@
             */
             opts.file = "";
             opts.streamer = "";
-            var fullPath = IriSP.__jsonMetadata["medias"][0]["href"];
+            var fullPath = IriSP.get_aliased(IriSP.__jsonMetadata["medias"][0], ["href","url"]);
             
-            /* files can either use href or url to refer to the stream */
-            if (IriSP.null_or_undefined(fullPath)) {
-              fullPath = IriSP.__jsonMetadata["medias"][0]["url"];
-            }
-            
-            if (IriSP.null_or_undefined(fullPath)) {
+            if (fullPath === null) {
               console.log("no url or href field defined in the metadata.");
             }
             
diff -r 49013af6d50b -r 45083178c1d2 src/js/players/player.allocine.js
--- a/src/js/players/player.allocine.js	Thu Mar 01 17:28:36 2012 +0100
+++ b/src/js/players/player.allocine.js	Thu Mar 01 17:33:52 2012 +0100
@@ -3,7 +3,7 @@
 
 /** allocine player wrapper */
 IriSP.PopcornReplacement.allocine = function(container, options) {
-    console.log("Calling allocine player");
+//    console.log("Calling allocine player");
     /* appel du parent pour initialiser les structures communes à tous les players */
     IriSP.PopcornReplacement.player.call(this, container, options);   
     
@@ -14,7 +14,7 @@
     this.playerFns = {
         play : function() {
             if (_this.player) {
-                console.log("ask play _this.player = " + _this.player);
+            //    console.log("ask play _this.player = " + _this.player);
                 return _this.player.sendToActionScript("play");
             } else {
                 return false;
@@ -22,7 +22,7 @@
         },
         pause : function() {
             if (_this.player) {
-                console.log("ask pause _this.player = " + _this.player);
+            //    console.log("ask pause _this.player = " + _this.player);
                 return _this.player.sendToActionScript("pause");
             } else {
                 return false;
@@ -63,8 +63,14 @@
     //NOT CALLED window.onAllocineStateChange = IriSP.wrap(this, this.stateHandler);
     window.onTime = IriSP.wrap(this, this.progressHandler);
     
-    var fv = "adVast=false&lg=fr_cinecast&autoPlay="+options.autoPlay+"&directVideoTitle= &urlAcData="+options.urlAcData+"&directVideoPath="+options.directVideoPath+"&host=http://allocine.fr";
-    console.log("fv = " + fv);
+    var _videoUrl = (
+        typeof options.directVideoPath == "string"
+        ? options.directVideoPath
+        : IriSP.get_aliased(IriSP.__jsonMetadata["medias"][0], ["href","url"])
+    );
+    
+    var fv = "streamFMS=true&adVast=false&lg=fr_cinecast&autoPlay=" + options.autoPlay + "&directVideoTitle=&urlAcData=" + options.urlAcData + "&directVideoPath=" + _videoUrl + "&host=http://allocine.fr";
+//    console.log("fv = " + fv);
     
     var params = {
         "allowScriptAccess" : "always",