Changeset 418

Timestamp:

10/08/09 17:01:35 (4 years ago)

Author:

zach

Message:

V4 controlbar working much better

Location:

trunk/fl5/src/com/longtailvideo/jwplayer

Files:

• media/VideoMediaProvider.as (modified) (2 diffs)
• view/components/ControlbarComponentV4.as (modified) (9 diffs)

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.bufferLength / stream.bufferTime * 100);
+                        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) {
@@ -151 +151 @@
                         if (position < item.duration) {
                                 if (state == PlayerState.PLAYING && position >= 0) {
-                                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: position, duration: item.duration});
+                                        sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_TIME, {position: position, duration: item.duration, bufferPercent:bfr});
                                 }
                         } else if (item.duration > 0) {

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

@@ -77 +77 @@
                         player.addEventListener(MediaEvent.JWPLAYER_MEDIA_MUTE, muteHandler);
                         player.addEventListener(MediaEvent.JWPLAYER_MEDIA_VOLUME, volumeHandler);
-                        player.addEventListener(MediaEvent.JWPLAYER_MEDIA_BUFFER, loadedHandler);
+                        player.addEventListener(MediaEvent.JWPLAYER_MEDIA_BUFFER, timeHandler);
                         player.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_LOADED, itemHandler);
                         player.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_UPDATED, itemHandler);
@@ -85 +85 @@
                         setColors();
                         itemHandler();
-                        loadedHandler();
                         muteHandler();
                         stateHandler();
@@ -157 +156 @@
                         stacker.rearrange(width);
                         stateHandler();
-                        fixTime();
                         Mouse.show();
                 }
@@ -208 +206 @@
                 }
                 
-                
-                /** 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) {
-                        }
-                }
-                
-                
                 /** Handle a change in the current item **/
                 private function itemHandler(evt:PlaylistEvent = null):void {
@@ -237 +218 @@
                         timeHandler();
                         stacker.rearrange();
-                        fixTime();
-                        loadedHandler();
-                }
-                
-                
-                /** Process bytesloaded updates given by the model. **/
-                private function loadedHandler(evt:MediaEvent = null):void {
-                        try {
-                                var wid:Number = getSkinElementChild('timeSlider', 'rail').width;
-                                //getSkinElement('timeSlider').getChildByName('mark').x = evt.position / evt.duration * wid;
-                                var icw:Number = getSkinElementChild('timeSlider', 'icon').x + getSkinElementChild('timeSlider', 'icon').width;
-                                var markWidth:Number = ((evt.bufferPercent / 100) * player.config.bufferlength) / evt.duration * wid + icw;
-                                getSkinElementChild('timeSlider', 'mark').width = Math.abs(markWidth);
-                        } catch (err:Error) {
-                        }
                 }
                 
@@ -270 +236 @@
                 /** Hide above controlbar again when move has timed out. **/
                 private function moveTimeout():void {
-                        var fade:Fade = new Fade(this);
+                        /*var fade:Fade = new Fade(this);
                         fade.alphaTo = 0;
-                        fade.play();
+                        fade.play();*/
                 }
                 
@@ -462 +428 @@
                         var dur:Number = 0;
                         var pos:Number = 0;
-                        if (evt) {
+                        if (evt && (evt.position >= 0 || evt.duration >=0)) {
                                 dur = evt.duration;
                                 pos = evt.position;
@@ -481 +447 @@
                         }
                         try {
-                                var tsl:MovieClip = getSkinElement('timeSlider') as MovieClip;
-                                var xps:Number = Math.round(pct * (tsl.rail.width - tsl.icon.width));
+                                var xps:Number = Math.round(pct * (getSkinElementChild('timeSlider', 'rail').width - getSkinElementChild('timeSlider', 'icon').width));
                                 if (dur > 0) {
                                         getSkinElementChild('timeSlider', 'icon').visible = true;
@@ -488 +453 @@
                                         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', 'done').visible = true;