Changeset 2040

Timestamp:

01/04/12 20:47:59 (17 months ago)

Author:

pablo

Message:

First pass at InStream API (644). Implements JavaScript API and Flash version

Location:

branches/fl5_instream

Files:

• build/build.xml (modified) (1 diff)
• js/bin-debug/jwplayer.js (modified) (10 diffs)
• js/src/api/jwplayer.api.instream.js (added)
• js/src/api/jwplayer.api.js (modified) (6 diffs)
• js/src/embed/jwplayer.embed.flash.js (modified) (1 diff)
• js/src/jwplayer.js (modified) (1 diff)
• js/src/utils/jwplayer.utils.js (modified) (1 diff)
• js/test/examples/index.html (modified) (1 diff)
• js/test/examples/instream (added)
• js/test/examples/instream.html (added)
• js/test/examples/instream/ad1.xml (added)
• js/test/examples/instream/ad2.xml (added)
• js/test/examples/instream/adschedule.xml (added)
• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/Controller.as (modified) (11 diffs)
• src/com/longtailvideo/jwplayer/controller/PlayerSetup.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/events/InstreamEvent.as (added)
• src/com/longtailvideo/jwplayer/events/MediaEvent.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/model/ControlbarSeekOptions.as (added)
• src/com/longtailvideo/jwplayer/model/IInstreamOptions.as (added)
• src/com/longtailvideo/jwplayer/model/InstreamOptions.as (added)
• src/com/longtailvideo/jwplayer/model/Model.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/model/PlayerConfig.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/player/IInstreamPlayer.as (added)
• src/com/longtailvideo/jwplayer/player/IPlayer.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/InstreamPlayer.as (added)
• src/com/longtailvideo/jwplayer/player/JavascriptAPI.as (modified) (5 diffs)
• src/com/longtailvideo/jwplayer/player/JavascriptInstreamAPI.as (added)
• src/com/longtailvideo/jwplayer/player/Player.as (modified) (3 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/plugins/AbstractPlugin.as (added)
• src/com/longtailvideo/jwplayer/plugins/InStreamAdPlugin.as (added)
• src/com/longtailvideo/jwplayer/utils/Animations.as (modified) (4 diffs)
• src/com/longtailvideo/jwplayer/utils/DisplayObjectUtils.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/utils/JavascriptSerialization.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/utils/Stacker.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (7 diffs)
• src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as (modified) (7 diffs)
• src/com/longtailvideo/jwplayer/view/components/CoreComponent.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as (modified) (5 diffs)
• src/com/longtailvideo/jwplayer/view/interfaces/IDisplayComponent.as (modified) (1 diff)

branches/fl5_instream/build/build.xml

@@ -250 +250 @@
                         <fileset dir="${basedir}/js/src/plugins" includes="jwplayer.plugins.js" />
                         <fileset dir="${basedir}/js/src/plugins" includes="**/*.js" excludes="jwplayer.plugins.js" />
-                        <fileset dir="${basedir}/js/src/api" includes="**/*.js" />
+                        <fileset dir="${basedir}/js/src/api" includes="jwplayer.api.js" />
+                        <fileset dir="${basedir}/js/src/api" includes="jwplayer.api.instream.js" />
                         <fileset dir="${basedir}/js/src/embed" includes="jwplayer.embed.js" />
                         <fileset dir="${basedir}/js/src/embed" includes="**/*.js" excludes="jwplayer.embed.js" />

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

@@ -19 +19 @@
 var $jw = jwplayer;
 
-jwplayer.version = '5.9.2032';
+jwplayer.version = '5.9.2040';
 
 // "Shiv" method for older IE browsers; required for parsing media tags
@@ -874 +874 @@
         }
         
+        /* Normalizes differences between Flash and HTML5 internal players' event responses. */
+        jwplayer.utils.translateEventResponse = function(type, eventProperties) {
+                var translated = jwplayer.utils.extend({}, eventProperties);
+                if (type == jwplayer.api.events.JWPLAYER_FULLSCREEN && !translated.fullscreen) {
+                        translated.fullscreen = translated.message == "true" ? true : false;
+                        delete translated.message;
+                } else if (typeof translated.data == "object") {
+                        // Takes ViewEvent "data" block and moves it up a level
+                        translated = jwplayer.utils.extend(translated, translated.data);
+                        delete translated.data;
+                }
+                
+                var rounders = ["position", "duration", "offset"];
+                for (var rounder in rounders) {
+                        if (translated[rounders[rounder]]) {
+                                translated[rounders[rounder]] = Math.round(translated[rounders[rounder]] * 1000) / 1000;
+                        }
+                }
+                
+                return translated;
+        }
 
 })(jwplayer);
@@ -2312 +2333 @@
                 var _playerReady = false;
                 var _queuedCalls = [];
+                var _instream = undefined;
                 
                 var _originalHTML = jwplayer.utils.getOuterHTML(container);
@@ -2537 +2559 @@
                         return this;
                 };
