Changeset 1045

Timestamp:

05/19/10 10:55:43 (3 years ago)

Author:

jeroen

Message:

changed settings to be 5.2 compatible - added some skin presets

Location:

testing

Files:

• files/bitrates.xml (modified) (1 diff)
• files/cloudfront.xml (modified) (5 diffs)
• files/config.xml (modified) (1 diff)
• files/dynamic.smil (modified) (1 diff)
• files/hd.xml (added)
• files/highwinds.xml (modified) (1 diff)
• files/jquery.cookie.js (deleted)
• files/style.css (modified) (3 diffs)
• index.html (modified) (8 diffs)
• settings.js (modified) (12 diffs)

testing/files/bitrates.xml

@@ -1 @@
-<rss version="2.0"
-        xmlns:media="http://search.yahoo.com/mrss/" 
-        xmlns:jwplayer="http://developer.longtailvideo.com/trac/wiki/FlashFormats">
-        <channel>
-                <title>Playlist with bitrate switches</title>
+<rss version="2.0" xmlns:jwplayer="http://developer.longtailvideo.com/trac/" xmlns:media="http://search.yahoo.com/mrss/">
+<channel>
+  <title>Elephants Dream</title>
+  <description>Elephants Dream is the world’s first open movie, made entirely with open source graphics software such as Blender, and with all production files freely available to use however you please, under a Creative Commons license.</description>
+  <link>http://orange.blender.org/</link>
 
-                <item>
-                        <title>Progressive download</title>
-                        <description>When bitrate switching a progressive download, the only actual switch is done on startup.</description>
-                        <media:group>
-                                <media:content bitrate="1600" width="1080" url="http://content.bitsontherun.com/videos/8Juv1MVa-67727.mp4" />
-                                <media:content bitrate="1200" width="720" url="http://content.bitsontherun.com/videos/8Juv1MVa-485.mp4" />
-                                <media:content bitrate="800" width="480" url="http://content.bitsontherun.com/videos/8Juv1MVa-484.mp4" />
-                                <media:content bitrate="400" width="320" url="http://content.bitsontherun.com/videos/8Juv1MVa-483.mp4" />
-                                <media:thumbnail url="http://content.bitsontherun.com/thumbs/8Juv1MVa-480.jpg" />
-                        </media:group>
-                </item>
+  <item>
+    <title>Elephants Dream</title>
+    <link>http://orange.blender.org/</link>
+    <pubDate>Fri, 04 Apr 2008 00:00:00 -0000</pubDate>
+    <description>Elephants Dream is the world’s first open movie, made entirely with open source graphics software such as Blender, and with all production files freely available to use however you please, under a Creative Commons license.</description>
 
