diff -r 1f90756342e2 -r becd5f52fa24 test/integration/init-radio.htm
--- a/test/integration/init-radio.htm Tue Oct 25 14:32:23 2011 +0200
+++ b/test/integration/init-radio.htm Tue Oct 25 14:33:18 2011 +0200
@@ -2,20 +2,21 @@
-
+Test d'intégration de l'initialisation
MetaDataPlayer
- Test d'intégration de gestionnaire de placement.
+ Test d'intégration de l'initialisation.
+
@@ -31,29 +32,32 @@
height:480,
container:'LdtPlayer',
css:'../../src/css/LdtPlayer.css',
- widgets: [
- {type: "IriSP.PlayerWidget", // please note that type refers directly to the constructor of the widget.
- metadata:{
- format:'cinelab',
- src:'test.json',
- load:'json'}
- },
- {type: "IriSP.SegmentsWidget",
- metadata:{
- format:'cinelab',
- src:'test.json',
- load:'json'}
- },
- {type: "IriSP.AnnotationsWidget",
- metadata:{
- format:'cinelab',
- src:'test.json',
- load:'json'}
- },
- ]
+ widgets: [
+ {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
+ mode: "radio",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+
+ {type: "SegmentsWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ },
+ {type: "AnnotationsWidget",
+ metadata:{
+ format:'cinelab',
+ src:'../test.json',
+ type:'json'}
+ }
+ ]
+ },
player:{
type:'jwplayer', // player type
- container: '#PopcornContainer'
+ container: 'PopcornContainer',
// the rest is player-dependent configuration options.
file : "video/franceculture/franceculture_retourdudimanche20100620.flv",
streamer: "rtmp://media.iri.centrepompidou.fr/ddc_player/",
@@ -66,29 +70,14 @@
}
};
- IriSP.loadLibs(IriSP.lib, config.gui.css, function() {});
- var pop = Popcorn.jwplayer( '#video', "",{file : "video/franceculture/franceculture_retourdudimanche20100620.flv", streamer: "rtmp://media.iri.centrepompidou.fr/ddc_player/", flashplayer : config.player.src,
- live: true, "controlbar.position" : "none", height: config.gui.height, width: config.gui.width, provider: "rtmp"});
-
- var dt = new IriSP.DataLoader();
- var ser = new IriSP.JSONSerializer(dt, "../test.json");
- var ser2 = new IriSP.JSONSerializer(dt, "../test.json");
+ IriSP.loadLibs(IriSP.lib, config.gui.css,
+ function() { var pop = IriSP.configurePopcorn(config.player);
+ var widgets = IriSP.configureWidgets(pop, config.gui); });
- var lay = new IriSP.LayoutManager({divId : "LdtPlayer"});
- lay.setPopcornInstance(pop);
-
- config.gui.container = lay.createDiv();
- var player = new IriSP.PlayerWidget(pop, config.gui, ser);
-
- config.gui.container = lay.createDiv();
- var annotationWidget = new IriSP.AnnotationsWidget(pop, config.gui, ser);
-
- config.gui.container = lay.createDiv();
- var segmentsWidget = new IriSP.SegmentsWidget(pop, config.gui, ser);
- ser.sync(function() { player.draw(); annotationWidget.draw(); segmentsWidget.draw();});
});
+
\ No newline at end of file