+                this.loadInstream = function(item, instreamOptions) {
+                        _instream = new jwplayer.api.instream(this, _player, item, instreamOptions);
+                        return _instream;
+                };
                 // Player Events
                 this.onBufferChange = function(callback) {
@@ -2709 +2735 @@
                 this.dispatchEvent = function(type) {
                         if (_listeners[type]) {
-                                var args = translateEventResponse(type, arguments[1]);
+                                var args = _utils.translateEventResponse(type, arguments[1]);
                                 for (var l = 0; l < _listeners[type].length; l++) {
                                         if (typeof _listeners[type][l] == 'function') {
@@ -2717 +2743 @@
                         }
                 };
-                
-                function translateEventResponse(type, eventProperties) {
-                        var translated = jwplayer.utils.extend({}, eventProperties);
-                        if (type == jwplayer.api.events.JWPLAYER_FULLSCREEN && !translated.fullscreen) {
-                                translated.fullscreen = translated.message == "true" ? true : false;
-                                delete translated.message;
-                        } else if (typeof translated.data == "object") {
-                                // Takes ViewEvent "data" block and moves it up a level
-                                translated = jwplayer.utils.extend(translated, translated.data);
-                                delete translated.data;
-                        }
-                        
-                        var rounders = ["position", "duration", "offset"];
-                        for (var rounder in rounders) {
-                                if (translated[rounders[rounder]]) {
-                                        translated[rounders[rounder]] = Math.round(translated[rounders[rounder]] * 1000) / 1000;
-                                }
-                        }
-                        
-                        return translated;
-                }
-                
-                this.callInternal = function(funcName, args) {
+
+                this.dispatchInstreamEvent = function(type) {
+                        if (_instream) {
+                                _instream.dispatchEvent(type, arguments);
+                        }
+                };
+
+                this.callInternal = function() {
                         /*this.callInternal = function() {
                          var    funcName = arguments[0],
@@ -2746 +2757 @@
                          args[argument] = arguments[argument];
                          }*/
+
                         if (_playerReady) {
+                                var funcName = arguments[0],
+                                        args = [];
+                                
+                                for (var argument = 1; argument < arguments.length; argument++) {
+                                         args.push(arguments[argument]);
+                                }
+                                
                                 if (typeof _player != "undefined" && typeof _player[funcName] == "function") {
-                                        if (jwplayer.utils.exists(args)) {
-                                                //return (_player[funcName]).apply(this, args);
-                                                return (_player[funcName])(args);
+                                        if (args.length == 2) { 
+                                                return (_player[funcName])(args[0], args[1]);
+                                        } else if (args.length == 1) {
+                                                return (_player[funcName])(args[0]);
                                         } else {
                                                 return (_player[funcName])();
@@ -2867 +2887 @@
                 JWPLAYER_PLAYER_STATE: 'jwplayerPlayerState',
                 JWPLAYER_PLAYLIST_LOADED: 'jwplayerPlaylistLoaded',
-                JWPLAYER_PLAYLIST_ITEM: 'jwplayerPlaylistItem'
+                JWPLAYER_PLAYLIST_ITEM: 'jwplayerPlaylistItem',
+                JWPLAYER_INSTREAM_CLICK: 'jwplayerInstreamClicked',
+                JWPLAYER_INSTREAM_DESTROYED: 'jwplayerInstreamDestroyed'
         };
         
@@ -2950 +2972 @@
         }
 };
+/**
+ * InStream API 
+ * 
+ * @author Pablo
+ * @version 5.9
+ */
+(function(jwplayer) {
+        
+        jwplayer.api.instream = function(api, player, item, options) {
+                
+                var _api = api;
+                var _player = player;
+                var _item = item;
+                var _options = options;
+                var _listeners = {};
+                var _stateListeners = {};
+                
+                function _init() {
+                        _api.callInternal("jwLoadInstream", item, options);
+                }
+                
+                function _addInternalListener(player, type) {
+                        _player.instream_jwAddEventListener(type, 'function(dat) { jwplayer("' + _api.id + '").dispatchInstreamEvent("' + type + '", dat); }');
+                };
+
+                function _eventListener(type, callback) {
+                        if (!_listeners[type]) {
+                                _listeners[type] = [];
+                                _addInternalListener(_player, type);
+                        }
+                        _listeners[type].push(callback);
+                        return this;
+                };
+
+                function _stateListener(state, callback) {
+                        if (!_stateListeners[state]) {
+                                _stateListeners[state] = [];
+                                _eventListener(jwplayer.api.events.JWPLAYER_PLAYER_STATE, _stateCallback(state));
+                        }
+                        _stateListeners[state].push(callback);
+                        return this;
+                };
+
+                function _stateCallback(state) {
+                        return function(args) {
+                                var newstate = args.newstate, oldstate = args.oldstate;
+                                if (newstate == state) {
+                                        var callbacks = _stateListeners[newstate];
+                                        if (callbacks) {
+                                                for (var c = 0; c < callbacks.length; c++) {
+                                                        if (typeof callbacks[c] == 'function') {
+                                                                callbacks[c].call(this, {
+                                                                        oldstate: oldstate,
+                                                                        newstate: newstate,
+                                                                        type: args.type
+                                                                });
+                                                        }
+                                                }
+                                        }
+                                }
+                        };
+                }               
+                this.dispatchEvent = function(type, calledArguments) {
+                        if (_listeners[type]) {
+                                var args = _utils.translateEventResponse(type, calledArguments[1]);
+                                for (var l = 0; l < _listeners[type].length; l++) {
+                                        if (typeof _listeners[type][l] == 'function') {
+                                                _listeners[type][l].call(this, args);
+                                        }
+                                }
+                        }
+                }
+                
+                
+                this.onError = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_ERROR, callback);
+                };
+                this.onFullscreen = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_FULLSCREEN, callback);
+                };
+                this.onMeta = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_MEDIA_META, callback);
+                };
+                this.onMute = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_MEDIA_MUTE, callback);
+                };
+                this.onComplete = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_MEDIA_COMPLETE, callback);
+                };
+                this.onSeek = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_MEDIA_SEEK, callback);
+                };
+                this.onTime = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_MEDIA_TIME, callback);
+                };
+                this.onVolume = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_MEDIA_VOLUME, callback);
+                };
+                // State events
+                this.onBuffer = function(callback) {
+                        return _stateListener(jwplayer.api.events.state.BUFFERING, callback);
+                };
+                this.onPause = function(callback) {
+                        return _stateListener(jwplayer.api.events.state.PAUSED, callback);
+                };
+                this.onPlay = function(callback) {
+                        return _stateListener(jwplayer.api.events.state.PLAYING, callback);
+                };
+                this.onIdle = function(callback) {
+                        return _stateListener(jwplayer.api.events.state.IDLE, callback);
+                };
+                // Instream events
+                this.onInstreamClick = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_INSTREAM_CLICK, callback);
+                };
+                this.onInstreamDestroyed = function(callback) {
+                        return _eventListener(jwplayer.api.events.JWPLAYER_INSTREAM_DESTROYED, callback);
+                };
+                
+                this.play = function(state) {
+                        _player.instream_jwPlay(state);
+                };
+                this.pause= function(state) {
+                        _player.instream_jwPause(state);
+                };
+                this.seek = function(pos) {
+                        _player.instream_jwSeek(pos);
+                };
+                this.destroy = function() {
+                        _player.instream_jwDestroy();
+                };
+                this.getState = function() {
+                        return _player.instream_jwGetState();
+                }
+                this.getDuration = function() {
+                        return _player.instream_jwGetDuration();
+                }
+                this.getPosition = function() {
+                        return _player.instream_jwGetPosition();
+                }
+
+                _init();
+                
+                
+        }
+        
+})(jwplayer);
+
 /**
  * Embedder for the JW Player
@@ -3733 +3903 @@
                         var providers = ["video", "http", "sound", "image"];
                         // Provider is set, and is not video, http, sound, image - play in Flash
-                        if (provider && (providers.toString().indexOf(provider < 0))) {
+                        if (provider && (providers.toString().indexOf(provider) < 0) ) {
                                 return true;
                         }

branches/fl5_instream/js/src/api/jwplayer.api.js

@@ -19 +19 @@
                 var _playerReady = false;
                 var _queuedCalls = [];
+                var _instream = undefined;
                 
                 var _originalHTML = jwplayer.utils.getOuterHTML(container);
@@ -244 +245 @@
                         return this;
                 };
+                this.loadInstream = function(item, instreamOptions) {
+                        _instream = new jwplayer.api.instream(this, _player, item, instreamOptions);
+                        return _instream;
+                };
                 // Player Events
                 this.onBufferChange = function(callback) {
@@ -416 +421 @@
                 this.dispatchEvent = function(type) {
                         if (_listeners[type]) {
-                                var args = translateEventResponse(type, arguments[1]);
+                                var args = _utils.translateEventResponse(type, arguments[1]);
                                 for (var l = 0; l < _listeners[type].length; l++) {
                                         if (typeof _listeners[type][l] == 'function') {
@@ -424 +429 @@
                         }
                 };
-                
-                function translateEventResponse(type, eventProperties) {
-                        var translated = jwplayer.utils.extend({}, eventProperties);
-                        if (type == jwplayer.api.events.JWPLAYER_FULLSCREEN && !translated.fullscreen) {
-                                translated.fullscreen = translated.message == "true" ? true : false;
-                                delete translated.message;
-                        } else if (typeof translated.data == "object") {
-                                // Takes ViewEvent "data" block and moves it up a level
-                                translated = jwplayer.utils.extend(translated, translated.data);
-                                delete translated.data;
-                        }
-                        
-                        var rounders = ["position", "duration", "offset"];
-                        for (var rounder in rounders) {
-                                if (translated[rounders[rounder]]) {
-                                        translated[rounders[rounder]] = Math.round(translated[rounders[rounder]] * 1000) / 1000;
-                                }
-                        }
-                        
-                        return translated;
-                }
-                
-                this.callInternal = function(funcName, args) {
+
+                this.dispatchInstreamEvent = function(type) {
+                        if (_instream) {
+                                _instream.dispatchEvent(type, arguments);
+                        }
+                };
+
+                this.callInternal = function() {
                         /*this.callInternal = function() {
                          var    funcName = arguments[0],
@@ -453 +443 @@
                          args[argument] = arguments[argument];
                          }*/
