Changeset 970

Timestamp:

04/28/10 19:40:24 (3 years ago)

Author:

pablo

Message:

Addresses a few player bugs:

• Calling play() in response to PLAYER_READY event causes video not to be displayed (818)
• rtmp.subscribe not working with bandwidth detection / switching (831)
• YouTube playlists displaying some visual artifacts when switching between playlist items (809)

Location:

trunk/fl5

Files:

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

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

@@ -61 +61 @@
                 /** Load after unlock - My favorite variable ever **/
                 protected var _unlockAndLoad:Boolean;
+                /** Whether the playlist has been loaded yet **/
+                protected var _playlistReady:Boolean = false;
                 
                 
@@ -147 +149 @@
                                 _setupFinalized = true;
 
-                                dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_READY));
-
                                 _player.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_LOADED, playlistLoadHandler);
                                 _player.addEventListener(ErrorEvent.ERROR, errorHandler);
                                 _player.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_ITEM, playlistItemHandler);
-
+                                
                                 _model.addEventListener(MediaEvent.JWPLAYER_MEDIA_COMPLETE, completeHandler);
+                                
+                                dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_READY));
 
                                 // Broadcast playlist loaded (which was swallowed during player setup);
@@ -160 +162 @@
                                 }
 
+                                
                         }
                 }
@@ -165 +168 @@
 
                 protected function playlistLoadHandler(evt:PlaylistEvent=null):void {
+                        _playlistReady = true;
+                        
                         if (_model.config.shuffle) {
                                 shuffleItem();
@@ -322 +327 @@
 
                 public function play():Boolean {
+                        if (!_playlistReady) {
+                                Logger.log("Attempted to begin playback before playlist is ready");
+                                return false;
+                        }
+                        
                         if (_mediaLoader) {
                                 _delayedItem = _model.playlist.currentItem;

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

@@ -72 +72 @@
                         tasker.addEventListener(ErrorEvent.ERROR, setupTasksFailed);
                         
-                        tasker.queueTask(insertDelay);
                         tasker.queueTask(loadConfig, loadConfigComplete);
                         tasker.queueTask(loadSkin, loadSkinComplete);
@@ -104 +103 @@
                 ///////////////////////
                 
-                protected function insertDelay():void {
-                        var timer:Timer = new Timer(100, 1);
-                        timer.addEventListener(TimerEvent.TIMER_COMPLETE, tasker.success);
-                        timer.start();
-                }
-
                 protected function loadConfig():void {
                         var configger:Configger = new Configger();

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

@@ -256 +256 @@
                                         sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_ERROR,{message: "Subscription failed: " + item.file}); 
                 } else if (dat.code == "NetStream.Play.Start") {
-                    setStream();
+                                        if (item.levels.length > 0) {
+                                                if (_dynamic || _bandwidthChecked) {
+                                                        setStream();
+                                                } else {
+                                                        _bandwidthChecked = true;
+                                                        _bandwidthSwitch = true;
+                                                        _connection.call('checkBandwidth', null);
+                                                }
+                                        } else {
+                                                setStream();
+                                        }
                 }
                 clearInterval(_subscribeInterval);
@@ -384 +394 @@
                 }
             }
+                        
                         if (state == PlayerState.PAUSED) {
                                 play();
                         }
-            if (getConfigProperty('subscribe')) {
-                _stream.play(getID(item.file));
-                        } else if(isDVR) {
+                        
+                        if(isDVR) {
                                 if(state != PlayerState.PLAYING) {
                                         try {

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

@@ -151 +151 @@
                 override public function play():void {
                         _outgoing.send('AS3_' + _unique, "playVideo");
-//                      super.play();
+                        super.play();
                 }
 
@@ -200 +200 @@
                         _bufferPercent = Math.round(ldd / ttl * 100);
                         _offset = off / ttl * item.duration;
-                        sendBufferEvent(_bufferPercent, _offset);
+                        sendBufferEvent(_bufferPercent, _offset, {loaded:ldd, total:ttl});
                 }
 
@@ -209 +209 @@
                         if (item.duration < 0) {
                                 item.duration = dur;
-                        }
-                        if (state != PlayerState.PLAYING){
-                                super.play();
                         }
                         sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: pos, duration: item.duration, offset: _offset});

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

@@ -16 +16 @@
         import flash.display.Sprite;
         import flash.events.Event;
+        import flash.utils.setTimeout;
         
         
@@ -72 +73 @@
                         // Only handle JWPLAYER_READY once
                         controller.removeEventListener(PlayerEvent.JWPLAYER_READY, playerReady);
+                        
+                        // Initialize Javascript interface
                         var jsAPI:JavascriptAPI = new JavascriptAPI(this);
+                        
+                        // Forward all MVC events
                         model.addGlobalListener(forward);
                         view.addGlobalListener(forward);
                         controller.addGlobalListener(forward);
-                        forward(evt);
+
+                        // Insert a delay to allow Javascript listeners to initialize 
+                        setTimeout(forward, 50, evt);
                 }
                 

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

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

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

@@ -454 +454 @@
                                                 _imageLayer.visible = false;
                                         }
+                                        if (_logo) _logo.visible = true;
+                                        break;
                                 case PlayerState.BUFFERING:
                                         if (_logo) _logo.visible = true;