# HG changeset patch
# User hamidouk
# Date 1325498558 -3600
# Node ID e331072ce8fdb477660193ac1b42f2b041c55785
# Parent  d1f6b4841f35e2a6448221d087fc60d798ec3384
added more autoconfig, and an option to specify in site.js where to get the
jwplayer swf path.

diff -r d1f6b4841f35 -r e331072ce8fd src/js/init.js
--- a/src/js/init.js	Fri Dec 30 17:06:22 2011 +0100
+++ b/src/js/init.js	Mon Jan 02 11:02:38 2012 +0100
@@ -65,6 +65,13 @@
                pass everything as is */
           }
 
+          if (!options.hasOwnProperty("flashplayer")) {
+            options.flashplayer = IriSP.jwplayer_swf_path;
+          }
+
+          if (!options.hasOwnProperty("controlbar.position")) {
+            options["controlbar.position"] = "none";
+          }
           pop = IriSP.PopcornReplacement.jwplayer("#" + containerDiv, opts);
         break;
       
diff -r d1f6b4841f35 -r e331072ce8fd src/js/site.js.templ
--- a/src/js/site.js.templ	Fri Dec 30 17:06:22 2011 +0100
+++ b/src/js/site.js.templ	Mon Jan 02 11:02:38 2012 +0100
@@ -2,6 +2,7 @@
    site.js - all our site-dependent config : player chrome, cdn locations, etc...*/
 
 IriSP.libdir = "/mdp/src/js/libs/";
+IriSP.jwplayer_swf_path = "http://localhost/mdp/test/libs/player.swf";
 
 IriSP.lib = { 
 		jQuery : "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js",
diff -r d1f6b4841f35 -r e331072ce8fd test/integration/polemic.htm
--- a/test/integration/polemic.htm	Fri Dec 30 17:06:22 2011 +0100
+++ b/test/integration/polemic.htm	Mon Jan 02 11:02:38 2012 +0100
@@ -119,9 +119,7 @@
         },
       player:{
       type:'jwplayer', // player type
-              flashplayer : '../libs/player.swf',
               live: true, 
-              "controlbar.position" : "none", 
               height: 300, 
               width: 640, 
               provider: "rtmp"