+
                         if (_playerReady) {
+                                var funcName = arguments[0],
+                                        args = [];
+                                
+                                for (var argument = 1; argument < arguments.length; argument++) {
+                                         args.push(arguments[argument]);
+                                }
+                                
                                 if (typeof _player != "undefined" && typeof _player[funcName] == "function") {
-                                        if (jwplayer.utils.exists(args)) {
-                                                //return (_player[funcName]).apply(this, args);
-                                                return (_player[funcName])(args);
+                                        if (args.length == 2) { 
+                                                return (_player[funcName])(args[0], args[1]);
+                                        } else if (args.length == 1) {
+                                                return (_player[funcName])(args[0]);
                                         } else {
                                                 return (_player[funcName])();
@@ -574 +573 @@
                 JWPLAYER_PLAYER_STATE: 'jwplayerPlayerState',
                 JWPLAYER_PLAYLIST_LOADED: 'jwplayerPlaylistLoaded',
-                JWPLAYER_PLAYLIST_ITEM: 'jwplayerPlaylistItem'
+                JWPLAYER_PLAYLIST_ITEM: 'jwplayerPlaylistItem',
+                JWPLAYER_INSTREAM_CLICK: 'jwplayerInstreamClicked',
+                JWPLAYER_INSTREAM_DESTROYED: 'jwplayerInstreamDestroyed'
         };
         

branches/fl5_instream/js/src/embed/jwplayer.embed.flash.js

@@ -238 +238 @@
                         var providers = ["video", "http", "sound", "image"];
                         // Provider is set, and is not video, http, sound, image - play in Flash
-                        if (provider && (providers.toString().indexOf(provider < 0))) {
+                        if (provider && (providers.toString().indexOf(provider) < 0) ) {
                                 return true;
                         }

branches/fl5_instream/js/src/jwplayer.js

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

branches/fl5_instream/js/src/utils/jwplayer.utils.js

@@ -849 +849 @@
         }
         
+        /* Normalizes differences between Flash and HTML5 internal players' event responses. */
+        jwplayer.utils.translateEventResponse = function(type, eventProperties) {
+                var translated = jwplayer.utils.extend({}, eventProperties);
+                if (type == jwplayer.api.events.JWPLAYER_FULLSCREEN && !translated.fullscreen) {
+                        translated.fullscreen = translated.message == "true" ? true : false;
+                        delete translated.message;
+                } else if (typeof translated.data == "object") {
+                        // Takes ViewEvent "data" block and moves it up a level
+                        translated = jwplayer.utils.extend(translated, translated.data);
+                        delete translated.data;
+                }
+                
+                var rounders = ["position", "duration", "offset"];
+                for (var rounder in rounders) {
+                        if (translated[rounders[rounder]]) {
+                                translated[rounders[rounder]] = Math.round(translated[rounders[rounder]] * 1000) / 1000;
+                        }
+                }
+                
+                return translated;
+        }
 
 })(jwplayer);

branches/fl5_instream/js/test/examples/index.html

@@ -200 +200 @@
                         "Player 5.9": {
                         "Features": {
-                                "onBeforePlay Event": "onbeforeplay.html"
+                                "onBeforePlay Event": "onbeforeplay.html",
+                                "InStream API": "instream.html"
                         }
                 }

branches/fl5_instream/src/com/longtailvideo/jwplayer/controller/Controller.as

@@ -85 +85 @@
                 /** Load after unlock - My favorite variable ever **/
                 protected var _unlockAndLoad:Boolean;
+                /** The lock swallowed the complete action; we should go to the next playlist item if necessary **/
+                protected var _completeOnUnlock:Boolean;
                 /** Whether the playlist has been loaded yet **/
                 protected var _playlistReady:Boolean = false;
@@ -229 +231 @@
                 protected function playlistItemHandler(evt:PlaylistEvent):void {
                         _model.config.item = _model.playlist.currentIndex;
+                        _interruptPlay = false;
                         load(_model.playlist.currentItem);
                 }
@@ -245 +248 @@
 
 
-                protected function completeHandler(evt:MediaEvent):void {
+                protected function completeHandler(evt:MediaEvent=null):void {
+                        if (locking) {
+                                _completeOnUnlock = true;
+                                return;
+                        }
+                        
                         switch (_model.config.repeat) {
                                 case RepeatOptions.SINGLE:
@@ -287 +295 @@
                         if (_lockManager.lock(plugin, callback)) {
                                 // If it was playing, pause playback and plan to resume when you're done
-                                if (_player.state == PlayerState.PLAYING || _player.state == PlayerState.BUFFERING || _preplay) {
+                                if (_player.state == PlayerState.PLAYING || _player.state == PlayerState.BUFFERING || _preplay || continueOnRepeat) {
                                         if (!_preplay) {
                                                 _model.media.pause();   
                                         }
                                         _lockingResume = true;
-                                }
+                                        _interruptPlay = false;
+                                } else {
+                                        _interruptPlay = true;
+                                }
+                                
                                 
                                 // Tell everyone you're locked
@@ -317 +329 @@
                                 }
                                 if (!locking) {
-                                        if (_unlockAndLoad) {
+                                        if (_completeOnUnlock) {
+                                                _completeOnUnlock = false;
+                                                completeHandler();
+                                                _interruptPlay = false;
+                                                return true;
+                                        } else if (_unlockAndLoad) {
                                                 load(_player.playlist.currentItem);
                                                 _unlockAndLoad = false;
@@ -328 +345 @@
                                                 }
                                         }
+                                        _interruptPlay = false;
                                         return true;
                                 }
@@ -336 +354 @@
 
                 public function setVolume(vol:Number):Boolean {
-                        if (locking) {
-                                return false;
-                        }
+/*                      if (locking) {
+                                return false;
+                        }
+*/
                         if (_model.media) {
                                 mute(false); 
@@ -351 +370 @@
 
                 public function mute(muted:Boolean):Boolean {
-                        if (locking) {
-                                return false;
-                        }
+/*                      if (locking) {
+                                return false;
+                        }
+*/
                         if (muted && !_model.mute) {
                                 _model.mute = true;
@@ -370 +390 @@
                         if (!_preplay) {
                                 _preplay = true;
-                                dispatchEvent(new PlayerEvent(MediaEvent.JWPLAYER_MEDIA_BEFOREPLAY));
+                                dispatchEvent(new MediaEvent(MediaEvent.JWPLAYER_MEDIA_BEFOREPLAY));
                                 _preplay = false;
                                 if (_interruptPlay) {
@@ -512 +532 @@
                                 stop();
                                 _player.playlist.currentIndex = index;
+                                _interruptPlay = false;
                                 play();
                                 return true;
@@ -720 +741 @@
                         Configger.saveCookie(name, value);
                 }
+                
+                protected function get continueOnRepeat():Boolean {
+                        return (_model.config.repeat != RepeatOptions.NONE);
+                }
 
         }

branches/fl5_instream/src/com/longtailvideo/jwplayer/controller/PlayerSetup.as

@@ -6 +6 @@
         import com.longtailvideo.jwplayer.player.IPlayer;
         import com.longtailvideo.jwplayer.plugins.IPlugin;
+        import com.longtailvideo.jwplayer.plugins.InStreamAdPlugin;
         import com.longtailvideo.jwplayer.plugins.PluginConfig;
         import com.longtailvideo.jwplayer.plugins.V4Plugin;
@@ -223 +224 @@
                         // Compiled in plugins go here.  Example:
                         // _view.addPlugin("test", new TestPlugin());
+                        //_view.addPlugin("instreamads", new InStreamAdPlugin());
                 }
 

branches/fl5_instream/src/com/longtailvideo/jwplayer/events/MediaEvent.as

@@ -176 +176 @@
                  */
                 public static var JWPLAYER_MEDIA_BEFOREPLAY:String = "jwplayerMediaBeforePlay";
-
+                /**
+                 * The MediaEvent.JWPLAYER_MEDIA_BEFORECOMPLETE constant defines the value of the
+                 * <code>type</code> property of the event object
+                 * for a <code>jwplayerMediaBeforeComplete</code> event.
+                 *
+                 * <table class="innertable">
+                 *              <tr><th>Property</th><th>Value</th></tr>
+                 *              <tr><td><code>id</code></td><td>ID of the player in the HTML DOM. Used by javascript to reference the player.</td></tr>
+                 *              <tr><td><code>client</code></td><td>A string representing the client the player runs in (e.g. FLASH WIN 9,0,115,0).</td></tr>
+                 *              <tr><td><code>version</code></td><td>A string representing the major version, minor version and revision number of the player (e.g. 5.0.395).</td></tr>
+                 * </table>
+                 * 
+                 * @eventType jwplayerMediaBeforePlay
+                 */
+                public static var JWPLAYER_MEDIA_BEFORECOMPLETE:String = "jwplayerMediaBeforeComplete";
                 /**
              *  The <code>MediaEvent.JWPLAYER_MEDIA_MUTE</code> constant defines the value of the 

branches/fl5_instream/src/com/longtailvideo/jwplayer/model/Model.as

@@ -212 +212 @@
                 protected function forwardEvents(evt:Event):void {
                         if (evt is PlayerEvent) {
-                                if (evt.type == MediaEvent.JWPLAYER_MEDIA_ERROR) {
+                                if (evt.type == MediaEvent.JWPLAYER_MEDIA_COMPLETE) {
+                                        dispatchEvent(new MediaEvent(MediaEvent.JWPLAYER_MEDIA_BEFORECOMPLETE));
+                                } else if (evt.type == MediaEvent.JWPLAYER_MEDIA_ERROR) {
                                         // Translate media error into player error.
                                         dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_ERROR, (evt as MediaEvent).message));

branches/fl5_instream/src/com/longtailvideo/jwplayer/model/PlayerConfig.as

@@ -388 +388 @@
                 }
                 
+                /**
+                 * Overwrites a plugin's configuration.  Use with caution.
+                 **/
+                public function setPluginConfig(pluginId:String, pluginConfig:PluginConfig):void {
+                        if (pluginId && pluginConfig) {
+                                _pluginConfig[pluginId] = pluginConfig;
+                        }
+                }
+                
                 /** A list of available pluginConfig keys. **/
                 public function get pluginIds():Array {

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

@@ -1 +1 @@
 package com.longtailvideo.jwplayer.player {
         import com.longtailvideo.jwplayer.events.IGlobalEventDispatcher;
+        import com.longtailvideo.jwplayer.model.IInstreamOptions;
         import com.longtailvideo.jwplayer.model.IPlaylist;
         import com.longtailvideo.jwplayer.model.PlayerConfig;
+        import com.longtailvideo.jwplayer.model.PlaylistItem;
         import com.longtailvideo.jwplayer.plugins.IPlugin;
         import com.longtailvideo.jwplayer.view.IPlayerComponents;
@@ -73 +75 @@
                 function get controls():IPlayerComponents;
                 function overrideComponent(plugin:IPlayerComponent):void;
+                function loadInstream(target:IPlugin, item:PlaylistItem, options:IInstreamOptions=null):IInstreamPlayer;
         }
 }

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

@@ -1 +1 @@
 package com.longtailvideo.jwplayer.player {
         import com.longtailvideo.jwplayer.events.ComponentEvent;
+        import com.longtailvideo.jwplayer.events.InstreamEvent;
         import com.longtailvideo.jwplayer.events.MediaEvent;
         import com.longtailvideo.jwplayer.events.PlayerEvent;
@@ -6 +7 @@
         import com.longtailvideo.jwplayer.events.PlaylistEvent;
         import com.longtailvideo.jwplayer.events.ViewEvent;
+        import com.longtailvideo.jwplayer.model.IInstreamOptions;
+        import com.longtailvideo.jwplayer.model.InstreamOptions;
         import com.longtailvideo.jwplayer.model.Playlist;
+        import com.longtailvideo.jwplayer.model.PlaylistItem;
+        import com.longtailvideo.jwplayer.plugins.AbstractPlugin;
+        import com.longtailvideo.jwplayer.plugins.IPlugin;
         import com.longtailvideo.jwplayer.utils.JavascriptSerialization;
         import com.longtailvideo.jwplayer.utils.Logger;
@@ -30 +36 @@
                 protected var _listeners:Object;
                 protected var _queuedEvents:Array = [];
-
+                
+                protected var _lockPlugin:IPlugin;
+                protected var _instream:IInstreamPlayer;
+                protected var _isItem:PlaylistItem;
+                protected var _isConfig:IInstreamOptions;
                 
                 public function JavascriptAPI(player:IPlayer) {
                         _listeners = {};
+                        _lockPlugin = new AbstractPlugin();
                         
                         _player = player;
@@ -144 +155 @@
                                 ExternalInterface.addCallback("jwDockShow", js_showDock);
                                 
+                                // Instream API
+                                ExternalInterface.addCallback("jwLoadInstream", js_loadInstream);
+                                
                                 // UNIMPLEMENTED
                                 //ExternalInterface.addCallback("jwGetBandwidth", js_getBandwidth); 
@@ -453 +467 @@
                 }
                 
+                protected function js_loadInstream(item:Object, config:Object):void {
+                        _isItem = new PlaylistItem(item);
+                        _isConfig = new InstreamOptions(config);
+
+                        if (!_isConfig.autoload) {
+                                _player.lock(_lockPlugin, function():void {
+                                        _instream = _player.loadInstream(_lockPlugin, _isItem, _isConfig);
+                                        beginInstream();
+                                });
+                        } else {
+                                _instream = _player.loadInstream(_lockPlugin, _isItem, _isConfig);
+                                beginInstream();
+                        }
+                }
+                
+                protected function beginInstream():void {
+                        if (_instream) {
+                                _instream.addEventListener(InstreamEvent.JWPLAYER_INSTREAM_DESTROYED, function(evt:InstreamEvent):void {
+                                        _player.unlock(_lockPlugin);
+                                });
+                                new JavascriptInstreamAPI(_instream, _isConfig, _player, _lockPlugin);  
+                        }       
+                }
+                
                 protected function setComponentVisibility(component:IPlayerComponent, state:Boolean):void {
                         state ? component.show() : component.hide();

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

@@ -4 +4 @@
         import com.longtailvideo.jwplayer.events.IGlobalEventDispatcher;
         import com.longtailvideo.jwplayer.events.PlayerEvent;
+        import com.longtailvideo.jwplayer.model.IInstreamOptions;
         import com.longtailvideo.jwplayer.model.IPlaylist;
         import com.longtailvideo.jwplayer.model.Model;
         import com.longtailvideo.jwplayer.model.PlayerConfig;
+        import com.longtailvideo.jwplayer.model.PlaylistItem;
         import com.longtailvideo.jwplayer.plugins.IPlugin;
         import com.longtailvideo.jwplayer.utils.Logger;
@@ -279 +281 @@
                         return view.getPlugin(id);
                 } 
+                
+                /**
+                 * @inheritDoc
+                 **/
+                public function loadInstream(target:IPlugin, item:PlaylistItem, options:IInstreamOptions=null):IInstreamPlayer {
+                        var instream:IInstreamPlayer = new InstreamPlayer(target, item, options, model, view, controller);
+                        return instream;
+                }
 
                 /** The player should not accept any calls referencing its display stack **/
@@ -300 +310 @@
                 }
                 
-                
                 ///////////////////////////////////////////             
                 /// IGlobalEventDispatcher implementation

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

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

branches/fl5_instream/src/com/longtailvideo/jwplayer/utils/Animations.as

@@ -2 +2 @@
         import flash.display.MovieClip;
         import flash.events.Event;
+        import flash.events.EventDispatcher;
         
         
+        /**
+         * Fired when an animation has completed
+         *
+         * @eventType flash.events.Event.COMPLETE
+         */
+        [Event(name="complete", type="flash.events.Event")]
         
-        public class Animations {
+        public class Animations extends EventDispatcher {
                 /** Target MovieClip **/
                 private var _tgt:MovieClip;
@@ -51 +58 @@
                                         _tgt.visible = false;
                                 }
+                                dispatchEvent(new Event(Event.COMPLETE));
                         } else {
                                 _tgt.visible = true;
@@ -87 +95 @@
                                 _tgt.x = _xps;
                                 _tgt.y = _yps;
+                                dispatchEvent(new Event(Event.COMPLETE));
                         } else {
                                 _tgt.x = _xps - (_xps - _tgt.x) / _spd;
@@ -115 +124 @@
                                 _tgt.tf.htmlText = _str;
                                 _tgt.removeEventListener(Event.ENTER_FRAME, easeHandler);
+                                dispatchEvent(new Event(Event.COMPLETE));
                         }
                 }

branches/fl5_instream/src/com/longtailvideo/jwplayer/utils/DisplayObjectUtils.as

@@ -1 +1 @@
 package com.longtailvideo.jwplayer.utils {
+        import flash.display.DisplayObject;
         import flash.display.DisplayObjectContainer;
-        import flash.display.DisplayObject;
+        import flash.geom.Rectangle;
         import flash.utils.getQualifiedClassName;
         
@@ -38 +39 @@
                 }
 
+                
+                /**
+                 * duplicateDisplayObject
+                 * 
+                 * see: http://www.kirupa.com/forum/showthread.php?223798-ActionScript-3-Tip-of-the-Day/page12&p=1939827#172 
+                 * 
+                 * creates a duplicate of the DisplayObject passed.
+                 * similar to duplicateMovieClip in AVM1
+                 * @param target the display object to duplicate
+                 * @param autoAdd if true, adds the duplicate to the display list
+                 * in which target was located
+                 * @return a duplicate instance of target
+                 */
+                public static function duplicateDisplayObject(target:DisplayObject, autoAdd:Boolean = false):DisplayObject {
+                        // create duplicate
+                        var targetClass:Class = Object(target).constructor;
+                        var duplicate:DisplayObject = new targetClass();
+                        
+                        // duplicate properties
+                        duplicate.transform = target.transform;
+                        duplicate.filters = target.filters;
+                        duplicate.cacheAsBitmap = target.cacheAsBitmap;
+                        duplicate.opaqueBackground = target.opaqueBackground;
+                        if (target.scale9Grid) {
+                                var rect:Rectangle = target.scale9Grid;
+                                // WAS Flash 9 bug where returned scale9Grid is 20x larger than assigned
+                                // rect.x /= 20, rect.y /= 20, rect.width /= 20, rect.height /= 20;
+                                duplicate.scale9Grid = rect;
+                        }
+                        
+                        // add to target parent's display list
+                        // if autoAdd was provided as true
+                        if (autoAdd && target.parent) {
+                                target.parent.addChild(duplicate);
+                        }
+                        return duplicate;
+                }
+                
+                
         }
 }

branches/fl5_instream/src/com/longtailvideo/jwplayer/utils/JavascriptSerialization.as

@@ -68 +68 @@
                                                 var newkey:String = key.replace(".", "__dot__");
                                                 newkey = newkey.replace("-", "_");
+                                                newkey = newkey.replace(/[^A-Za-z0-9\_]/g, "");
                                                 newObj[newkey] = stripDots(obj[key]);
                                         }

branches/fl5_instream/src/com/longtailvideo/jwplayer/utils/Stacker.as

@@ -21 +21 @@
          **/
         public function Stacker(clp:MovieClip):void {
-            clip = clp;
-            analyze();
+                        if (clp is MovieClip) {
+                    clip = clp;
+                analyze();
+                        } else {
+                                throw new TypeError("Expecting a MovieClip");
+                        }
         }
 

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

@@ -15 +15 @@
         import com.longtailvideo.jwplayer.plugins.IPlugin;
         import com.longtailvideo.jwplayer.plugins.PluginConfig;
+        import com.longtailvideo.jwplayer.utils.Animations;
         import com.longtailvideo.jwplayer.utils.Draw;
         import com.longtailvideo.jwplayer.utils.Logger;
@@ -66 +67 @@
                 protected var _pluginsLayer:MovieClip;
                 protected var _plugins:Object;
-
+                protected var _instreamLayer:MovieClip;
+                protected var _instreamPlugin:IPlugin;
+                protected var _instreamAnim:Animations;
+                
                 protected var _displayMasker:MovieClip;
-
+                protected var _instreamMasker:MovieClip;
+                
                 protected var _image:Loader;
                 protected var _logo:Logo;
@@ -271 +276 @@
                         _plugins = {};
                         
+                        _instreamLayer = setupLayer("instream", currentLayer++);
+                        _instreamLayer.alpha = 0;
+                        _instreamLayer.visible = false;
+                        _instreamAnim = new Animations(_instreamLayer);
+                        _instreamAnim.addEventListener(Event.COMPLETE, instreamAnimationComplete);
                 }
                         
@@ -313 +323 @@
 
                         _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;
                 }
 
@@ -340 +357 @@
                                 dispatchEvent(new ViewEvent(ViewEvent.JWPLAYER_VIEW_FULLSCREEN, _fullscreen));
                         }
