Changeset 637

Timestamp:

11/17/09 17:22:41 (4 years ago)

Author:

pablo

Message:

• Fixed error icons and text in PNG and SWF skins.
• Fixed PNG controlbar position="none"

Location:

trunk/fl5

Files:

• assets/flash/skin/five.fla (modified) (previous)
• assets/flash/skin/five.swf (modified) (previous)
• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/utils/DisplayObjectUtils.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponent.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as (modified) (4 diffs)
• src/com/longtailvideo/jwplayer/view/skins/SWFSkin.as (modified) (1 diff)

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

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

trunk/fl5/src/com/longtailvideo/jwplayer/utils/DisplayObjectUtils.as

@@ -17 +17 @@
                         }
                 }
+
+                public static function describeDisplayObject(displayObject:DisplayObject, depth:Number=0):String {
+                        var descString:String = " ";
+                        for(var i:Number=0; i<=depth; i++) { descString += "-"; }
+                        descString += displayObject.name + " = {" +
+                                "width:" + displayObject.width + ", " +
+                                "height:" + displayObject.height + ", " +
+                                "x:" + displayObject.x + ", " +
+                                "y:" + displayObject.y + "}";
+                        
+                        var displayObjectContainer:DisplayObjectContainer = displayObject as DisplayObjectContainer;  
+                        if (displayObjectContainer) {
+                                for(var j:Number=0; j<displayObjectContainer.numChildren; j++) {
+                                        descString += "\n" + describeDisplayObject(displayObjectContainer.getChildAt(j), depth+1);
+                                }
+                        }
+                        
+                        return descString;
+                        
+                }
+
         }
 }

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

@@ -133 +133 @@
                         _model.addEventListener(MediaEvent.JWPLAYER_MEDIA_LOADED, mediaLoaded);
                         _model.playlist.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_ITEM, itemHandler);
+                        _model.playlist.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_LOADED, itemHandler);
+                        _model.playlist.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_UPDATED, itemHandler);
                         _model.addEventListener(PlayerStateEvent.JWPLAYER_PLAYER_STATE, stateHandler);
 

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/ControlbarComponent.as

@@ -509 +509 @@
 
                 public function resize(width:Number, height:Number):void {
+                        if (getConfigParam('position') == "none") {
+                                visible = false;
+                                return;
+                        }
+                        
                         _width = width;
 

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as

@@ -62 +62 @@
                         _icon = new MovieClip();
                         addChildAt(icon, 1);
+
                         _text = new TextField();
                         var textColorTransform:ColorTransform = new ColorTransform();
-                        textColorTransform.color = player.config.frontcolor ? player.config.frontcolor.color : 0xFFFFFF;
+                        textColorTransform.color = player.config.frontcolor ? player.config.frontcolor.color : 0x999999;
                         text.transform.colorTransform = textColorTransform;
                         text.gridFitType = GridFitType.NONE;
@@ -147 +148 @@
                 
                 public function setText(displayText:String):void {
-                        text.text = displayText ? displayText : '';
+                        if (_icon is Sprite && (_icon as Sprite).getChildByName('txt') is TextField) {
+                                ((_icon as Sprite).getChildByName('txt') as TextField).text = displayText ? displayText : '';
+                                text.text = '';
+                        } else {
+                                text.text = displayText ? displayText : '';
+                        }
                         positionText();
                 }
@@ -153 +159 @@
                 
                 private function positionText():void {
-                        if (text.width > background.scaleX * .75) {
-                                text.width = background.scaleX * .75;
-                                text.wordWrap = true;
-                        } else {
-                                text.autoSize = TextFormatAlign.CENTER;
-                        }
-                        text.x = (background.scaleX - text.textWidth) / 2;
-                        text.y = icon.y + (icon.height / 2) + 10;
+                        if (text.text) {
+                                text.visible = true;
+                                if (text.width > background.scaleX * .75) {
+                                        text.width = background.scaleX * .75;
+                                        text.wordWrap = true;
+                                } else {
+                                        text.autoSize = TextFormatAlign.CENTER;
+                                }
+                                text.x = (background.scaleX - text.textWidth) / 2;
+                                if (_player.skin is SWFSkin) {
+                                        text.y = icon.y + (icon.height/2) + 10;
+                                } else {
+                                        text.y = icon.y + icon.height + 10;
+                                }
+                        } else {
+                                text.visible = false;
+                        }
                 }
                 
@@ -248 +263 @@
                         return _background;
                 }
+                
         }
 }

trunk/fl5/src/com/longtailvideo/jwplayer/view/skins/SWFSkin.as

@@ -74 +74 @@
                 public override function getSkinElement(component:String, element:String):DisplayObject {
                         // Hack for the error icon
-                        if (component == 'display') {
-                                if (element == 'errorIcon' && super.getSkinElement(component, 'errorIcon')['icn']) {
-                                        var errorButton:Sprite = Draw.clone(super.getSkinElement('display', 'playIcon') as Sprite) as Sprite;
-                                        errorButton.removeChild(errorButton['icn']);
-                                        errorButton.x = 0;
-                                        errorButton.y = 0;
-                                        var errorIcon:Sprite = super.getSkinElement(component, 'errorIcon')['icn'];
-                                        errorButton.addChild(errorIcon);
-                                        var errorButttonBackground:DisplayObject = errorButton.getChildAt(0);
-                                        errorIcon.x = errorButttonBackground.x + (errorButttonBackground.width - errorIcon.width) / 2;
-                                        errorIcon.y = errorButttonBackground.y + (errorButttonBackground.height - errorIcon.height) / 2;
-                                        return errorButton;
-                                } else if (super.getSkinElement(component, element) && super.getSkinElement(component, element)['bck']) {
-                                        var skinElement:DisplayObjectContainer = super.getSkinElement(component, element) as DisplayObjectContainer;
-                                        var xoffset:Number = skinElement['bck'].x * -1;
-                                        var yoffset:Number = skinElement['bck'].y * -1;
-                                        for (var i:Number = 0; i < skinElement.numChildren; i++){
-                                                var child:DisplayObject = skinElement.getChildAt(i);
-                                                if (child.name != 'bck'){
-                                                        child.x += xoffset;
-                                                        child.y += xoffset;
-                                                }
-                                        }
-                                        skinElement['bck'].x = 0;
-                                        skinElement['bck'].y = 0;
-                                        return skinElement;
-                                }
-                        } else if (component == "dock") {
+                        if (component == "dock") {
                                 var cls:Class;
                                 try {