Changeset 1036

Timestamp:

05/13/10 11:51:38 (3 years ago)

Author:

pablo

Message:

• Controlbar buttoncolor setting replaces frontcolor
• Make YouTube click mask a little bigger to account for fullscreen mode

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/HTTPMediaProvider.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponent.as (modified) (3 diffs)
• src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as (modified) (1 diff)

trunk/fl5/src/com/longtailvideo/jwplayer/media/HTTPMediaProvider.as

@@ -253 +253 @@
                         }
                         
-                        var bufferPercent:Number;
                         var bufferFill:Number;
                         if (item.duration > 0 && _stream && _stream.bytesTotal > 0) {
                                 percentoffset =  _timeoffset /  item.duration * 100;
-                                bufferPercent = (_stream.bytesLoaded / _stream.bytesTotal) * (1 - percentoffset/100) * 100;
                                 var bufferTime:Number = _stream.bufferTime < (item.duration - pos) ? _stream.bufferTime : Math.round(item.duration - pos);
-                                bufferFill = _stream.bufferTime == 0 ? 0 : Math.ceil(_stream.bufferLength / bufferTime * 100);
+                                bufferFill = _stream.bufferTime ? Math.ceil(_stream.bufferLength / bufferTime * 100) : 0;
                         } else {
                                 percentoffset = 0;
-                                bufferPercent = 0;
-                                bufferFill = _stream.bufferLength/_stream.bufferTime * 100;
+                                bufferFill = _stream.bufferTime ? _stream.bufferLength/_stream.bufferTime * 100 : 0;
                         }
         
+                        var bufferPercent:Number = _stream.bytesTotal ? (_stream.bytesLoaded / _stream.bytesTotal) * (1 - percentoffset/100) * 100 : 0;
+
                         if (!_bandwidthChecked && _stream.bytesLoaded > 0 && _stream.bytesLoaded < _stream.bytesTotal) {
                                 _bandwidthChecked = true;
@@ -271 +270 @@
                                 _bandwidthTimeout = setTimeout(checkBandwidth, _bandwidthDelay, _stream.bytesLoaded);
                         }
-                        
+
                         if (bufferFill < 50 && state == PlayerState.PLAYING) {
                                 _bufferFull = false;

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

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

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

@@ -423 +423 @@
                         button.setOverIcon(getSkinElement(name + "ButtonOver"));
                         button.setBackground(getSkinElement(name + "ButtonBack"));
-                        button.outColor = player.config.lightcolor;
-                        button.overColor = player.config.backcolor;
                         button.tabEnabled = true;
                         button.clickFunction = function():void {
@@ -536 +534 @@
                 }
 
+                protected function get buttonColor():Color {
+                        return getConfigParam("buttoncolor") ? new Color(String(getConfigParam("buttoncolor"))) : null;
+                }
+                
 
                 public function addButton(icon:DisplayObject, name:String, handler:Function=null):MovieClip {
@@ -546 +548 @@
                                 var outImage:Sprite = new Sprite();
                                 var outIcon:DisplayObject = icon;
-                                if (_player.config.frontcolor){
+                                if (buttonColor || _player.config.frontcolor){
                                         var outTransform:ColorTransform = new ColorTransform();
-                                        outTransform.color = _player.config.frontcolor.color;
+                                        outTransform.color = buttonColor ? buttonColor.color : _player.config.frontcolor.color;
                                         outIcon.transform.colorTransform = outTransform;
                                 }

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

@@ -192 +192 @@
                         _youtubeMask.graphics.clear();
                         _youtubeMask.graphics.beginFill(0x00AA00, 1);
-                        _youtubeMask.graphics.drawRect(0, 0, width-90, height);
-                        _youtubeMask.graphics.drawRect(0, 0, width, height-45);
+                        _youtubeMask.graphics.drawRect(0, 0, width-120, height);
+                        _youtubeMask.graphics.endFill();
+                        _youtubeMask.graphics.beginFill(0x00AA00, 1);
+                        _youtubeMask.graphics.drawRect(0, 0, width, height-60);
                         _youtubeMask.graphics.endFill();