-                <item>
-                        <title>HTTP streaming</title>
-                        <description>Bitrate switching for HTTP streaming is done on startup and with every seek and fullscreen switch.</description>
-                        <media:content bitrate="1600" width="1080" url="http://content.bitsontherun.com/videos/LJSVMnCF-67067.mp4" />
-                        <media:content bitrate="1200" width="720" url="http://content.bitsontherun.com/videos/LJSVMnCF-329.mp4" />
-                        <media:content bitrate="800" width="480" url="http://content.bitsontherun.com/videos/LJSVMnCF-60830.mp4" />
-                        <media:content bitrate="400" width="320" url="http://content.bitsontherun.com/videos/LJSVMnCF-327.mp4" />
-                        <media:thumbnail url="http://content.bitsontherun.com/thumbs/8Juv1MVa-480.jpg" />
-                        <jwplayer:type>http</jwplayer:type>
-                        <jwplayer:http.startparam>starttime</jwplayer:http.startparam>
-                </item>
-
-                <item>
-                        <title>RTMP streaming (regular)</title>
-                        <description>Bitrate switching for RTMP streaming is done on startup and with every seek and fullscreen switch.</description>
-                        <media:group>
-                                <media:content bitrate="1600" width="1080" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-67727.mp4?dopproto=rtmpt" />
-                                <media:content bitrate="1200" width="720" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-485.mp4?dopproto=rtmpt" />
-                                <media:content bitrate="800" width="480" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-484.mp4?dopproto=rtmpt" />
-                                <media:content bitrate="400" width="320" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-483.mp4?dopproto=rtmpt" />
-                                <media:thumbnail url="http://content.bitsontherun.com/thumbs/8Juv1MVa-480.jpg" />
-                        </media:group>
-                        <jwplayer:type>rtmp</jwplayer:type>
-                        <jwplayer:rtmp.loadbalance>true</jwplayer:rtmp.loadbalance>
-                </item>
-
-                <item>
-                        <title>RTMP streaming (dynamic)</title>
-                        <description>When an FMS 3.5 server is detected, bitrate switching is also continously done while watching the video.</description>
-                        <media:group>
-                                <media:content bitrate="1600" width="1080" url="videos/8Juv1MVa-67727.mp4" />
-                                <media:content bitrate="1200" width="720" url="videos/8Juv1MVa-485.mp4" />
-                                <media:content bitrate="800" width="480" url="videos/8Juv1MVa-484.mp4" />
-                                <media:content bitrate="400" width="320" url="videos/8Juv1MVa-483.mp4" />
-                                <media:thumbnail url="http://content.bitsontherun.com/thumbs/8Juv1MVa-480.jpg" />
-                        </media:group>
-                        <jwplayer:type>rtmp</jwplayer:type>
-                        <jwplayer:streamer>rtmpt://fms.12E5.edgecastcdn.net/0012E5</jwplayer:streamer>
-                </item>
-
-                <item>
-                        <title>RTMP streaming (dynamic)</title>
-                        <description>Another dynamic streaming example, this time with a Wowza2 server</description>
-                        <media:group>
-                                <media:content bitrate="1600" width="1080" url="8Juv1MVa-67727.mp4" />
-                                <media:content bitrate="1200" width="720" url="8Juv1MVa-485.mp4" />
-                                <media:content bitrate="800" width="480" url="8Juv1MVa-484.mp4" />
-                                <media:content bitrate="400" width="320" url="8Juv1MVa-483.mp4" />
-                                <media:thumbnail url="http://content.bitsontherun.com/thumbs/8Juv1MVa-480.jpg" />
-                        </media:group>
-                        <jwplayer:type>rtmp</jwplayer:type>
-                        <jwplayer:streamer>rtmp://laketk.com/jwvod</jwplayer:streamer>
-                </item>
-
-        </channel>
+    <media:group>
+        <media:content bitrate="1390" url="http://content.bitsontherun.com/videos/LJSVMnCF-67067.mp4" width="1080" />
+        <media:content bitrate="990" url="http://content.bitsontherun.com/videos/LJSVMnCF-329.mp4" width="720" />
+        <media:content bitrate="610" url="http://content.bitsontherun.com/videos/LJSVMnCF-60830.mp4" width="480" />
+        <media:content bitrate="630" url="http://content.bitsontherun.com/videos/LJSVMnCF-327.mp4" width="320" />
+    </media:group>
+    <jwplayer:type>http</jwplayer:type>
+    <jwplayer:http.startparam>starttime</jwplayer:http.startparam>
+    <jwplayer:duration>653</jwplayer:duration>
+    <jwplayer:image>http://content.bitsontherun.com/thumbs/LJSVMnCF.jpg</jwplayer:image>
+    <jwplayer:playlist.image>http://content.bitsontherun.com/thumbs/LJSVMnCF-120.jpg</jwplayer:playlist.image>
+  </item>
+</channel>
 </rss>

testing/files/cloudfront.xml

@@ -3 +3 @@
         xmlns:jwplayer="http://developer.longtailvideo.com/trac/wiki/FlashFormats">
         <channel>
-                <title>Cloudfrton streaming playlist</title>
+                <title>Cloudfront streaming playlist</title>
 
                 <item>
@@ -13 +13 @@
                         <media:content url="bunny.flv" />
                         <jwplayer:streamer>rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st</jwplayer:streamer>
-                        <jwplayer:type>rtmp</jwplayer:type>
                 </item>
 
@@ -24 +23 @@
                         <media:content url="bunny.mp4" />
                         <jwplayer:streamer>rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st</jwplayer:streamer>
-                        <jwplayer:type>rtmp</jwplayer:type>
                 </item>
 
@@ -36 +34 @@
                         <jwplayer:streamer>rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st</jwplayer:streamer>
                         <media:thumbnail url="files/bunny.jpg" />
-                        <jwplayer:type>rtmp</jwplayer:type>
                 </item>
 
@@ -48 +45 @@
                         <jwplayer:streamer>rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st</jwplayer:streamer>
                         <media:thumbnail url="files/bunny.png" />
