Changeset 441

Timestamp:

10/12/09 18:22:18 (4 years ago)

Author:

pablo

Message:

IPlugin requires v5 plugins to implement initPlugin instead of initializePlugin()
Fixed playlist resizing
View dispatches errorevent instead of throwing error on overrideComponent

Location:

trunk/fl5

Files:

• bin-release/player.swf (modified) (previous)
• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/PlayerSetup.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/controller/PluginLoader.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/model/PlaylistItem.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/Player.as (modified) (3 diffs)
• src/com/longtailvideo/jwplayer/plugins/IPlugin.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/plugins/V4Plugin.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/PlayerComponents.as (modified) (3 diffs)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (2 diffs)
• test/assets/skin/png/silk/skin.xml (modified) (4 diffs)

trunk/fl5/src/com/longtailvideo/jwplayer/controller/PlayerSetup.as

@@ -190 +190 @@
                                 for each (var pluginName:String in _view.loadedPlugins()) {
                                         var plugin:IPlugin = _view.getPlugin(pluginName);
-                                        plugin.initializePlugin(_player, _model.config.pluginConfig(pluginName));
+                                        plugin.initPlugin(_player, _model.config.pluginConfig(pluginName));
                                 }
                                 tasker.success();

trunk/fl5/src/com/longtailvideo/jwplayer/controller/PluginLoader.as

