Changeset 612

Timestamp:

11/11/09 20:40:25 (4 years ago)

Author:

pablo

Message:

Implemented fading for PNG controlbar
Disabled PNG volume slider when player is muted.

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponent.as (modified) (7 diffs)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as (modified) (6 diffs)

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

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

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

@@ -7 +7 @@
         import com.longtailvideo.jwplayer.player.IPlayer;
         import com.longtailvideo.jwplayer.player.PlayerState;
+        import com.longtailvideo.jwplayer.plugins.PluginConfig;
+        import com.longtailvideo.jwplayer.utils.Animations;
         import com.longtailvideo.jwplayer.utils.Draw;
         import com.longtailvideo.jwplayer.utils.Strings;
@@ -20 +22 @@
         import flash.text.TextFormat;
         import flash.ui.Mouse;
+        import flash.utils.clearTimeout;
+        import flash.utils.setTimeout;
 
 
@@ -91 +95 @@
                 protected var _height:Number;
 
-
+                protected var controlbarConfig:PluginConfig;
+                protected var animations:Animations;
+                protected var hiding:Number;
+                
                 public function ControlbarComponent(player:IPlayer) {
                         super(player, "controlbar");
@@ -102 +109 @@
                         setTime(0, 0);
                         updateVolumeSlider();
-                }
-
+                        controlbarConfig = _player.config.pluginConfig(_name);
+                        animations = new Animations(this);
+                }
 
                 private function addEventListeners():void {
@@ -136 +144 @@
                 }
 
-
-                private function stateHandler(evt:PlayerEvent):void {
+                
+                private function startFader():void {
+                        if (controlbarConfig['position'] == 'over' || (_player.fullscreen && controlbarConfig['position'] != 'none')) {
+                                if (!isNaN(hiding)) {
+                                        clearTimeout(hiding);
+                                }
+                                hiding = setTimeout(moveTimeout, 2000);
+                                _player.controls.display.addEventListener(MouseEvent.MOUSE_MOVE, moveHandler);
+                        }
+                }
+                
+                private function stopFader():void {
+                        if (!isNaN(hiding)) {
+                                clearTimeout(hiding);
+                                try {
+                                        _player.controls.display.removeEventListener(MouseEvent.MOUSE_MOVE, moveHandler);
+                                } catch (e:Error) {}
+                        }
+                        Mouse.show();
+                        animations.fade(1, 0.5);
+                }
+                
+                /** Show above controlbar on mousemove. **/
+                private function moveHandler(evt:MouseEvent=null):void {
+                        if (alpha == 0) {
+                                animations.fade(1, 0.5);
+                        }
+                        clearTimeout(hiding);
+                        hiding = setTimeout(moveTimeout, 2000);
+                        Mouse.show();
+                }
+                
+                
+                /** Hide above controlbar again when move has timed out. **/
+                private function moveTimeout():void {
+                        animations.fade(0, 0.5);
+                        Mouse.hide();
+                }
+                
+                private function stateHandler(evt:PlayerEvent=null):void {
+                        switch(_player.state) {
+                                case PlayerState.BUFFERING:
+                                case PlayerState.PLAYING:
+                                        startFader();
+                                        break;
+                                case PlayerState.PAUSED:
+                                case PlayerState.IDLE:
+                                        stopFader();
+                                        break;
+                        }
                         updateControlbarState();
                         redraw();
@@ -356 +412 @@
 
                 private function volumeHandler(evt:ViewEvent):void {
-                        var volume:Number = Math.round(evt.data * 100);
-                        if (!_player.locked) {
-                                var volumeEvent:MediaEvent = new MediaEvent(MediaEvent.JWPLAYER_MEDIA_VOLUME);
-                                volumeEvent.volume = volume;
-                                updateVolumeSlider(volumeEvent);
-                        }
-                        dispatchEvent(new ViewEvent(ViewEvent.JWPLAYER_VIEW_VOLUME, volume));
+                        if (!_player.mute) {
+                                var volume:Number = Math.round(evt.data * 100);
+                                if (!_player.locked) {
+                                        var volumeEvent:MediaEvent = new MediaEvent(MediaEvent.JWPLAYER_MEDIA_VOLUME);
+                                        volumeEvent.volume = volume;
+                                        updateVolumeSlider(volumeEvent);
+                                }
+                                dispatchEvent(new ViewEvent(ViewEvent.JWPLAYER_VIEW_VOLUME, volume));
+                        }
                 }
 
@@ -491 +549 @@
                         setChildIndex(capRight, numChildren - 1);
 
-                        updateControlbarState();
+                        stopFader();
+                        stateHandler();
                         redraw();
-                        Mouse.show();
                 }
 

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

@@ -142 +142 @@
                 }
 
-
                 public function resize(width:Number, height:Number):void {
                         if (!(PlayerLayoutManager.testPosition(controlbarConfig['position']) || controlbarConfig['position'] == "over")) {
@@ -222 +221 @@
                                         stage.addEventListener(MouseEvent.MOUSE_UP, upHandler);
                                 } else {
-                                        scrubber = undefined;
+                                        scrubber = null;
                                 }
                         }
@@ -242 +241 @@
                         fixTime();
                 }
-
-
-                /** Show above controlbar on mousemove. **/
-                private function moveHandler(evt:MouseEvent=null):void {
-                        if (alpha == 0) {
-                                animations.fade(1);
-                        }
-                        clearTimeout(hiding);
-                        hiding = setTimeout(moveTimeout, 2000);
-                        Mouse.show();
-                }
-
-
-                /** Hide above controlbar again when move has timed out. **/
-                private function moveTimeout():void {
-                        animations.fade(0);
-                        Mouse.hide();
-                }
-
 
                 /** Show a mute icon if playing. **/
@@ -376 +356 @@
                 }
 
+                
                 private function startFader():void {
                         if (controlbarConfig['position'] == 'over' || (_player.fullscreen && controlbarConfig['position'] != 'none')) {
@@ -396 +377 @@
                         animations.fade(1);
                 }
-
+                
+                /** Show above controlbar on mousemove. **/
+                private function moveHandler(evt:MouseEvent=null):void {
+                        if (alpha == 0) {
+                                animations.fade(1);
+                        }
+                        clearTimeout(hiding);
+                        hiding = setTimeout(moveTimeout, 2000);
+                        Mouse.show();
+                }
+                
+                
+                /** Hide above controlbar again when move has timed out. **/
+                private function moveTimeout():void {
+                        animations.fade(0);
+                        Mouse.hide();
+                }
+                
                 /** Process state changes **/
-                private function stateHandler(evt:PlayerEvent=undefined):void {
+                private function stateHandler(evt:PlayerEvent=null):void {
                         // TODO: Fix non-working fading
                         clearTimeout(hiding);
                         try {
-                                var dps:String = stage['displayState'];
-
                                 switch (_player.state) {
                                         case PlayerState.PLAYING:
@@ -531 +527 @@
                         }
                         var pct:Number = (scrubber.icon.x - scrubber.rail.x) / (scrubber.rail.width - scrubber.icon.width) * mpl;
-                        scrubber = undefined;
+                        scrubber = null;
                         if (sliderType == 'volumeSlider') {
                                 var volumeEvent:MediaEvent = new MediaEvent(MediaEvent.JWPLAYER_MEDIA_VOLUME);