-                        <jwplayer:type>rtmp</jwplayer:type>
-                </item>
-
-                <item>
-                        <title>Extremists (flv)</title>
-                        <description>The Extremists</description>
-                        <pubDate>Sat, 07 Sep 2002 09:42:31 GMT</pubDate>
-                        <media:content url="Extremists.flv" />
-                        <jwplayer:streamer>rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st</jwplayer:streamer>
-                        <jwplayer:type>rtmp</jwplayer:type>
-                </item>
-
-                <item>
-                        <title>Extremists (mp4)</title>
-                        <description>The Extremists</description>
-                        <pubDate>Sat, 07 Sep 2002 09:42:31 GMT</pubDate>
-                        <media:content url="Extremists.m4v" />
-                        <jwplayer:streamer>rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st</jwplayer:streamer>
-                        <jwplayer:type>rtmp</jwplayer:type>
                 </item>
 

testing/files/config.xml

@@ -1 +1 @@
 <config>
-        <file>files/bunny.mp3</file>
-        <image>files/bunny.jpg</image>
+        <file>http://content.bitsontherun.com/videos/nPripu9l-67651.mp3</file>
+        <image>http://content.bitsontherun.com/thumbs/nPripu9l-480.jpg</image>
         <title>Big Buck Bunny</title>
         <repeat>true</repeat>
         <backcolor>333333</backcolor>
-        <frontcolor>CCCCCC</frontcolor>
+        <frontcolor>FFFFFF</frontcolor>
         <screencolor>666666</screencolor>
+        <lightcolor>CC0000</lightcolor>
         <volume>40</volume>
         <controlbar>over</controlbar>

testing/files/dynamic.smil

@@ -1 +1 @@
 <smil>
         <head>
-                <meta base="rtmp://fms.12E5.edgecastcdn.net/0012E5"/>
+                <meta base="rtmpt://fms.12E5.edgecastcdn.net/0012E5"/>
         </head>
         <body>

testing/files/highwinds.xml

@@ -9 +9 @@
                         <description>Bitrate switching for RTMP streaming is done on startup and with every seek and fullscreen switch.</description>
                         <media:group>
-                                <media:content bitrate="1600" width="1080" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-67727.mp4?dopproto=rtmpt" />
-                                <media:content bitrate="1200" width="720" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-485.mp4?dopproto=rtmpt" />
-                                <media:content bitrate="800" width="480" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-484.mp4?dopproto=rtmpt" />
-                                <media:content bitrate="400" width="320" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-483.mp4?dopproto=rtmpt" />
+                                <media:content bitrate="1600" width="1080" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-67727.mp4?dopproto=rtmpte" />
+                                <media:content bitrate="1200" width="720" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-485.mp4?dopproto=rtmpte" />
+                                <media:content bitrate="800" width="480" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-484.mp4?dopproto=rtmpte" />
+                                <media:content bitrate="400" width="320" url="http://hwcdn.net/i6s8g7u7/fms/dynamic/8Juv1MVa-483.mp4?dopproto=rtmpte" />
                                 <media:thumbnail url="http://content.bitsontherun.com/thumbs/8Juv1MVa-480.jpg" />
                         </media:group>

testing/files/style.css

@@ -4 +4 @@
 body {
         font-family: Arial, sans-serif;
-        padding: 0 40px 20px 40px;
+        padding: 20px 40px;
 }
 a { 
@@ -87 +87 @@
 ------------------------------------------------------------------------*/
 #javascript { 
-        display: none;
         height: 100px;
 }
@@ -123 +122 @@
         background: #e4eed3;
 }
-#optionsform {
-        margin-top: 5px;
-        height: 20px;
-}
-#optionsform select {
-        width: 120px;
-        margin-left: 20px;
-        float: right;
-        clear: none;
-}

testing/index.html

@@ -4 +4 @@
 <link rel="stylesheet" href="files/style.css" type="text/css">
 <script type="text/javascript" src="files/jquery.js"></script>
-<script type="text/javascript" src="files/jquery.cookie.js"></script>
 <script type="text/javascript" src="files/swfobject.js"></script>
 <script type="text/javascript" src="settings.js"></script>
@@ -20 +19 @@
         var variables = {width:500,height:260};
         /** When jQuery is loaded, we initialize everything. **/