+                        redraw();
+                        
                         dispatchEvent(new ViewEvent(ViewEvent.JWPLAYER_RESIZE, {width: RootReference.stage.stageWidth, height: RootReference.stage.stageHeight}));
-
-                        redraw();
                 }
 
@@ -471 +488 @@
                         _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();
                 }
 
@@ -604 +626 @@
                 }
                 
+                public function setupInstream(_instreamDisplay:DisplayObject, plugin:IPlugin):void {
+                        _instreamPlugin = plugin;
+                        if (_instreamDisplay) {
+                                _instreamLayer.addChild(_instreamDisplay);
+                        }
+                        try {
+                                var pluginDO:DisplayObject = plugin as DisplayObject;
+                                if (pluginDO) {
+                                        _pluginsLayer.removeChild(pluginDO);
+                                        _instreamLayer.addChild(pluginDO);
+                                }
+                        } catch(e:Error) {
+                                Logger.log("Could not add instream plugin to display stack");
+                        }
+                        
+                        _instreamAnim.fade(1);
+                }
+                
+                public function destroyInstream():void {
+                        if (_instreamPlugin && _instreamPlugin is DisplayObject) {
+                                _pluginsLayer.addChild(_instreamPlugin as DisplayObject);
+                        }
+                        _instreamAnim.fade(0);
+                }
+                
+                protected function instreamAnimationComplete(evt:Event):void {
+                        if (_instreamLayer.alpha == 0) {
+                                while(_instreamLayer.numChildren > 0) {
+                                        _instreamLayer.removeChildAt(0);
+                                }
+                                _instreamPlugin = null;
+                        }
+                }
+                
         }
 }

