Changeset 973

Timestamp:

04/29/10 12:47:07 (3 years ago)

Author:

pablo

Message:

• Fixed seeking problem in HTTP media provider ( 765)
• The default playlist background for PNG skinning should be the screencolor, not always black ( 880)

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/HTTPMediaProvider.as (modified) (3 diffs)
• src/com/longtailvideo/jwplayer/media/MediaProvider.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/components/PlaylistComponent.as (modified) (1 diff)

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

@@ -255 +255 @@
                         var bufferFill:Number;
                         if (item.duration > 0 && _stream && _stream.bytesTotal > 0) {
-                                percentoffset =  Math.round(_timeoffset /  item.duration * 100);
-                                bufferPercent = (_stream.bytesLoaded / _stream.bytesTotal) * (1 - _timeoffset / item.duration) * 100;
+                                percentoffset =  _timeoffset /  item.duration * 100;
+                                bufferPercent = (_stream.bytesLoaded / _stream.bytesTotal) * (1 - percentoffset/100) * 100;
                                 var bufferTime:Number = _stream.bufferTime < (item.duration - pos) ? _stream.bufferTime : Math.round(item.duration - pos);
                                 bufferFill = _stream.bufferTime == 0 ? 0 : Math.ceil(_stream.bufferLength / bufferTime * 100);
@@ -341 +341 @@
                         switch (evt.info.code) {
                                 case "NetStream.Play.Stop":
-                                        if (state != PlayerState.BUFFERING) {
-                                                complete();
-                                        }
+                                        complete();
                                         break;
                                 case "NetStream.Play.StreamNotFound":
@@ -362 +360 @@
                 /** Destroy the HTTP stream. **/
                 override public function stop():void {
-                        if (_stream.bytesLoaded < _stream.bytesTotal) {
+                        if (_stream.bytesLoaded < _stream.bytesTotal || _byteoffset > 0) {
                                 _stream.close();
                         } else {

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

@@ -231 +231 @@
                 /** Completes video playback **/
                 protected function complete():void {
-                        stop();
-                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_COMPLETE);
+                        if (state != PlayerState.IDLE) {
+                                stop();
+                                sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_COMPLETE);
+                        }
                 }
                 

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/PlaylistComponent.as

@@ -102 +102 @@
                                 background = new Sprite();
                                 background.name = "background";
-                                background.graphics.beginFill(0, 1);
+                                background.graphics.beginFill(player.config.screencolor.color, 1);
                                 background.graphics.drawRect(0, 0, 1, 1);
                                 background.graphics.endFill();