Changeset 748

Timestamp:

12/11/09 16:07:17 (3 years ago)

Author:

zach

Message:

• RTMP Audio now leaves image in place ( http://developer.longtailvideo.com/trac/ticket/637)
• Curtain image now gracefully handles non-bitmap files ( http://developer.longtailvideo.com/trac/ticket/674)

Location:

trunk/fl5

Files:

• player.swf (modified) (previous)
• src/com/longtailvideo/jwplayer/media/RTMPMediaProvider.as (modified) (2 diffs)
• src/com/longtailvideo/jwplayer/player/PlayerVersion.as (modified) (1 diff)
• src/com/longtailvideo/jwplayer/view/View.as (modified) (1 diff)

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

@@ -116 +116 @@
                 /** Finalizes the loading process **/
                 private function finishLoad():void {
-                        if (!media) {
+                        var ext:String = item.file.substr(-4);
+                        if (ext == '.mp3'){
+                                media = null;
+                        } else if (!media) {
                                 media = _video;
                         }
@@ -165 +168 @@
                 /** Resume playing. **/
                 override public function play():void {
+                        /* 
+                        * Livestreams will reset their buffer if _stream.resume is called,
+                        * so we suppress them after the intial call
+                        */
                         if (!(livestream && _started)) {
                                 _stream.resume();

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

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

trunk/fl5/src/com/longtailvideo/jwplayer/view/View.as

@@ -421 +421 @@
 
                 protected function imageComplete(evt:Event):void {
-                        Draw.smooth(_image.loadedObject as Bitmap);
-                        _imageLayer.addChild(_image.loadedObject);
-                        _imageLayer.x = _components.display.x;
-                        _imageLayer.y = _components.display.y;
-                        Stretcher.stretch(_image.loadedObject, _player.config.width, _player.config.height, _player.config.stretching);
+                        if (_image.loadedObject is Bitmap) {
+                                Draw.smooth(_image.loadedObject as Bitmap);
+                                _imageLayer.addChild(_image.loadedObject);
+                                _imageLayer.x = _components.display.x;
+                                _imageLayer.y = _components.display.y;
+                                Stretcher.stretch(_image.loadedObject, _player.config.width, _player.config.height, _player.config.stretching);
+                        } else {
+                                _image = null;
+                                Logger.log('Error loading preview image.');
+                        }
                 }