branches/fl5_instream/src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as

@@ -10 +10 @@
         import com.longtailvideo.jwplayer.plugins.PluginConfig;
         import com.longtailvideo.jwplayer.utils.Animations;
+        import com.longtailvideo.jwplayer.utils.DisplayObjectUtils;
         import com.longtailvideo.jwplayer.utils.Draw;
         import com.longtailvideo.jwplayer.utils.Logger;
@@ -30 +31 @@
         import flash.ui.Mouse;
         import flash.utils.clearTimeout;
+        import flash.utils.getDefinitionByName;
+        import flash.utils.getQualifiedClassName;
         import flash.utils.setTimeout;
         
         public class ControlbarComponentV4 extends CoreComponent implements IControlbarComponent {
                 /** Reference to the original skin **/
-                private var skin:Sprite;
+                private var skin:*;
                 /** A list with all controls. **/
                 private var stacker:Stacker;
@@ -81 +84 @@
                                         unmuteButton: ViewEvent.JWPLAYER_VIEW_MUTE};
                         skin = _player.skin.getSWFSkin().getChildByName('controlbar') as Sprite;
+                        if (!skin) {
+                                var clip:DisplayObject = Draw.clone(_player.skin.getSWFSkin()['controlbar'], false);
+                                if (clip is Sprite) {
+                                        skin = clip as Sprite;
+                                }
+                                stacker = new Stacker(skin);
+                        } else {
+                                stacker = new Stacker(skin as MovieClip);
+                        }
                         skin.x = 0;
                         skin.y = 0;
