Changeset 905

Timestamp:

03/26/10 06:40:02 (3 years ago)

Author:

jeroen

Message:

updated the testing tool with options as part of #760. Next, moved the v5 plugin branches to the plugins/xxx/v5/ folders. Last, removed a few plugins I built but were not tested released (spoton,popout,tabbar,replay)

Files:

• plugins/agegate/v4 (added)
• plugins/agegate/v4/bin-release (moved) (moved from plugins/agegate/bin-release)
• plugins/agegate/v4/build (moved) (moved from plugins/agegate/build)
• plugins/agegate/v4/includes (moved) (moved from plugins/agegate/includes)
• plugins/agegate/v4/lib (moved) (moved from plugins/agegate/lib)
• plugins/agegate/v4/settings.xml (moved) (moved from plugins/agegate/settings.xml)
• plugins/agegate/v4/src (moved) (moved from plugins/agegate/src)
• plugins/agegate/v4/tests (moved) (moved from plugins/agegate/tests)
• plugins/agegate/v5 (moved) (moved from branches/plugins/agegate)
• plugins/flow (deleted)
• plugins/hd/v5/bin-release (deleted)
• plugins/hd/v5/build/build.bat (modified) (1 diff)
• plugins/hd/v5/build/build.sh (modified) (1 diff)
• plugins/hd/v5/hd.swf (copied) (copied from plugins/hd/v5/bin-release/hd.swf)
• plugins/hd/v5/hd.xml (copied) (copied from plugins/hd/v5/bin-release/hd.xml)
• plugins/popout (deleted)
• plugins/replay (deleted)
• plugins/sharing/v4 (added)
• plugins/sharing/v4/build.sh (moved) (moved from plugins/sharing/build.sh)
• plugins/sharing/v4/com (moved) (moved from plugins/sharing/com)
• plugins/sharing/v4/embedButton.png (moved) (moved from plugins/sharing/embedButton.png)
• plugins/sharing/v4/embedIcon.png (moved) (moved from plugins/sharing/embedIcon.png)
• plugins/sharing/v4/embedScreen.png (moved) (moved from plugins/sharing/embedScreen.png)
• plugins/sharing/v4/shareButton.png (moved) (moved from plugins/sharing/shareButton.png)
• plugins/sharing/v4/shareIcon.png (moved) (moved from plugins/sharing/shareIcon.png)
• plugins/sharing/v4/shareScreen.png (moved) (moved from plugins/sharing/shareScreen.png)
• plugins/sharing/v4/sharing.swf (moved) (moved from plugins/sharing/sharing.swf)
• plugins/sharing/v4/sharing.xml (moved) (moved from plugins/sharing/sharing.xml)
• plugins/sharing/v5 (moved) (moved from branches/plugins/sharing)
• plugins/spoton (deleted)
• plugins/tabbar (deleted)
• skins/beelden/beelden.xml (modified) (5 diffs)
• skins/lulu/controlbar/muteButton.png (modified) (previous)
• skins/lulu/controlbar/timeSliderProgress.png (modified) (previous)
• skins/lulu/controlbar/timeSliderThumb.png (modified) (previous)
• skins/lulu/controlbar/unmuteButton.png (modified) (previous)
• skins/lulu/controlbar/volumeSliderBuffer.png (deleted)
• skins/lulu/controlbar/volumeSliderProgress.png (modified) (previous)
• skins/lulu/controlbar/volumeSliderRail.png (modified) (previous)
• skins/lulu/controlbar/volumeSliderThumb.png (added)
• skins/lulu/lulu.xml (modified) (1 diff)
• skins/lulu/src/lulu.ai (modified) (previous)
• testing/files/jquery.cookie.js (added)
• testing/files/style.css (modified) (2 diffs)
• testing/index.html (modified) (9 diffs)
• testing/settings.js (modified) (5 diffs)
• trunk/fl5/src/com/longtailvideo/jwplayer/player/Player.as (modified) (10 diffs)

plugins/hd/v5/build/build.bat

@@ -6 +6 @@
 echo "Compiling player 5 plugin..."
 
