equal
deleted
inserted
replaced
39 type:'jwplayer', |
39 type:'jwplayer', |
40 src:'../res/swf/player.swf'} |
40 src:'../res/swf/player.swf'} |
41 }; |
41 }; |
42 |
42 |
43 IriSP.loadLibs(IriSP.lib, config.gui.css, function() {}); |
43 IriSP.loadLibs(IriSP.lib, config.gui.css, function() {}); |
44 Popcorn = Popcorn("#video"); |
44 pop = Popcorn("#video"); |
45 dt = new IriSP.DataLoader(); |
45 dt = new IriSP.DataLoader(); |
46 ser = new IriSP.JSONSerializer(dt, "../test.json"); |
46 ser = new IriSP.JSONSerializer(dt, "../test.json"); |
47 var player = new IriSP.PlayerWidget(Popcorn, config, ser); |
47 var player = new IriSP.PlayerWidget(pop, config, ser); |
48 ser.sync(IriSP.wrap(player, player.draw)); |
48 var annotationWidget = new IriSP.AnnotationsWidget(pop, config, ser); |
|
49 ser.sync(function() { player.draw(); annotationWidget.draw(); }); |
49 }); |
50 }); |
50 </script> |
51 </script> |
51 |
52 |
52 <video id='video' |
53 <video id='video' |
53 style="display:;width:300px" |
54 style="display:;width:300px" |