Changeset 420

Timestamp:

10/08/09 18:26:04 (4 years ago)

Author:

zach

Message:

Fixing controlbar issues
Removing fade effect

Location:

trunk/fl5/src/com/longtailvideo/jwplayer

Files:

• media/MediaProvider.as (modified) (1 diff)
• media/VideoMediaProvider.as (modified) (2 diffs)
• view/components/ControlbarComponentV4.as (modified) (8 diffs)

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

@@ -112 +112 @@
                 public function seek(pos:Number):void {
                         _position = pos;
-                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: position});
+                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: position, duration:item.duration});
                 }
                 

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

@@ -139 +139 @@
                 protected function positionInterval():void {
                         _position = Math.round(stream.time * 10) / 10;
-                        var bfr:Number = Math.round(stream.bytesLoaded / stream.bytesTotal * 100);
-                        if (bfr < 95 && position < Math.abs(item.duration - stream.bufferTime - 1)) {
-                                if (state == PlayerState.PLAYING && bfr < 25) {
+                        var bufferPercent:Number = Math.round(stream.bytesLoaded / stream.bytesTotal * 100);
+                        var bufferFill:Number = Math.round(stream.bufferTime / stream.bufferLength * 100);
+                        if (bufferFill < 95 && position < Math.abs(item.duration - stream.bufferTime - 1)) {
+                                if (state == PlayerState.PLAYING && bufferFill < 25) {
                                         setState(PlayerState.BUFFERING);
                                 }
-                                sendBufferEvent(bfr);
-                        } else if (bfr > 95 && state == PlayerState.BUFFERING) {
+                                sendBufferEvent(bufferPercent);
+                        } else if (bufferFill > 95 && state == PlayerState.BUFFERING) {
                                 super.play();
                         }
@@ -151 +152 @@
                         if (position < item.duration) {
                                 if (state == PlayerState.PLAYING && position >= 0) {
-                                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: position, duration: item.duration, bufferPercent:bfr});
+                                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: position, duration: item.duration, bufferPercent:bufferPercent});
                                 }
                         } else if (item.duration > 0) {

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

@@ -25 +25 @@
         import flash.utils.clearTimeout;
         import flash.utils.setTimeout;
-        
-        import mx.effects.Fade;
-        
+                
         
         public class ControlbarComponentV4 extends CoreComponent implements IControlbarComponent {
@@ -68 +66 @@
                                 muteButton: ViewEvent.JWPLAYER_VIEW_MUTE, 
                                 unmuteButton: ViewEvent.JWPLAYER_VIEW_MUTE};
-                        var temp:Sprite = player.skin.getSWFSkin();
                         skin = player.skin.getSWFSkin().getChildByName('controlbar') as Sprite;
                         skin.x = 0;
@@ -156 +153 @@
                         stacker.rearrange(width);
                         stateHandler();
+                        fixTime();
                         Mouse.show();
                 }
@@ -218 +216 @@
                         timeHandler();
                         stacker.rearrange();
+                        fixTime();
                 }
                 
@@ -224 +223 @@
                 private function moveHandler(evt:MouseEvent = null):void {
                         if (alpha == 0) {
-                                var fade:Fade = new Fade(this);
+                                /*var fade:Fade = new Fade(this);
                                 fade.alphaTo = 1;
-                                fade.play();
+                                fade.play();*/
                         }
                         clearTimeout(hiding);
@@ -428 +427 @@
                         var dur:Number = 0;
                         var pos:Number = 0;
-                        if (evt && (evt.position >= 0 || evt.duration >=0)) {
-                                dur = evt.duration;
-                                pos = evt.position;
+                        if (evt) {
+                                if (evt.duration >= 0){
+                                        dur = evt.duration;
+                                }
+                                if (evt.position >= 0){
+                                        pos = evt.position;
+                                }
                         } else if (player.playlist.length > 0 && player.playlist.currentItem) {
-                                dur = player.playlist.currentItem.duration;
+                                if (player.playlist.currentItem.duration >= 0){
+                                        dur = player.playlist.currentItem.duration;
+                                }
                                 pos = 0;
                         }
@@ -440 +445 @@
                         }
                         try {
-                                var temp:DisplayObject = skin.getChildByName('elapsedText');
                                 (getSkinElement('elapsedText') as TextField).text = Strings.digits(pos);
                                 (getSkinElement('totalText') as TextField).text = Strings.digits(dur);
@@ -451 +455 @@
                                         getSkinElementChild('timeSlider', 'icon').visible = true;
                                         getSkinElementChild('timeSlider', 'mark').visible = true;
-                                        if (!scrubber) {
+                                        if(!scrubber) {
                                                 getSkinElementChild('timeSlider', 'icon').x = xps;
-                                                getSkinElementChild('timeSlider', 'icon').scaleX  = 1 / getSkinElement('timeSlider').scaleX;
-                                                //getSkinElementChild('timeSlider','icon'). = 1;
                                                 getSkinElementChild('timeSlider', 'done').width = xps;
-                                                var bufferPercent:Number = evt.bufferPercent / 100;
-                                                var wid:Number = getSkinElementChild('timeSlider','rail').width;
-                                                getSkinElementChild('timeSlider','mark').x = 0;
-                                                getSkinElementChild('timeSlider','mark').width = bufferPercent / 100 * getSkinElementChild('timeSlider', 'rail').width;
-                                                getSkinElementChild('timeSlider','mark').scaleX = getSkinElementChild('timeSlider', 'rail').scaleX;
+                                                getSkinElementChild('timeSlider', 'mark').x = xps;
+                                                getSkinElementChild('timeSlider', 'mark').width = Math.round(evt.bufferPercent / 100 * (getSkinElementChild('timeSlider', 'rail').width - xps));
                                         }
                                         getSkinElementChild('timeSlider', 'done').visible = true;
                                 } else {
-                                        getSkinElementChild('timeSlider', 'icon').visible = false;
-                                        getSkinElementChild('timeSlider', 'mark').visible = false;
-                                        getSkinElementChild('timeSlider', 'done').visible = false;
-                                }
+                                        if (player.state != PlayerState.PLAYING){
+                                                getSkinElementChild('timeSlider', 'icon').visible = false;
+                                                getSkinElementChild('timeSlider', 'mark').visible = false;
+                                                getSkinElementChild('timeSlider', 'done').visible = false;
+                                        }
+                                }
+                        } catch (err:Error) {
+                        }
+                }
+                
+                
+                /** Fix the timeline display. **/
+                private function fixTime():void {
+                        try {
+                                var scp:Number = getSkinElement('timeSlider').scaleX;
+                                getSkinElement('timeSlider').scaleX = 1;
+                                getSkinElementChild('timeSlider', 'icon').x = scp * getSkinElementChild('timeSlider', 'icon').x;
+                                getSkinElementChild('timeSlider', 'mark').x = scp * getSkinElementChild('timeSlider', 'mark').x;
+                                getSkinElementChild('timeSlider', 'mark').width = scp * getSkinElementChild('timeSlider', 'mark').width;
+                                getSkinElementChild('timeSlider', 'rail').width = scp * getSkinElementChild('timeSlider', 'rail').width;
+                                getSkinElementChild('timeSlider', 'done').x = scp * getSkinElementChild('timeSlider', 'done').x;
+                                getSkinElementChild('timeSlider', 'done').width = scp * getSkinElementChild('timeSlider', 'done').width;
                         } catch (err:Error) {
                         }