Changeset 651

Timestamp:

11/19/09 16:25:51 (3 years ago)

Author:

zach

Message:

• Fixing YouTubeMediaProvider complete event order
• Suppressing SoundMediaProvider buffering events

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/SoundMediaProvider.as (modified) (8 diffs)
• src/com/longtailvideo/jwplayer/media/YouTubeMediaProvider.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)

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

@@ -8 +8 @@
         import com.longtailvideo.jwplayer.model.PlaylistItem;
         import com.longtailvideo.jwplayer.player.PlayerState;
-
+        
         import flash.events.*;
         import flash.media.*;
@@ -26 +26 @@
                 /** ID for the position interval. **/
                 protected var _positionInterval:Number;
-
+                /** Whether the buffer has filled **/
+                private var _bufferFull:Boolean;
 
                 /** Constructor; sets up the connection and display. **/
@@ -71 +72 @@
                 /** Load the _sound. **/
                 override public function load(itm:PlaylistItem):void {
-                        _item = itm;
                         _position = 0;
-                        _sound = new Sound();
-                        _sound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
-                        _sound.addEventListener(Event.ID3, id3Handler);
-                        _sound.addEventListener(ProgressEvent.PROGRESS, positionHandler);
-                        _sound.load(new URLRequest(_item.file), _context);
-                        _positionInterval = setInterval(positionHandler, 100);
+                        if (_item != itm) {
+                                _item = itm;
+                                _sound = new Sound();
+                                _sound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
+                                _sound.addEventListener(Event.ID3, id3Handler);
+                                _sound.addEventListener(ProgressEvent.PROGRESS, positionHandler);
+                                _sound.load(new URLRequest(_item.file), _context);
+                        }
+                        if (!_positionInterval) {
+                                _positionInterval = setInterval(positionHandler, 100);
+                        }
+                        _bufferFull = false;
                         setState(PlayerState.BUFFERING);
                         sendBufferEvent(0);
@@ -88 +94 @@
                 /** Pause the _sound. **/
                 override public function pause():void {
-                        if (_channel) {
+                        if (_positionInterval){
                                 clearInterval(_positionInterval);
                                 _positionInterval = undefined;
+                        }
+                        if (_channel) {
                                 _channel.stop();
                         }
@@ -106 +114 @@
                                 _positionInterval = setInterval(positionHandler, 100);
                         }
+                        if (_channel){
+                                _channel.stop();
+                                _channel = null;
+                        }
                         _channel = _sound.play(_position * 1000, 0, _transformer);
                         _channel.addEventListener(Event.SOUND_COMPLETE, completeHandler);
@@ -115 +127 @@
                 protected function positionHandler(progressEvent:ProgressEvent=null):void {
                         var bufferPercent:Number;
+                        
                         if (_sound.bytesLoaded / _sound.bytesTotal > 0.1 && _item.duration <= 0) {
                                 _item.duration = _sound.length / 1000 / _sound.bytesLoaded * _sound.bytesTotal;
                         }
+                        
                         if (_channel) {
                                 _position = Math.round(_channel.position / 100) / 10;
@@ -124 +138 @@
                                 bufferPercent = Math.floor(progressEvent.bytesLoaded / progressEvent.bytesTotal * 100);
                         }
+                        
                         if (_sound.isBuffering == true && _sound.bytesTotal > _sound.bytesLoaded) {
                                 if (state != PlayerState.BUFFERING) {
@@ -129 +144 @@
                                                 _channel.stop();
                                         }
-                                        setState(PlayerState.BUFFERING);
-                                } else {
+                                        _bufferFull = false;
+                                        if (!progressEvent) {
+                                                setState(PlayerState.BUFFERING);
+                                        }
+                                }
+                        } else if (state == PlayerState.BUFFERING && _sound.isBuffering == false && !_bufferFull) {
+                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
+                                _bufferFull = true;
+                        }
+                        
+                        if (state == PlayerState.BUFFERING) {
+                                if (!isNaN(bufferPercent)){
                                         sendBufferEvent(bufferPercent);
                                 }
-                        } else if (state == PlayerState.BUFFERING && _sound.isBuffering == false) {
-                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
-                        }
-                        if (_position < _item.duration) {
-                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: _position,
-                                                duration: _item.duration, bufferPercent: bufferPercent});
+                        } else if (_position < _item.duration) {
+                                if (state == PlayerState.PLAYING){
+                                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: _position, duration: _item.duration, bufferPercent: bufferPercent});
+                                }
                         } else if (_item.duration > 0) {
                                 complete();

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

@@ -179 +179 @@
                                         if (state != PlayerState.BUFFERING && state != PlayerState.IDLE) {
                                                 complete();
+                                                _offset = 0;
                                         }
                                         break;
@@ -244 +245 @@
                         super.setVolume(pct);
                 }
-                
-                /** Complete playback **/
-                override protected function complete():void {
-                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_COMPLETE);
-                        setState(PlayerState.IDLE);
-                        _position = _offset = 0;
-                }
         }
 }

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

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