--- a/crea/integration/metadataplayer/LdtPlayer-core.js Wed Jun 06 17:38:51 2012 +0200
+++ b/crea/integration/metadataplayer/LdtPlayer-core.js Wed Jun 06 18:35:25 2012 +0200
@@ -29,7 +29,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)) {
@@ -38,7 +38,6 @@
}
var _container = document.getElementById(config.gui.container);
_container.innerHTML = '<h3 class="Ldt-Loader">Loading... Chargement...</h3>';
- this.video_metadata = video_metadata;
this.sourceManager = new IriSP.Model.Directory();
this.config = config;
this.callbackQueue = [];
@@ -116,7 +115,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,
@@ -240,7 +239,7 @@
IriSP.jQuery("#" + containerDiv).append(_videoEl);
pop = Popcorn("#" + _tmpId);
break;
-
+
case "html5-audio":
var _tmpId = Popcorn.guid("audio"),
_videoEl = IriSP.jQuery('<audio>');
@@ -268,7 +267,7 @@
delete opts.video;
if(!opts.hasOwnProperty("flashplayer")) {
- opts.flashplayer = IriSP.jwplayer_swf_path;
+ opts.flashplayer = IriSP.getLib("jwPlayerSWF");
}
if(!opts.hasOwnProperty("controlbar.position")) {
@@ -1478,7 +1477,8 @@
popcorn : "popcorn-complete.min.js",
jwplayer : "jwplayer.js",
raphael : "raphael-min.js",
- tracemanager : "tracemanager.js"
+ tracemanager : "tracemanager.js",
+ jwPlayerSWF : "player.swf"
},
locations : {
// use to define locations outside defautl_dir