diff -r aa0e42229784 -r b9f1bd52df9a src/js/init.js --- a/src/js/init.js Tue Jun 05 17:55:24 2012 +0200 +++ b/src/js/init.js Tue Jun 05 20:55:42 2012 +0200 @@ -7,7 +7,7 @@ /* The Metadataplayer Object, single point of entry, replaces IriSP.init_player */ -IriSP.Metadataplayer = function(config, video_metadata) { +IriSP.Metadataplayer = function(config) { IriSP.log("IriSP.Metadataplayer constructor"); for (var key in IriSP.guiDefaults) { if (IriSP.guiDefaults.hasOwnProperty(key) && !config.gui.hasOwnProperty(key)) { @@ -16,7 +16,6 @@ } var _container = document.getElementById(config.gui.container); _container.innerHTML = '

Loading... Chargement...

'; - this.video_metadata = video_metadata; this.sourceManager = new IriSP.Model.Directory(); this.config = config; this.callbackQueue = []; @@ -94,7 +93,7 @@ IriSP.loadCss(IriSP.getLib("cssjQueryUI")); IriSP.loadCss(this.config.gui.css); - this.videoData = this.loadMetadata(this.video_metadata); + this.videoData = this.loadMetadata(this.config.player.metadata); this.$ = IriSP.jQuery('#' + this.config.gui.container); this.$.css({ "width": this.config.gui.width, @@ -246,7 +245,7 @@ delete opts.video; if(!opts.hasOwnProperty("flashplayer")) { - opts.flashplayer = IriSP.jwplayer_swf_path; + opts.flashplayer = IriSP.getLib("jwPlayerSWF"); } if(!opts.hasOwnProperty("controlbar.position")) {