@@ -97 +109 @@
                         RootReference.stage.addEventListener(MouseEvent.MOUSE_MOVE, moveHandler);
                         RootReference.stage.addEventListener(KeyboardEvent.KEY_DOWN, moveHandler);
-                        stacker = new Stacker(skin as MovieClip);
                         try {
                                 getSkinComponent("linkButton").visible = false;
@@ -182 +193 @@
                                 getSkinComponent('fullscreenButton').visible = false;
                                 getSkinComponent('normalscreenButton').visible = false;
-                                if (stage['displayState'] && _player.config.height > 40) {
+                                if (RootReference.stage['displayState'] && _player.config.height > 40) {
                                         if (_player.config.fullscreen) {
                                                 getSkinComponent('fullscreenButton').visible = false;
@@ -572 +583 @@
                         var sliderType:String = scrubber.name;
 
-                        stage.removeEventListener(MouseEvent.MOUSE_UP, upHandler);
+                        RootReference.stage.removeEventListener(MouseEvent.MOUSE_UP, upHandler);
                         scrubber.icon.stopDrag();
                         if (sliderType == 'timeSlider' && _player.playlist && _player.playlist.currentItem) {
@@ -602 +613 @@
 
                 private function getSkinComponent(element:String):DisplayObject {
-                        return skin.getChildByName(element) as DisplayObject;
+                        var component:DisplayObject = skin.getChildByName(element) as DisplayObject;
+                        if (component) {
+                                return component;
+                        } else if (skin[element]) {
+                                return Draw.clone(skin[element], false);
+                        }
+                        return null;
                 }
 
 
                 private function getSkinElementChild(element:String, child:String):DisplayObject {
-                        return (skin.getChildByName(element) as MovieClip).getChildByName(child);
+                        var clip:DisplayObject = (skin.getChildByName(element) as MovieClip).getChildByName(child);
+                        if (clip) {
+                                return clip;
+                        } else if (skin[element] is DisplayObject) {
+                                clip = Draw.clone(skin[element], false);
+                                return clip;
+                        } else {
+                                return null;
+                        }
                 }
                 

branches/fl5_instream/src/com/longtailvideo/jwplayer/view/components/CoreComponent.as

@@ -13 +13 @@
         import flash.geom.Rectangle;
 
-        public class CoreComponent extends MovieClip implements IGlobalEventDispatcher,IPlayerComponent {
+        public class CoreComponent extends MovieClip implements IGlobalEventDispatcher, IPlayerComponent {
 
                 private var _dispatcher:IGlobalEventDispatcher;

branches/fl5_instream/src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as

@@ -64 +64 @@
                 protected var _previousState:String;
                 
+                protected var _forced:String = "";
+                
                 public function DisplayComponent(player:IPlayer) {
                         super(player, "display");
@@ -348 +350 @@
                 }
                 
+                protected function get currentState():String {
+                        return (_forced ? _forced : (_player ? _player.state : PlayerState.IDLE));
+                }
                 
                 protected function stateHandler(event:PlayerEvent = null):void {
-                        if (_previousState != player.state || !(event is PlayerStateEvent)) {
+                        if (_previousState != currentState || !(event is PlayerStateEvent)) {
+                                _previousState = currentState;
                                 //TODO: Handle mute button in error state
                                 clearRotation();
@@ -357 +363 @@
                                 _bufferStateTimer.delay = (_icon ? 10 : 200);
                                 _playStateTimer.delay = (_icon ? 10 : 10);
-                                switch (player.state) {
+                                switch (currentState) {
                                         case PlayerState.BUFFERING:
                                                 _bufferStateTimer.start();
@@ -419 +425 @@
                                         navigateToURL(new URLRequest(Strings.cleanLink(link)),_player.config.linktarget);
                                 }
-                        } else if (player.state == PlayerState.PLAYING || player.state == PlayerState.BUFFERING) {
+                        } else if (currentState == PlayerState.PLAYING || currentState == PlayerState.BUFFERING) {
                                 dispatchEvent(new ViewEvent(ViewEvent.JWPLAYER_VIEW_PAUSE));
                         } else {
@@ -463 +469 @@
                 }
                 
+                public function forceState(forcedState:String):void {
+                        switch(forcedState) {
+                                case PlayerState.BUFFERING:
+                                case PlayerState.PAUSED:
+                                case PlayerState.IDLE:
+                                case PlayerState.PLAYING:
+                                        _forced = forcedState;
+                                        stateHandler();
+                                        break;
+                                default:
+                                        _forced = "";
+                        }
+                        
+                }
+                
+                public function releaseState():void {
+                        _forced = "";
+                        stateHandler();
+                }
+                
                 protected override function get displayRect():Rectangle {
                         return _iconArea ? _iconArea : super.displayRect;

branches/fl5_instream/src/com/longtailvideo/jwplayer/view/interfaces/IDisplayComponent.as

@@ -39 +39 @@
                 function setIcon(displayIcon:DisplayObject):void;
                 function setText(displayText:String):void;
+                function forceState(forcedState:String):void;
+                function releaseState():void;
         }
 }