@@ -51 +51 @@
                 
                 private function loadLocalPlugin(plugin:String):void {
-                        if (plugin.indexOf("/") >= 0 || RootReference.root.loaderInfo.url.indexOf("http") != 0) {
+                        if (plugin.indexOf("/") >= 0 || RootReference.root.loaderInfo.url.indexOf("http") == 0) {
                                 var loader:AssetLoader = new AssetLoader();
                                 loader.addEventListener(Event.COMPLETE, loadSuccess);

trunk/fl5/src/com/longtailvideo/jwplayer/model/PlaylistItem.as

@@ -23 +23 @@
                 public function PlaylistItem(obj:Object = null) {
                         for (var itm:String in obj) {
-                                // For backwards compatibility
-                                if (itm == "type") itm = "provider";
                                 if (this[itm] && typeof(this[itm]) == typeof(0)) {
                                         this[itm] = Number(obj[itm]);
@@ -33 +31 @@
                 }
                 
-                public function get type():String {
-                        return provider;
-                }
+                // For backwards compatibility
+                public function get type():String { return provider; }
+                public function set type(t:String):void { provider = t; }
                 
         }

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

@@ -10 +10 @@
         import com.longtailvideo.jwplayer.view.PlayerComponents;
         import com.longtailvideo.jwplayer.view.View;
+        import com.longtailvideo.jwplayer.view.interfaces.IPlayerComponent;
         import com.longtailvideo.jwplayer.view.interfaces.ISkin;
         
@@ -30 +31 @@
          */
         public class Player extends Sprite {
-                private static var playerVersion:String = "5.0.246 alpha";
+                private static var playerVersion:String = "5.0.441 alpha";
                 
                 private var model:Model;
@@ -208 +209 @@
                         return view.components;
                 }
+                
+                public function overrideComponent(plugin:IPlayerComponent):void {
+                        view.overrideComponent(plugin);
+                }
 
         }

trunk/fl5/src/com/longtailvideo/jwplayer/plugins/IPlugin.as

@@ -10 +10 @@
          */
         public interface IPlugin extends IEventDispatcher {
-                function initializePlugin(player:Player, config:PluginConfig):void;
+                function initPlugin(player:Player, config:PluginConfig):void;
                 function resize(width:Number, height:Number):void;
         }

trunk/fl5/src/com/longtailvideo/jwplayer/plugins/V4Plugin.as

@@ -17 +17 @@
                 }
 
-                public function initializePlugin(player:Player, config:PluginConfig):void {
+                public function initPlugin(player:Player, config:PluginConfig):void {
                         plug.initializePlugin(PlayerV4Emulation.getInstance());
                 }

trunk/fl5/src/com/longtailvideo/jwplayer/view/PlayerComponents.as

@@ -2 +2 @@
         import com.longtailvideo.jwplayer.model.PlayerConfig;
         import com.longtailvideo.jwplayer.player.Player;
+        import com.longtailvideo.jwplayer.plugins.PluginConfig;
         import com.longtailvideo.jwplayer.view.components.ControlbarComponent;
         import com.longtailvideo.jwplayer.view.components.ControlbarComponentV4;
@@ -10 +11 @@
         import com.longtailvideo.jwplayer.view.interfaces.IDisplayComponent;
         import com.longtailvideo.jwplayer.view.interfaces.IDockComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IPlayerComponent;
         import com.longtailvideo.jwplayer.view.interfaces.IPlaylistComponent;
         import com.longtailvideo.jwplayer.view.interfaces.ISkin;
@@ -66 +68 @@
                 }
                 
+                public function resize(width:Number, height:Number):void {
+                        resizeComponent(_display, _config.pluginConfig('display'));
+                        resizeComponent(_controlbar, _config.pluginConfig('controlbar'));
+                        resizeComponent(_playlist, _config.pluginConfig('playlist'));
+                }
                 
-                public function resize(width:Number, height:Number):void {
-                        _display.resize(width, height);
-                        _display.x = Number(_player.config.pluginConfig('display')['x']);
-                        _display.y = Number(_player.config.pluginConfig('display')['y']);
-                        
-                        _controlbar.resize(width, height);
-                        _controlbar.x = Number(_player.config.pluginConfig('controlbar')['x']);
-                        _controlbar.y = Number(_player.config.pluginConfig('controlbar')['y']);
-
-                        _playlist.resize(width, height);
-                        _playlist.x = Number(_player.config.pluginConfig('playlist')['x']);
-                        _playlist.y = Number(_player.config.pluginConfig('playlist')['y']);                     
-                        
+                private function resizeComponent(comp:IPlayerComponent, config:PluginConfig):void {
+                        comp.resize(config['width'], config['height']);
+                        comp.x = config['x'];
+                        comp.y = config['y'];
                 }
         }

trunk/fl5/src/com/longtailvideo/jwplayer/view/View.as

@@ -76 +76 @@
                         background.name = "background";
                         _backgroundLayer.addChildAt(background, 0);
-                        background.graphics.beginFill(_player.config.backcolor, 1);
+                        background.graphics.beginFill(_player.config.screencolor, 1);
                         background.graphics.drawRect(0, 0, 1, 1);
                         background.graphics.endFill();
@@ -186 +186 @@
                                 // Replace playlist
                         } else {
-                                throw(new Error("Component must implement a component interface"));
+                                dispatchEvent(new ErrorEvent(ErrorEvent.ERROR, false, false, "Component must implement a component interface"));
                         }
                 }

trunk/fl5/test/assets/skin/png/silk/skin.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
-<skin version="1.0" name="Happy Faces" author="Leonardo Da Vinci">
+<skin version="1.0" name="Silk" author="http://www.famfamfam.com/">
 
         <settings>
@@ -18 +18 @@
                                 <element name="back" src="smiley.png" />
                                 <element name="shade" src="smiley.png" />
+                                <element name="divider" src="smiley.png" />
                                 
                                 <element name="playButton" src="resultset_next.png" />
@@ -61 +62 @@
                                 
                                 <element name="volumeSliderRail" src="shading.png" />
-                                <element name="volumeSliderBuffer" src="smiley.png" />
                                 <element name="volumeSliderProgress" src="shape_square.png" />
                                 <element name="volumeSliderThumb" src="bullet_white.png" />
@@ -89 +89 @@
                                 <element name="itemBack" src="smiley.png" />
                                 <element name="itemShade" src="smiley.png" />
-                                <element name="rail" src="smiley.png" />
-                                <element name="slider" src="smiley.png" />
-                                <element name="sliderBack" src="smiley.png" />
-                                <element name="sliderOver" src="smiley.png" />
+                                <element name="sliderRail" src="smiley.png" />
+                                <element name="sliderThumb" src="smiley.png" />
                         </elements>
                 </component>