-        $().ready(function() { initializeTool(); });
-        /** Initialize the tool options. **/
-        function initializeTool() {
-                var ops = ['api_forms','plugin_api','skinning'];
-                for (var i=0; i<ops.length; i++) { 
-                        if($.cookie(ops[i])) {
-                                settings[ops[i]] = $.cookie(ops[i]);
-                                $('#'+ops[i]).val($.cookie(ops[i]));
-                        }
-                        $('#'+ops[i]).change(function(evt) {
-                                $.cookie($(evt.currentTarget).attr('id'),$(evt.currentTarget).val(),{expires:99});
-                                location.reload(true);
-                        });
-                }
-                loadSettings();
-        }
+        $().ready(function() { loadSettings(); });
         /** Load the settings and querystring. **/
         function loadSettings() {
@@ -41 +25 @@
                 for (itm in settings['examples']) { $("#examples").append("<option>"+itm+"</option>"); }
                 for (itm in settings['players']) { $("#players").append("<option>"+itm+"</option>"); }
-                for (itm in settings[settings.skinning+'_skins']) { $("#skins").append("<option>"+itm+"</option>"); }
-                for (itm in settings[settings.plugin_api+'_plugins']) { $("#plugins").append("<option>"+itm+"</option>"); }
+                for (itm in settings['skins']) { $("#skins").append("<option>"+itm+"</option>"); }
+                for (itm in settings['plugins']) { $("#plugins").append("<option>"+itm+"</option>"); }
                 // When an example is selected, we reload the entire page.
                 $("#examples").change(function(evt) {
@@ -93 +77 @@
                         for (var i=0; i<arr.length; i++) {
                                 parsing++;
-                                swf = settings[settings.plugin_api+'_plugins'][arr[i]];
+                                swf = settings['plugins'][arr[i]];
                                 xml = swf.substr(0,swf.length-4) + '.xml';
                                 parsePluginXML(xml,arr[i]);
@@ -186 +170 @@
                 variables['player'] = $('#players').val();
                 if($("#skins").val() != 'none') {
-                        vrs['skin'] = settings[settings.skinning+'_skins'][$("#skins").val()];
+                        vrs['skin'] = settings['skins'][$("#skins").val()];
                         variables['skin'] = $("#skins").val();
                 }
@@ -193 +177 @@
                         var arr = $("#plugins").val();
                         for(var i=0; i<arr.length; i++) {
-                                plg.push(settings[settings.plugin_api+'_plugins'][arr[i]]);
+                                plg.push(settings['plugins'][arr[i]]);
                         }
                         vrs['plugins'] = plg.join(',');
@@ -234 +218 @@
         /** When the player is ready and the API forms can be shown, display them. **/
         function playerReady(obj) {
-                if(settings['api_forms'] == 'show') {
-                        player = document.getElementById(obj['id']);
-                        $('#javascript').css('display','block');
-                        $("#variablesform").submit(function(evt) { getVariable(evt); });
-                        $("#sendeventform").submit(function(evt) { sendEvent(evt); });
-                        $("#listenersform").submit(function(evt) { setListener(evt); });
-                }
+                player = document.getElementById(obj['id']);
+                $('#javascript').css('display','block');
+                $("#variablesform").submit(function(evt) { getVariable(evt); });
+                $("#sendeventform").submit(function(evt) { sendEvent(evt); });
+                $("#listenersform").submit(function(evt) { setListener(evt); });
         };
         /** Get a variable from the player. **/
@@ -324 +306 @@
 </head>
 <body>
-
-
-<form id="optionsform">
-        <select name="api_forms" id="api_forms">
-                <option value="hide">hide API forms</option>
-                <option value="show">show API forms</option>
-        </select>
-        <select name="skinning" id="skinning">
-                <option value="png">PNG skins</option>
-                <option value="swf">SWF skins</option>
-        </select>
-        <select name="plugin_api" id="plugin_api">
-                <option value="v4">v4 plugins</option>
-                <option value="v5">v5 plugins</option>
-        </select>
-</form>
-
 
 

testing/settings.js

@@ -1 +1 @@
 var settings = {
-        /** Global settings. **/
-        api_forms:'hide',
-        plugin_api:'v4',
-        skinning:'png',
         /** Player versions to test. **/
         players: {
                 'v5':'../trunk/fl5/player.swf',
-                'v4':'../trunk/as3/player.swf',
                 '5.1':'../tags/mediaplayer-5.1/player.swf',
                 '5.0':'../tags/mediaplayer-5.0/player.swf',
-                '4.6':'../tags/mediaplayer-4.6/player.swf',
-                '4.5':'../tags/mediaplayer-4.5/player.swf',
-                '4.4':'../tags/mediaplayer-4.4/player.swf',
-                '4.3':'../tags/mediaplayer-4.3/player.swf',
-                '4.2':'../tags/mediaplayer-4.2/player.swf',
-                '4.1':'../tags/mediaplayer-4.1/player.swf',
-                '4.0':'../tags/mediaplayer-4.0/player.swf'
         },
         /** Available JW4 plugins to test. **/
-        v4_plugins: {
+        plugins: {
+                agegate:'../plugins/agegate/v5/agegate.swf',
                 audiodescription:'../plugins/audiodescription/v4/audiodescription.swf',
                 captions:'../plugins/captions/v4/captions.swf',
-                clickproxy:'../plugins/clickproxy/clickproxy.swf',
-                hd:'../plugins/hd/v4/hd.swf',
+                hd:'../plugins/hd/v5/hd.swf',
                 livestream:'../plugins/livestream/livestream.swf',
                 metaviewer:'../plugins/metaviewer/metaviewer.swf',
@@ -30 +18 @@
                 searchbar:'../plugins/searchbar/searchbar.swf',
                 sharing:'../plugins/sharing/v4/sharing.swf',
-                snapshot:'../plugins/snapshot/snapshot.swf'
-        },
-        /** Available JW5 plugins to test. **/
-        v5_plugins: {
-                agegate:'../plugins/agegate/v5/agegate.swf',
-                captions:'../plugins/captions/v5/captions.swf',
-                hd:'../plugins/hd/v5/hd.swf',
-                sharing:'../plugins/sharing/v5/sharing.swf'
         },
         /** PNG skins to test. **/
-        png_skins: {
+        skins: {
                 none:'',
                 beelden:'../skins/beelden/beelden.xml',
@@ -47 +27 @@
                 classic:'../skins/classic/classic.xml',
                 five:'../skins/five/five.xml',
-                grungetape:'../skins/grungetape/grungetape.xml',
                 icecreamsneaka:'../skins/icecreamsneaka/icecreamsneaka.xml',
-                kleur:'../skins/kleur/kleur.xml',
-        lulu:'../skins/lulu/lulu.xml',
+                lulu:'../skins/lulu/lulu.xml',
                 modieus:'../skins/modieus/modieus.xml',
                 nacht:'../skins/nacht/nacht.xml',
                 playcasso:'../skins/playcasso/playcasso.xml',
-                schoon:'../skins/schoon/schoon.xml',
                 snel:'../skins/snel/snel.xml',
-        stormtrooper:'../skins/stormtrooper/stormtrooper.xml'
-        },
-        /** SWF skins to test. **/
-        swf_skins: {
-                none:'',
-                bekle:'../skins/bekle/bekle.swf',
-                bluemetal:'../skins/bluemetal/bluemetal.swf',
-                classic:'../skins/classic/classic.swf',
-                five:'../skins/five/five.swf',
-                grungetape:'../skins/grungetape/grungetape.swf',
-                icecreamsneaka:'../skins/icecreamsneaka/icecreamsneaka.swf',
-                kleur:'../skins/kleur/kleur.swf',
-                modieus:'../skins/modieus/modieus.swf',
-                nacht:'../skins/nacht/nacht.swf',
-                playcasso:'../skins/playcasso/playcasso.swf',
-                schoon:'../skins/schoon/schoon.swf',
-                snel:'../skins/snel/snel.swf',
+        stormtrooper:'../skins/stormtrooper/stormtrooper.xml',
                 stijl:'../skins/stijl/stijl.swf'
         },
@@ -97 +58 @@
                 'AAC audio':{
                         file:'../../testing/files/bunny.m4a',
-                        height:20,
+                        image:'files/bunny.jpg',
+                        height:240,
                         width:400
                 },
                 'JPG image': {
                         file:'files/bunny.jpg',
-                        height:240,
-                        width:400
-                },
-                'PNG image': {
-                        file:'files/bunny.png',
                         height:240,
                         width:400
@@ -118 +75 @@
                 'HTTP streamed FLV': {
                         file:'http://content.bitsontherun.com/videos/Qvxp3Jnv-68183.flv',
-                        type:'http',
+                        provider:'http',
                         height:240,
                         width:400,
@@ -125 +82 @@
                 'HTTP streamed MP4': {
                         file:'http://content.bitsontherun.com/videos/Qvxp3Jnv-483.mp4',
-                        type:'bitgravity',
+                        provider:'http',
                         height:240,
                         width:400,
                         'http.startparam':'starttime'
+                },
+                'HTTP bitrate switching': {
+                        file:'files/bitrates.xml',
+                        height:240,
+                        width:400,
+                        plugins:'qualitymonitor'
                 },
                 'RTMP streamed FLV': {
                         file:'videos/Qvxp3Jnv-68183.flv',
-                        type:'rtmp',
                         streamer:'rtmp://fms.12E5.edgecastcdn.net/0012E5',
                         height:240,
@@ -139 +101 @@
                 'RTMP streamed MP4': {
                         file:'videos/Qvxp3Jnv-483.mp4',
-                        type:'rtmp',
                         streamer:'rtmp://fms.12E5.edgecastcdn.net/0012E5',
                         height:240,
                         width:400
-                },
-                'RTMP streamed MP3': {
-                        file:'videos/Qvxp3Jnv-68182.mp3',
-                        type:'rtmp',
-                        streamer:'rtmp://fms.12E5.edgecastcdn.net/0012E5',
-                        height:24,
-                        width:400
-                },
-                'RTMP live broadcast': {
-                        file:'live24x7',
-                        streamer:'rtmp://llnwpm.fc.llnwd.net/llnwpm',
-                        type:'rtmp',
-                        'rtmp.subscribe':'true',
-                        height:240,
-                        width:500
                 },
                 'RTMP dynamic stream': {
                         file:'files/dynamic.xml',
                         height:240,
-                        width:500
+                        width:500,
+                        plugins:'qualitymonitor'
                 },
                 '  ':{},
@@ -208 +155 @@
                 },
                 '   ': {},
-                'Youtube playlist': {
-                        file:'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured?v=2',
-                        height:240,
-                        width:800,
-                        playlist:'right',
-                        playlistsize:400
-                },
-                'Multibitrate playlist': {
-                        file:'files/bitrates.xml',
-                        height:240,
-                        width:800,
-                        playlist:'right',
-                        playlistsize:400,
-                        plugins:'qualitymonitor'
-                },
-                'Chapter playlist': {
-                        file:'files/chapters.xml',
-                        height:240,
-                        width:800,
-                        playlist:'right',
-                        playlistsize:400
-                },
-                '         ': {},
-                'Cloudfront MP4': {
-                        streamer:'rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st',
-                        file:'bunny.mp4'
-                },
-                'Cloudfront FLV': {
-                        streamer:'rtmp://s37pvs8v39ibrr.cloudfront.net/cfx/st',
-                        file:'bunny.flv'
+                'Highwinds dynamic stream': {
+                        file:'files/highwinds.xml',
+                        height:240,
+                        width:500,
+                        plugins:'qualitymonitor'
                 },
                 'CloudFront playlist': {
@@ -244 +166 @@
                         width:800,
                         playlist:'right',
-                        playlistsize:400
+                        playlistsize:400,
+                        plugins:'qualitymonitor'
                 },
                 '    ': {},
-                'Different colors': {
-                        file:'files/mrss.xml',
-                        height:240,
-                        width:800,
-                        playlist:'right',
-                        playlistsize:400,
-                        backcolor:'000000',
-                        frontcolor:'CCCCCC',
-                        lightcolor:'77AA22',
-                        screencolor:'FFFFFF'
-                },
-                'Autostart, shuffle and repeat': {
-                        file:'files/mrss.xml',
-                        repeat:'always',
-                        height:240,
-                        width:800,
-                        autostart:'true',
-                        frontcolor:'000000',
-                        lightcolor:'77AA22',
-                        shuffle:'true',
-                        repeat:'always',
-                        playlist:'right',
-                        playlistsize:400
-                },
-                'Stretched, stacked and muted': {
-                        file:'files/mrss.xml',
-                        stretching:'fill',
-                        height:240,
-                        width:600,
-                        playlist:'over',
-                        controlbar:'over',
-                        mute:"true",
-                        playlistsize:400
-                },
-                'Loading from config xml': {
-                        config:'files/config.xml',
-                        height:240,
-                        width:500
-                },
-                'Start and duration flashvars': {
-                        file:'files/bunny.mp3',
-                        height:20,
-                        width:400,
-                        start:5,
-                        duration:20,
-                        repeat:'always',
-                        autostart:'true'
-                },
-                '     ': {},
                 'Agegate plugin': {
                         file:'../../testing/files/corrie.flv',
@@ -303 +177 @@
                         'agegate.minage':18
                 },
-                'Audiodescription plugin': {
+                'Audiodescription and captions plugins': {
                         file:'../../testing/files/corrie.flv',
                         height:240,
                         width:500,
-                        plugins:'audiodescription',
-                        'audiodescription.file':'files/corrie.mp3'
-                },
-                'Captions plugins': {
-                        file:'../../testing/files/corrie.flv',
-                        height:240,
-                        width:500,
-                        plugins:'captions',
+                        dock:false,
+                        plugins:'audiodescription,captions',
+                        'audiodescription.file':'files/corrie.mp3',
                         'captions.file':'files/corrie.xml'
                 },
@@ -325 +194 @@
                         'hd.file':'../../testing/files/bunny.mp4'
                 },
-                'Livestream plugin': {
-                        file:'files/bunny.png',
-                        height:260,
-                        width:500,
-                        plugins:'livestream',
-                        'livestream.file':'isight',
-                        'livestream.streamer':'rtmp://fml.lhr.12E5.edgecastcdn.net/2012E5'
-                },
-                'Metaviewer plugin': {
-                        file:'../../testing/files/bunny.flv',
-                        height:260,
-                        width:500,
-                        repeat:'always',
-                        stretching:'fill',
-                        plugins:'metaviewer'
-                },
-                'Qualitymonitor plugin': {
-                        file:'files/dynamic.xml',
-                        height:260,
-                        width:500,
-                        plugins:'qualitymonitor'
-                },
-                'Revolt plugin': {
-                        file:'files/bunny.mp3',
-                        height:260,
-                        width:500,
-                        repeat:'always',
-                        plugins:'revolt',
-                        'revolt.gain':2
-                },
                 'Searchbar plugin': {
-                        file:'../../testing/files/bunny.flv',
-                        image:'files/bunny.jpg',
-                        stretching:'fill',
+                        file:'http://gdata.youtube.com/feeds/api/standardfeeds/recently_featured?v=2',
                         playlist:'over',
                         height:260,
                         width:460,
-                        plugins:'searchbar'
+                        plugins:'searchbar',
+                        'searchbar.script': 'http://gdata.youtube.com/feeds/api/videos?vq=QUERY&format=5'
                 },
                 'Sharing plugin': {
@@ -372 +210 @@
                         'sharing.code':'<embed src="http://content.bitsontherun.com/players/nPripu9l-1754.swf" width="400" height="250" allowscriptaccess="always" />',
                         'sharing.link':'http://www.bigbuckbunny.org/'
+                },
+                '     ': {},
+                'Default skin with different colors': {
+                        file:'files/mrss.xml',
+                        height:300,
+                        width:500,
+                        controlbar: 'over',
+                        playlist:'bottom',
+                        playlistsize:'50pct',
+                        backcolor:'333333',
+                        frontcolor:'CCCCCC',
+                        lightcolor:'77AA22',
+                        screencolor:'FFFFFF'
+                },
+                'Different skin with HD playlist': {
+                        file:'files/hd.xml',
+                        stretching:'none',
+                        height:240,
+                        width:800,
+                        frontcolor:'000000',
+                        lightcolor:'77AA22',
+                        controlbar:'over',
+                        playlist:'right',
+                        playlistsize:400,
+                        skin:'beelden',
+                        plugins:'hd'
+                },
+                'Stretched, stacked and muted': {
+                        file:'files/mrss.xml',
+                        stretching:'fill',
+                        height:240,
+                        width:600,
+                        playlist:'over',
+                        controlbar:'over',
+                        mute:"true",
+                        playlistsize:400
+                },
+                'Loading from config xml': {
+                        config:'files/config.xml',
+                        height:240,
+                        width:500
+                },
+                'Start and duration flashvars': {
+                        file:'files/bunny.mp3',
+                        height:24,
+                        width:400,
+                        start:5,
+                        duration:15,
+                        repeat:'always',
+                        autostart:'true'
                 }
         }