Changeset 824

Timestamp:

02/08/10 19:12:04 (3 years ago)

Author:

pablo

Message:

Fixed issue with delayed MediaProvider loading

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/controller/Controller.as (modified) (7 diffs)
• src/com/longtailvideo/jwplayer/media/RTMPMediaProvider.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)

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

@@ -74 +74 @@
                 /** Reference to a PlaylistItem which has triggered an external MediaProvider load **/
                 protected var _delayedItem:PlaylistItem;
+                /** Loader for external MediaProviders **/
+                protected var _mediaLoader:MediaProviderLoader;
                 
                 public function Controller(player:IPlayer, model:Model, view:View) {
@@ -195 +197 @@
 
                 protected function errorHandler(evt:ErrorEvent):void {
+                        _delayedItem = null;
+                        _mediaLoader = null;
                         errorState(evt.text);
                 }
@@ -319 +323 @@
 
                 public function play():Boolean {
+                        if (_mediaLoader) {
+                                _delayedItem = _model.playlist.currentItem;
+                                return false;
+                        }
+
                         if (locking) {
                                 return false;
@@ -327 +336 @@
                                         case PlayerState.IDLE:
                                                 load(_model.playlist.currentItem);
-                                                if (!_delayedItem) {
-                                                        _model.media.addEventListener(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL, bufferFullHandler);
-                                                        _model.media.load(_model.playlist.currentItem);
-                                                }
+                                                _model.media.addEventListener(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL, bufferFullHandler);
+                                                _model.media.load(_model.playlist.currentItem);
                                                 break;
                                         case PlayerState.PAUSED:
@@ -540 +547 @@
                 protected function setProvider(item:PlaylistItem):Boolean {
                         var provider:String = item.provider;
-                        _delayedItem = null;
-                        
+
                         if (provider) {
 
@@ -552 +558 @@
                                 // If the model doesn't have an instance of the provider, load & instantiate it
                                 if (!_model.hasMediaProvider(provider)) {
-                                        _delayedItem = item;
-
-                                        var mediaLoader:MediaProviderLoader = new MediaProviderLoader();
-                                        mediaLoader.addEventListener(Event.COMPLETE, mediaSourceLoaded);
-                                        mediaLoader.addEventListener(ErrorEvent.ERROR, errorHandler);
-                                        mediaLoader.loadSource(provider);
+                                        _mediaLoader = new MediaProviderLoader();
+                                        _mediaLoader.addEventListener(Event.COMPLETE, mediaSourceLoaded);
+                                        _mediaLoader.addEventListener(ErrorEvent.ERROR, errorHandler);
+                                        _mediaLoader.loadSource(provider);
                                         return true;
                                 }
@@ -570 +574 @@
 
                 protected function mediaSourceLoaded(evt:Event):void {
-                        var loader:MediaProviderLoader = evt.target as MediaProviderLoader;
-                        _model.setMediaProvider(_delayedItem.provider, loader.loadedSource);
+                        var loader:MediaProviderLoader = _mediaLoader;
                         _delayedItem = null;
-                        play();
+                        _mediaLoader = null;
+                        if (_delayedItem) {
+                                _model.setMediaProvider(_delayedItem.provider, loader.loadedSource);
+                                play();
+                        } else {
+                                _model.setMediaProvider(_model.playlist.currentItem.provider, loader.loadedSource);                             
+                        }
                 }
 

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

@@ -2 +2 @@
  * Wrapper for playback of _video streamed over RTMP.
  *
- * All playback functionalities are cross-server (FMS, Wowza, Red5), with the exception of:
- * - The SecureToken functionality (Wowza).
- * - getStreamLength / checkBandwidth (FMS3).
+ * All playback functionalities are cross-server (FMS, Wowza, Red5)
  **/
 package com.longtailvideo.jwplayer.media {

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

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