Changeset 2042

Timestamp:

01/05/12 14:36:43 (17 months ago)

Author:

pablo

Message:

Fixes "controlbar=bottom" use case bug

Location:

branches/fl5_instream

Files:

• js/bin-debug/jwplayer.js (modified) (1 diff)
• js/src/jwplayer.js (modified) (1 diff)
• js/test/examples/instream/InStreamAdPlugin.as (added)
• js/test/examples/instream/build (added)
• js/test/examples/instream/build/build.xml (added)
• js/test/examples/instream/instreamads.swf (added)
• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/player/InstreamPlayer.as (modified) (6 diffs)
• src/com/longtailvideo/jwplayer/player/Player.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (3 diffs)

branches/fl5_instream/js/bin-debug/jwplayer.js

@@ -19 +19 @@
 var $jw = jwplayer;
 
-jwplayer.version = '5.9.2040';
+jwplayer.version = '5.9.2042';
 
 // "Shiv" method for older IE browsers; required for parsing media tags

branches/fl5_instream/js/src/jwplayer.js

@@ -11 +11 @@
 var $jw = jwplayer;
 
-jwplayer.version = '5.9.2040';
+jwplayer.version = '5.9.2042';
 
 // "Shiv" method for older IE browsers; required for parsing media tags

branches/fl5_instream/src/com/longtailvideo/jwplayer/player/InstreamPlayer.as

@@ -27 +27 @@
         import com.longtailvideo.jwplayer.view.components.ControlbarComponent;
         import com.longtailvideo.jwplayer.view.components.DisplayComponent;
+        import com.longtailvideo.jwplayer.view.interfaces.IControlbarComponent;
         import com.longtailvideo.jwplayer.view.interfaces.IDisplayComponent;
         import com.longtailvideo.jwplayer.view.interfaces.IPlayerComponent;
@@ -56 +57 @@
                 protected var _controlsLayer:Sprite;
                 protected var _mediaLayer:Sprite;
+                protected var _mediaMask:Sprite;
                 protected var _isConfig:PlayerConfig;
                 protected var _controls:PlayerComponents;
@@ -70 +72 @@
                         _view = view;
                         
+                        if (!target || !item || !options || !model || !view || !controller) {
+                                throw new ArgumentError("InstreamPlayer must be initialized with non-null arguments");
+                        } 
+                                
                         if (!_options.autoload) {
                                 _playCalled = true;
@@ -261 +267 @@
                         _instreamDisplay = new Sprite();
                         _mediaLayer = new Sprite();
+                        _mediaMask = new Sprite();
                         _controlsLayer = new Sprite();
                         
@@ -344 +351 @@
                 protected function resizeHandler(evt:ViewEvent=null):void {
                         var screenColor:Color;
+                        var viewDisplay:IDisplayComponent = _view.components.display;
+                        var viewControlbar:IControlbarComponent = _view.components.controlbar;
+                        
                         if (_model.config.screencolor) {
                                 screenColor = _model.config.screencolor;
@@ -357 +367 @@
                         _instreamDisplay.graphics.clear();
                         _instreamDisplay.graphics.beginFill(screenColor ? screenColor.color : 0, 1);
-                        _instreamDisplay.graphics.drawRect(_view.components.display.x, _view.components.display.y, _view.components.display.width, _view.components.display.height);
+                        _instreamDisplay.graphics.drawRect(viewDisplay.x, viewDisplay.y, viewDisplay.width, viewDisplay.height);
                         _instreamDisplay.graphics.endFill();
                         if(_provider) {
-                                _provider.resize(_view.components.display.width, _view.components.display.height);
-                        }
-                        _controls.display.resize(_view.components.display.width, _view.components.display.height);
+                                _provider.resize(viewDisplay.width, viewDisplay.height);
+                        }
+                        _controls.display.resize(viewDisplay.width, viewDisplay.height);
+                        _mediaMask = new Sprite();
+                        _mediaMask.graphics.beginFill(0xFF0000);
+                        _mediaMask.graphics.drawRect(viewDisplay.x, viewDisplay.y, viewDisplay.width, viewDisplay.height) ;
+                        _mediaLayer.mask = _mediaMask;
                         
                         if (_isConfig.pluginConfig('controlbar')['position'] == 'over' || _isConfig.fullscreen) {
-                                _controls.controlbar.resize(_view.components.display.width, _view.components.display.height);
+                                _controls.controlbar.resize(viewDisplay.width, viewDisplay.height);
                         } else {
-                                _controls.controlbar.resize(_view.components.controlbar.width, _view.components.controlbar.height);
-                        }
-                        _controls.controlbar.x = _view.components.controlbar.x;
-                        _controls.controlbar.y = _view.components.controlbar.y;
+                                _controls.controlbar.resize(viewControlbar.width, viewControlbar.height);
+                        }
+                        _controls.controlbar.x = viewControlbar.x;
+                        _controls.controlbar.y = viewControlbar.y;
                 }
                 

branches/fl5_instream/src/com/longtailvideo/jwplayer/player/Player.as

@@ -6 +6 @@
         import com.longtailvideo.jwplayer.model.IInstreamOptions;
         import com.longtailvideo.jwplayer.model.IPlaylist;
+        import com.longtailvideo.jwplayer.model.InstreamOptions;
         import com.longtailvideo.jwplayer.model.Model;
         import com.longtailvideo.jwplayer.model.PlayerConfig;
@@ -286 +287 @@
                  **/
                 public function loadInstream(target:IPlugin, item:PlaylistItem, options:IInstreamOptions=null):IInstreamPlayer {
+                        if (!options) options = new InstreamOptions();
                         var instream:IInstreamPlayer = new InstreamPlayer(target, item, options, model, view, controller);
                         return instream;

branches/fl5_instream/src/com/longtailvideo/jwplayer/player/PlayerVersion.as

@@ -3 +3 @@
         
         public class PlayerVersion {
-                protected static var _version:String = '5.9.2040';
+                protected static var _version:String = '5.9.2042';
                 
                 public static function get version():String {

branches/fl5_instream/src/com/longtailvideo/jwplayer/view/View.as

@@ -72 +72 @@
                 
                 protected var _displayMasker:MovieClip;
-                protected var _instreamMasker:MovieClip;
                 
                 protected var _image:Loader;
@@ -323 +322 @@
 
                         _maskedLayers.mask = _displayMasker;
-                        
-                        _instreamMasker = new MovieClip();
-                        _instreamMasker.graphics.beginFill(0x000000, 1);
-                        _instreamMasker.graphics.drawRect(0, 0, _player.config.width, _player.config.height);
-                        _instreamMasker.graphics.endFill();
-                        
-                        _instreamLayer.mask = _instreamMasker;
                 }
 
@@ -488 +480 @@
                         _displayMasker.graphics.drawRect(_components.display.x, _components.display.y, _player.config.width, _player.config.height);
                         _displayMasker.graphics.endFill();
-
-                        _instreamMasker.graphics.clear();
-                        _instreamMasker.graphics.beginFill(0, 1);
-                        _instreamMasker.graphics.drawRect(_components.display.x, _components.display.y, _player.config.width, _player.config.height);
-                        _instreamMasker.graphics.endFill();
                 }