Changeset 1059

Timestamp:

05/21/10 15:01:46 (3 years ago)

Author:

pablo

Message:

• Any transparent areas in the controlbar and playlist will shine through to the Flash stage (945)
• Adds controlbar backgroundcolor setting
• If no screencolor or display.backgroundcolor is set, the display background will be the Flash stage background color

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (6 diffs)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponent.as (modified) (4 diffs)
• src/com/longtailvideo/jwplayer/view/components/CoreComponent.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/PlaylistComponent.as (modified) (1 diff)

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

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

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

@@ -27 +27 @@
         import flash.display.Bitmap;
         import flash.display.DisplayObject;
+        import flash.display.DisplayObjectContainer;
         import flash.display.Loader;
         import flash.display.MovieClip;
@@ -52 +53 @@
                 protected var _root:MovieClip;
 
+                protected var _maskedLayers:MovieClip;
                 protected var _backgroundLayer:MovieClip;
                 protected var _mediaLayer:MovieClip;
@@ -169 +171 @@
 
                 protected function setupLayers():void {
-                        _backgroundLayer = setupLayer("background", currentLayer++);
+                        _maskedLayers = setupLayer("masked", currentLayer++);
+                        
+                        _backgroundLayer = setupLayer("background", 0, _maskedLayers);
                         setupBackground();
 
-                        _mediaLayer = setupLayer("media", currentLayer++);
+                        _mediaLayer = setupLayer("media", 1, _maskedLayers);
                         _mediaLayer.visible = false;
 
-                        _imageLayer = setupLayer("image", currentLayer++);
+                        _imageLayer = setupLayer("image", 1, _maskedLayers);
                         _image = new Loader();
                         _image.contentLoaderInfo.addEventListener(Event.COMPLETE, imageComplete);
@@ -194 +198 @@
 
 
-                protected function setupLayer(name:String, index:Number):MovieClip {
+                protected function setupLayer(name:String, index:Number, parent:DisplayObjectContainer=null):MovieClip {
                         var layer:MovieClip = new MovieClip();
-                        _root.addChildAt(layer, index);
+                        parent ? parent.addChildAt(layer,index) : _root.addChildAt(layer, index);
                         layer.name = name;
                         layer.x = 0;
@@ -210 +214 @@
                         
                         var screenColor:Color;
-                        if (_model.config.pluginConfig('display').hasOwnProperty('backgroundcolor')) {
+                        if (_model.config.screencolor) {
+                                screenColor = _model.config.screencolor;
+                        } else if (_model.config.pluginConfig('display').hasOwnProperty('backgroundcolor')) {
                                 screenColor = new Color(String(_model.config.pluginConfig('display')['backgroundcolor']));
-                        } else if (_model.config.screencolor) {
-                                screenColor = _model.config.screencolor;
-                        }
-                        
-                        background.graphics.beginFill(screenColor ? screenColor.color : 0x000000, 1);
+                        }
+                        
+                        background.graphics.beginFill(screenColor ? screenColor.color : 0x000000, screenColor ? 1 : 0);
                         background.graphics.drawRect(0, 0, 1, 1);
                         background.graphics.endFill();
@@ -228 +232 @@
                         _displayMasker.graphics.endFill();
 
-                        _backgroundLayer.mask = _displayMasker;
-                        _imageLayer.mask = _displayMasker;
-                        _mediaLayer.mask = _displayMasker;
+                        _maskedLayers.mask = _displayMasker;
                 }
 

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

@@ -101 +101 @@
                 protected var _volSlider:Slider;
 
+                protected var _bgColorSheet:Sprite;
+                
                 protected var controlbarConfig:PluginConfig;
                 protected var animations:Animations;
@@ -372 +374 @@
                                 var newBackground:Sprite = new Sprite();
                                 newBackground.name = "background";
-                                newBackground.graphics.beginFill(0, 1);
+                                newBackground.graphics.beginFill(0, 0);
                                 newBackground.graphics.drawRect(0, 0, 1, 1);
                                 newBackground.graphics.endFill();
@@ -380 +382 @@
                         if (!capLeft) { capLeft = new Sprite(); }
                         if (!capRight) { capRight = new Sprite(); }
+                        
+                        _bgColorSheet = new Sprite(); 
+                        if (backgroundColor) {
+                                _bgColorSheet.graphics.beginFill(backgroundColor.color, 1);
+                                _bgColorSheet.graphics.drawRect(0, 0, 1, 1);
+                                _bgColorSheet.graphics.endFill();
+                        }
+                        addChildAt(_bgColorSheet, 0);
+                        
                         
                         _buttons['background'] = back;
@@ -641 +652 @@
                         setChildIndex(capLeft, numChildren - 1);
                         setChildIndex(capRight, numChildren - 1);
+                        
+                        _bgColorSheet.width = _width;
+                        _bgColorSheet.height = background.height;
 
                         stopFader();

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

@@ -50 +50 @@
                 ///////////////////////////////////////////             
                 
+                protected function get backgroundColor():Color {
+                        return getConfigParam("backgroundcolor") ? new Color(String(getConfigParam("backgroundcolor"))) : null;
+                }
+
                 protected function get fontColor():Color {
                         return getConfigParam("fontcolor") ? new Color(String(getConfigParam("fontcolor"))) : null;

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

@@ -102 +102 @@
                         skinLoaded = true;
                         
-                        background = getSkinElement("background") as Sprite;
-                        if (!background) {
-                                var backColor:Color = getConfigParam("backgroundcolor") ? new Color(String(getConfigParam("backgroundcolor"))) : player.config.screencolor;
-                                background = new Sprite();
-                                background.name = "background";
-                                background.graphics.beginFill(backColor ? backColor.color : 0, 1);
-                                background.graphics.drawRect(0, 0, 1, 1);
-                                background.graphics.endFill();
-                        }
+                        background = new Sprite();
+                        var bgSkin:DisplayObject = getSkinElement("background") as Sprite;
+                        if (bgSkin) { 
+                                background.addChild(bgSkin);
+                        }
+                        
+                        if (backgroundColor) {
+                                var backgroundSheet:Sprite = new Sprite();
+                                backgroundSheet.graphics.beginFill(backgroundColor.color, 1);
+                                backgroundSheet.graphics.drawRect(0, 0, bgSkin ? bgSkin.width : 1, bgSkin ? bgSkin.height : 1);
+                                backgroundSheet.graphics.endFill();
+                                background.addChildAt(backgroundSheet, 0);
+                        }
+                        background.name = "background";
                         addElement(background);