-%FLEXPATH%\bin\mxmlc ..\src\com\longtailvideo\plugins\hd\HD.as -sp ..\src\ -o ..\bin-release\hd.swf -library-path+=..\libs -load-externs ..\libs\sdk-classes.xml  -use-network=false -debug=false
+%FLEXPATH%\bin\mxmlc ..\src\com\longtailvideo\plugins\hd\HD.as -sp ..\src\ -o ..\hd.swf -library-path+=..\libs -load-externs ..\libs\sdk-classes.xml  -use-network=false -debug=false

plugins/hd/v5/build/build.sh

@@ -5 +5 @@
 
 echo "Compiling with MXMLC..."
-$FLEXPATH/bin/mxmlc ../src/com/longtailvideo/plugins/hd/HD.as -sp ../src -o ../bin-release/hd.swf -library-path+=../libs -use-network=false -optimize=true -incremental=false
+$FLEXPATH/bin/mxmlc ../src/com/longtailvideo/plugins/hd/HD.as -sp ../src -o ../hd.swf -library-path+=../libs -use-network=false -optimize=true -incremental=false

skins/beelden/beelden.xml

@@ -22 +22 @@
                                 <element name="shade" src="background.png" />
                                 <element name="divider" src="divider.png" />
-                                                                
+
                                 <element name="blankButton" src="blankButton.png" />
                                 <element name="blankButtonOver" src="blankButton.png" />
-                                
+
                                 <element name="playButton" src="playButton.png" />
                                 <element name="playButtonOver" src="playButtonOver.png" />
-                                
+
                                 <element name="pauseButton" src="pauseButton.png" />
                                 <element name="pauseButtonOver" src="pauseButtonOver.png" />
-                                
-                                <element name="timeSliderRail" src="timeSliderRail.png" />                                                              
+
+                                <element name="timeSliderRail" src="timeSliderRail.png" />
                                 <element name="timeSliderBuffer" src="timeSliderBuffer.png" />
                                 <element name="timeSliderProgress" src="timeSliderProgress.png" />
                                 <element name="timeSliderThumb" src="timeSliderThumb.png" />
-                                
+
                                 <element name="fullscreenButton" src="fullscreenButton.png" />
                                 <element name="fullscreenButtonOver" src="fullscreenButtonOver.png" />
-                                
+
                                 <element name="normalscreenButton" src="normalscreenButton.png" />
                                 <element name="normalscreenButtonOver" src="normalscreenButtonOver.png" />
-                                
+
                                 <element name="muteButton" src="muteButton.png" />
                                 <element name="muteButtonOver" src="muteButtonOver.png" />
-                                
+
                                 <element name="unmuteButton" src="unmuteButton.png" />
                                 <element name="unmuteButtonOver" src="unmuteButtonOver.png" />
-                                
+
                                 <element name="volumeSliderRail" src="volumeSliderRail.png" />
                                 <element name="volumeSliderBuffer" src="volumeSliderBuffer.png" />
@@ -54 +54 @@
                         </elements>
                 </component>
-                
+
                 <component name="display">
                         <elements>
@@ -64 +64 @@
                         </elements>
                 </component>
-                
+
                 <component name="dock">
                         <elements>
@@ -71 +71 @@
                         </elements>
                 </component>
-                
+
                 <component name="playlist">
                         <elements>
@@ -81 +81 @@
                         </elements>
                 </component>
-                
+
                 <component name="hd">
                         <elements>

skins/lulu/lulu.xml

@@ -36 +36 @@
                                 <element name="unmuteButton" src="unmuteButton.png" />
                                 
-                                <element name="volumeSliderRail" src="timeSliderRail.png" />
-                                <element name="volumeSliderProgress" src="timeSliderProgress.png" />
-                                <element name="volumeSliderThumb" src="timeSliderThumb.png" />
+                                <element name="volumeSliderRail" src="volumeSliderRail.png" />
+                                <element name="volumeSliderProgress" src="volumeSliderProgress.png" />
+                                <element name="volumeSliderThumb" src="volumeSliderThumb.png" />
                                 
                                 <element name="fullscreenButton" src="fullscreenButton.png" />
-                                
                                 <element name="normalscreenButton" src="normalscreenButton.png" />
                                 

testing/files/style.css

@@ -4 +4 @@
 body {
         font-family: Arial, sans-serif;
-        padding: 20px 40px;
+        padding: 0 40px 20px 40px;
 }
 a { 
@@ -126 +126 @@
         background: #e4eed3;
 }
