Changeset 1223

Timestamp:

08/18/10 18:52:22 (3 years ago)

Author:

pablo

Message:

• Fixes issue with Sound MediaProvider where the lack of content-length headers cause instability (1012)
• New JS API getters for width and height use stage dimensions instead of display window

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/SoundMediaProvider.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/JavascriptAPI.as (modified) (4 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 com.longtailvideo.jwplayer.utils.Logger;
         
         import flash.events.*;
@@ -133 +134 @@
                 /** Interval for the _position progress **/
                 protected function positionHandler(progressEvent:ProgressEvent=null):void {
-                        var bufferPercent:Number;
-                        
-                        if (_sound.bytesTotal > 0 && _sound.bytesLoaded / _sound.bytesTotal > 0.1 && (_item.duration <= 0 || _userDuration < 0)) {
-                                _item.duration = _sound.length / 1000 / _sound.bytesLoaded * _sound.bytesTotal;
-                        }
-                        
-                        if (_channel && _sound && _sound.bytesTotal > 0) {
+                        var bufferPercent:Number = 0;
+                        
+                        if (_item.duration <= 0 || _userDuration < 0) {
+                                if (_sound.bytesTotal > 0 && _sound.bytesLoaded / _sound.bytesTotal > 0.1) {
+                                        _item.duration = _sound.length / 1000 / _sound.bytesLoaded * _sound.bytesTotal;
+                                } else if (_sound.length > 0) {
+                                        _item.duration = _sound.length / 1000;
+                                }
+                        }
+                        
+                        if (_channel && _sound) {
                                 _position = Math.round(_channel.position / 100) / 10;
-                                bufferPercent = Math.floor(_sound.bytesLoaded / _sound.bytesTotal * 100);
+                                if (_sound.bytesTotal > 0) {
+                                        bufferPercent = Math.floor(_sound.bytesLoaded / _sound.bytesTotal * 100);
+                                }
                         } else if (!_channel && progressEvent && progressEvent.bytesTotal > 0) {
                                 bufferPercent = Math.floor(progressEvent.bytesLoaded / progressEvent.bytesTotal * 100);
-                        } else {
-                                bufferPercent = 0;
-                        }
-                        
-                        if (_sound.isBuffering == true && _sound.bytesTotal > _sound.bytesLoaded) {
-                                if (state != PlayerState.BUFFERING) {
-                                        _bufferFull = false;
-                                        if (_channel) {
-                                                _channel.stop();
-                                        }
-                                        if (!progressEvent) {
-                                                setState(PlayerState.BUFFERING);
-                                        }
-                                }
+                        }
+
+                        
+                        if (state == PlayerState.PLAYING && _sound.isBuffering == true) {
+                                // Buffer underrun condition
+                                _bufferFull = false;
+                                setState(PlayerState.BUFFERING);
+                                return
                         } else if (state == PlayerState.BUFFERING && _sound.bytesLoaded > 0 && !_bufferFull) {
                                 _bufferFull = true;
                                 sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_BUFFER_FULL);
                         }
-                        
                         
                         if (!isNaN(bufferPercent) && !_bufferingComplete){

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

@@ -8 +8 @@
         import com.longtailvideo.jwplayer.utils.JavascriptSerialization;
         import com.longtailvideo.jwplayer.utils.Logger;
+        import com.longtailvideo.jwplayer.utils.RootReference;
         import com.longtailvideo.jwplayer.utils.Strings;
         
@@ -176 +177 @@
                         if (evt.bufferPercent >= 0)             returnObj.bufferPercent = evt.bufferPercent;
                         if (evt.duration >= 0)                          returnObj.duration = evt.duration;
-                        if (evt.message != undefined)           returnObj.message = evt.message;
+                        if (evt.message != "")                          returnObj.message = evt.message;
                         if (evt.metadata != null)                       returnObj.metadata = evt.metadata;
                         if (evt.offset >= 0)                            returnObj.offset = evt.offset;
@@ -218 +219 @@
 
                 protected function js_getHeight():Number {
-                        return _player.config.height;
+                        return RootReference.stage.stageHeight;
                 }
                 
@@ -246 +247 @@
 
                 protected function js_getWidth():Number {
-                        return _player.config.width;
+                        return RootReference.stage.stageWidth;
                 }
 

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

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