Changeset 634

Timestamp:

11/16/09 20:24:04 (4 years ago)

Author:

pablo

Message:

• Player doesn't allow adding / removing children
• Player handles PLAYER_READY before default
• V4 plugins can retrieve the plugin configs for v5 plugins

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/model/PlayerConfig.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/player/Player.as (modified) (3 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerV4Emulation.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)

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

@@ -368 +368 @@
                 public function get pluginIds():Array {
                         var names:Array = [];
-                        for (var plug:String in _pluginConfig) {
-                                if ( (['controlbar','playlist','dock','display']).indexOf(plug) == -1 ) {
-                                        names.push(plug);
+
+                        // Only include loaded plugins
+                        for each (var lp:String in _plugins.split(",")) {
+                                var plugName:String = (lp.substr(lp.lastIndexOf("/")+1).replace(/(.*)\.swf$/i, "$1").split("-")[0] as String).toLowerCase();
+                                if (plugName) {
+                                        names.push(plugName);
                                 }
-                                /* TODO: Make sure this only returns loaded plugins
-                                if (_plugins.indexOf(plug)) {
-                                        names.push(plug);
-                                }
-                                */
-                        }
+                        }
+                        
                         return names;
                 }

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

@@ -13 +13 @@
         import com.longtailvideo.jwplayer.view.interfaces.ISkin;
         
+        import flash.display.DisplayObject;
         import flash.display.Sprite;
         import flash.events.Event;
@@ -55 +56 @@
                         view = new View(this, model);
                         controller = new Controller(this, model, view);
-                        controller.addEventListener(PlayerEvent.JWPLAYER_READY, playerReady);
+                        controller.addEventListener(PlayerEvent.JWPLAYER_READY, playerReady, false, -1);
                         controller.setupPlayer();
                 }
@@ -296 +297 @@
                         return view.getPlugin(id);
                 } 
+                
+                /** The player should not accept any calls referencing its display stack **/
+                public override function addChild(child:DisplayObject):DisplayObject {
+                        return null;
+                }
+
+                /** The player should not accept any calls referencing its display stack **/
+                public override function addChildAt(child:DisplayObject, index:int):DisplayObject {
+                        return null;
+                }
+
+                /** The player should not accept any calls referencing its display stack **/
+                public override function removeChild(child:DisplayObject):DisplayObject {
+                        return null;
+                }
+
+                /** The player should not accept any calls referencing its display stack **/
+                public override function removeChildAt(index:int):DisplayObject {
+                        return null;
+                }
+                
         }
 }

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

@@ -13 +13 @@
         import com.longtailvideo.jwplayer.model.Model;
         import com.longtailvideo.jwplayer.model.PlaylistItem;
+        import com.longtailvideo.jwplayer.plugins.IPlugin;
         import com.longtailvideo.jwplayer.plugins.PluginConfig;
         import com.longtailvideo.jwplayer.plugins.V4Plugin;
@@ -369 +370 @@
                 
                 public override function getPluginConfig(plugin:Object):Object {
-                        var pluginParent:V4Plugin = (plugin as DisplayObject).parent as V4Plugin; 
-                        if (pluginParent) {
-                                return _player.config.pluginConfig(pluginParent.pluginId);
+                        if (plugin is IPlugin) {
+                                return _player.config.pluginConfig((plugin as IPlugin).id)
+                        } else if (plugin is V4Plugin) {
+                                return _player.config.pluginConfig((plugin as V4Plugin).pluginId);
+                        } else if ((plugin as DisplayObject).parent is V4Plugin) {
+                                return _player.config.pluginConfig((plugin.parent as V4Plugin).pluginId);
                         } else if (plugin is IDockComponent) {
                                 return _player.config.pluginConfig('dock');

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

@@ -3 +3 @@
         
         public class PlayerVersion {
-                protected static var _version:String = "5.0.626 beta";
+                protected static var _version:String = "5.0.627 beta";
                 
                 public static function get version():String {