Changeset 596

Timestamp:

11/10/09 21:49:40 (4 years ago)

Author:

pablo

Message:

Removed view component to locking mechanism
V4 control bar locks user input to the sliders when the player is in the locked state

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/Controller.as (modified) (2 diffs)
• 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/ControlbarComponentV4.as (modified) (1 diff)

trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as

@@ -226 +226 @@
                                         _blockingResume = true;
                                 }
-                                _view.lock(plugin);
                                 return true;
                         }
@@ -247 +246 @@
                                         finalizeSetup();
                                 }
-                                _view.unlock(target);
                                 return true;
                         }

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

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

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

@@ -53 +53 @@
                 private var _plugins:Object;
 
-                private var _lockLayer:MovieClip;
-                private var _lockPlugin:IPlugin;
-                private var _lockAnimator:Animations;
-
                 private var _displayMasker:MovieClip;
 
@@ -170 +166 @@
                         _logoLayer.addChild(_logo);
 
-                        _lockLayer = setupLayer("lock", 6);
-                        setupLock();
 }
 
@@ -201 +195 @@
                         _imageLayer.mask = _displayMasker;
                         _mediaLayer.mask = _displayMasker;
-                }
-                
-                private function setupLock():void {
-                        _lockLayer.mouseEnabled = false;
-                        _lockLayer.mouseChildren = true;
-                        _lockLayer.visible = false;
-                        _lockLayer.alpha = 0;
-                        _lockAnimator = new Animations(_lockLayer);
                 }
                 
@@ -283 +269 @@
                         }
 
-                        resizeLock();
-
                         PlayerV4Emulation.getInstance(_player).resize(_player.config.width, _player.config.height);
                 }
@@ -294 +278 @@
                         bg.x = 0;
                         bg.y = 0;
-                }
-
-                private function resizeLock():void {
-                        _lockLayer.graphics.clear();
-                        _lockLayer.graphics.beginFill(0x000000, 0.7);
-                        _lockLayer.graphics.drawRect(0, 0, RootReference.stage.stageWidth, RootReference.stage.stageHeight);
-                        _lockLayer.graphics.endFill();
-                        _lockLayer.x = _lockLayer.y = 0;
-                        
-                        if (_lockPlugin) {
-                                (_lockPlugin as DisplayObject).x = 0;
-                                (_lockPlugin as DisplayObject).y = 0;
-                                var cfg:PluginConfig = _player.config.pluginConfig(_lockPlugin.id);
-                                cfg['x'] = cfg['y'] = 0;
-                                cfg['width'] = _lockLayer.width;
-                                cfg['height'] = _lockLayer.height;
-                                _lockPlugin.resize(cfg['width'], cfg['height']);
-                        }
                 }
 
@@ -445 +411 @@
                 }
                 
-                public function lock(plugin:IPlugin):void {
-                        _lockAnimator.fade(1);
-
-                        if (_pluginsLayer.contains(plugin as DisplayObject)) {
-                                _lockPlugin = _pluginsLayer.getChildAt(_pluginsLayer.getChildIndex(plugin as DisplayObject)) as IPlugin;
-                                _pluginsLayer.removeChild(_lockPlugin as DisplayObject);
-                                _lockLayer.addChild(_lockPlugin as DisplayObject);
-                        }
-                        
-                        redraw();
-                }
-                
-                public function unlock(plugin:IPlugin):void {
-                        if (plugin == _lockPlugin) {
-                                _lockLayer.removeChild(_lockPlugin as DisplayObject);
-                                _pluginsLayer.addChild(_lockPlugin as DisplayObject);
-                                _lockPlugin = null;
-                        }
-                        _lockAnimator.fade(0);
-                        
-                        redraw();
-                }
-
         }
 }

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

@@ -212 +212 @@
                 /** Handle mouse presses on sliders. **/
                 private function downHandler(evt:MouseEvent):void {
-                        scrubber = MovieClip(evt.target);
-                        if (blocking != true || scrubber.name == 'volumeSlider') {
-                                var rct:Rectangle = new Rectangle(scrubber.rail.x, scrubber.icon.y, scrubber.rail.width - scrubber.icon.width, 0);
-                                scrubber.icon.startDrag(true, rct);
-                                stage.addEventListener(MouseEvent.MOUSE_UP, upHandler);
-                        } else {
-                                scrubber = undefined;
+                        if (!_player.locked) {
+                                scrubber = MovieClip(evt.target);
+                                if (blocking != true || scrubber.name == 'volumeSlider') {
+                                        var rct:Rectangle = new Rectangle(scrubber.rail.x, scrubber.icon.y, scrubber.rail.width - scrubber.icon.width, 0);
+                                        scrubber.icon.startDrag(true, rct);
+                                        stage.addEventListener(MouseEvent.MOUSE_UP, upHandler);
+                                } else {
+                                        scrubber = undefined;
+                                }
                         }
                 }