+#optionsform {
+        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 +21 @@
         /** When jQuery is loaded, we initialize everything. **/
         $().ready(function() { initializeTool(); });
-        /** Load the settings and querystring to initialize the tool. **/
+        /** 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();
+        }
+        /** Load the settings and querystring. **/
+        function loadSettings() {
                 // load the settings.
-                for (dct in settings) {
-                        for (itm in settings[dct]) {
-                                $("#"+dct).append("<option>"+itm+"</option>");
-                        }
-                }
+                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>"); }
                 // When an example is selected, we reload the entire page.
                 $("#examples").change(function(evt) {
@@ -43 +58 @@
                 if(variables['skin']) { $('#skins').val(variables['skin']); }
                 $("#skins").change(function(evt) { insertPlayer(evt); });
-                if(variables['plugins']) {  $('#plugins').val(variables['plugins'].split(',')); }
+                if(variables['plugins']) { $('#plugins').val(variables['plugins'].split(',')); }
                 $("#plugins").change(function(evt) { reloadFieldsets(evt); });
                 // set the handler on the flashvars and load the whole bunch.
@@ -78 +93 @@
                         for (var i=0; i<arr.length; i++) {
                                 parsing++;
-                                swf = settings.plugins[arr[i]];
+                                swf = settings[settings.plugin_api+'_plugins'][arr[i]];
                                 xml = swf.substr(0,swf.length-4) + '.xml';
                                 parsePluginXML(xml,arr[i]);
@@ -171 +186 @@
                 variables['player'] = $('#players').val();
                 if($("#skins").val() != 'none') {
-                        vrs['skin'] = settings.skins[$("#skins").val()];
+                        vrs['skin'] = settings[settings.skinning+'_skins'][$("#skins").val()];
                         variables['skin'] = $("#skins").val();
                 }
@@ -178 +193 @@
                         var arr = $("#plugins").val();
                         for(var i=0; i<arr.length; i++) {
-                                plg.push(settings.plugins[arr[i]]);
+                                plg.push(settings[settings.plugin_api+'_plugins'][arr[i]]);
                         }
                         vrs['plugins'] = plg.join(',');
@@ -219 +234 @@
         /** When the player is ready and the API forms can be shown, display them. **/
         function playerReady(obj) {
-                if(settings['show_api_forms']) {
+                if(settings['api_forms'] == 'show') {
                         player = document.getElementById(obj['id']);
                         $('#javascript').css('display','block');
@@ -311 +326 @@
 
 
+<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>
+
 
 
@@ -321 +351 @@
         </fieldset>
 </form>
-
 
 

testing/settings.js

@@ -1 +1 @@
 var settings = {
-        /** Show or hide the API (vars, events, listeners) forms. **/
-        show_api_forms:true,
+        /** Global settings. **/
+        api_forms:'hide',
+        plugin_api:'v4',
+        skinning:'png',
         /** Player versions to test. **/
         players: {
@@ -16 +18 @@
                 '4.0':'../tags/mediaplayer-4.0/player.swf'
         },
-        /** Available plugins to test. **/
-        plugins: {
+        /** Available JW4 plugins to test. **/
+        v4_plugins: {
+                agegate:'../plugins/agegate/v4/agegate.swf',
                 audiodescription:'../plugins/audiodescription/v4/audiodescription.swf',
                 captions:'../plugins/captions/v4/captions.swf',
                 clickproxy:'../plugins/clickproxy/clickproxy.swf',
-                hd:'../plugins/hd/hd.swf',
+                hd:'../plugins/hd/v4/hd.swf',
                 livestream:'../plugins/livestream/livestream.swf',
                 metaviewer:'../plugins/metaviewer/metaviewer.swf',
@@ -27 +30 @@
                 revolt:'../plugins/revolt/revolt.swf',
                 searchbar:'../plugins/searchbar/searchbar.swf',
-                sharing:'../plugins/sharing/sharing.swf',
+                sharing:'../plugins/sharing/v4/sharing.swf',
                 snapshot:'../plugins/snapshot/snapshot.swf'
         },
-        /** Skins to test. **/
-        skins: {
+        /** 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: {
                 none:'',
-                beelden_xml:'../skins/beelden/beelden.xml',
+                beelden:'../skins/beelden/beelden.xml',
+                bekle:'../skins/bekle/bekle.xml',
+                bluemetal:'../skins/bluemetal/bluemetal.xml',
+                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',
+                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',
-                bekle_xml:'../skins/bekle/bekle.xml',
                 bluemetal:'../skins/bluemetal/bluemetal.swf',
-                bluemetal_xml:'../skins/bluemetal/bluemetal.xml',
                 classic:'../skins/classic/classic.swf',
-                classic_xml:'../skins/classic/classic.xml',
                 five:'../skins/five/five.swf',
-                five_xml:'../skins/five/five.xml',
                 grungetape:'../skins/grungetape/grungetape.swf',
-                grungetape_xml:'../skins/grungetape/grungetape.xml',
                 icecreamsneaka:'../skins/icecreamsneaka/icecreamsneaka.swf',
-                icecreamsneaka_xml:'../skins/icecreamsneaka/icecreamsneaka.xml',
-        lulu_xml:'../skins/lulu/lulu.xml',
+                kleur:'../skins/kleur/kleur.swf',
                 modieus:'../skins/modieus/modieus.swf',
-                modieus_xml:'../skins/modieus/modieus.xml',
+                nacht:'../skins/nacht/nacht.swf',
                 playcasso:'../skins/playcasso/playcasso.swf',
-                playcasso_xml:'../skins/playcasso/playcasso.xml',
                 schoon:'../skins/schoon/schoon.swf',
-                schoon_xml:'../skins/schoon/schoon.xml',
                 snel:'../skins/snel/snel.swf',
-                snel_xml:'../skins/snel/snel.xml',
-                stijl:'../skins/stijl/stijl.swf',
-                stijl_xml:'../skins/stijl/stijl.xml',
-        stormtrooper_xml:'../skins/stormtrooper/stormtrooper.xml'
+                stijl:'../skins/stijl/stijl.swf'
         },
         /** All the setup examples with their flashvars. **/
@@ -264 +281 @@
                 },
                 '     ': {},
-                'Audiodescription and captions plugins': {
+                'Audiodescription plugin': {
                         file:'../../testing/files/corrie.flv',
                         height:240,
                         width:500,
-                        plugins:'audiodescription,captions',
-                        'captions.file':'files/corrie.xml',
+                        plugins:'audiodescription',
                         'audiodescription.file':'files/corrie.mp3'
                 },
-                'Clickproxy plugin': {
-                        height:240,
-                        width:800,
-                        file:'../../testing/files/bunny.flv',
-                        plugins:'clickproxy',
-                        'clickproxy.listener':'$.alert'
+                'Captions plugins': {
+                        file:'../../testing/files/corrie.flv',
+                        height:240,
+                        width:500,
+                        plugins:'captions',
+                        'captions.file':'files/corrie.xml'
                 },
                 'HD plugin': {
@@ -334 +350 @@
                         'sharing.code':'<embed src="http://content.bitsontherun.com/players/nPripu9l-1754.swf" width="400" height="250" allowscriptaccess="always" />',
                         'sharing.link':'http://www.bigbuckbunny.org/'
-                },
-                'Snapshot plugin': {
-                        file:'../../testing/files/bunny.mp4',
-                        height:260,
-                        width:600,
-                        plugins:'snapshot',
-                        'snapshot.script':'files/snapshot.php'
                 }
         }

trunk/fl5/src/com/longtailvideo/jwplayer/player/Player.as

@@ -224 +224 @@
                         return controller.setPlaylistIndex(index);
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -232 +231 @@
                         return controller.next();
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -240 +238 @@
                         return controller.previous();
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -248 +245 @@
                         return controller.redraw();
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -256 +252 @@
                         return model.fullscreen;
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -264 +259 @@
                         controller.fullscreen(on);
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -272 +266 @@
                         return controller.link(index);
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -280 +273 @@
                         return view.components;
                 }
-                
-                
+
                 /**
                  * @inheritDoc
@@ -288 +280 @@
                         view.overrideComponent(plugin);
                 }
-                
+
                 /** 
                  * @private
@@ -297 +289 @@
                         return view.getPlugin(id);
                 } 
-                
+
                 /** The player should not accept any calls referencing its display stack **/
                 public override function addChild(child:DisplayObject):DisplayObject {