Changeset 1149

Timestamp:

07/07/10 13:07:13 (3 years ago)

Author:

pablo

Message:

A few minor bug fixes and tweaks:

• RTMP mp3 streams w/ query params had the query string truncated instead of the file exension
• More descriptive error message for playlist error 2048 (crossdomain security restrictions)
• Loading error screen displays error message
• Removed unnecessary AS2 TEA class

Location:

trunk/fl5

Files:

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

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

@@ -159 +159 @@
                         var parts:Array = url.split("?");
             var ext:String = parts[0].substr(-4);
+                        parts[0] = parts[0].substr(0, parts[0].length-4);
             if (url.indexOf(':') > -1) {
                 return url;
             } else if (ext == '.mp3') {
-                return 'mp3:' + url.substr(0, url.length - 4);
+                return 'mp3:' + parts.join("?");
             } else if (ext == '.mp4' || ext == '.mov' || ext == '.m4v' || ext == '.aac' || ext == '.m4a' || ext == '.f4v') {
                 return 'mp4:' + url;
             } else if (ext == '.flv') {
-                                parts[0] = parts[0].substr(0, parts[0].length-4);
-                return parts.length > 1 ? parts.join("?") : parts[0];
+                return parts.join("?");
             } else {
                 return url;
@@ -229 +229 @@
                         }
                         sendMediaEvent(MediaEvent.JWPLAYER_MEDIA_LOADED);
-                        _connection.connect(item.streamer);
+                        try {
+                                _connection.connect(item.streamer);
+                        } catch(e:Error) {
+                                error("Could not connect to streamer: " + e.message);
+                        }
                 }
                 

trunk/fl5/src/com/longtailvideo/jwplayer/model/Playlist.as

@@ -141 +141 @@
                 
                 protected function playlistError(message:String):void {
-                        dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_ERROR, "Playlist could not be loaded: " + message));
+                        if (message.indexOf("Error #2048") >= 0) {
+                                dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_ERROR, "Playlist could not be loaded due to crossdomain policy restrictions."));
+                        } else {
+                                dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_ERROR, "Playlist could not be loaded: " + message));
+                        }
                 }
                 

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

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

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

@@ -41 +41 @@
         import flash.net.URLRequest;
         import flash.system.LoaderContext;
+        import flash.text.TextField;
+        import flash.text.TextFormat;
 
 
@@ -163 +165 @@
                                 loaderScreen.removeChild(loaderAnim);
                                 var errorScreen:DisplayObject = new ErrorScreen() as DisplayObject;
+                                var errorMessage:TextField = new TextField();
+                                errorMessage.defaultTextFormat = new TextFormat("_sans", 12, 0xffffff);
+                                errorMessage.text = errorMsg;
+                                errorMessage.width = loaderScreen.width - 60;
+                                errorMessage.wordWrap = true;
+                                errorMessage.height = errorMessage.textHeight + 10;
+
                                 errorScreen.x = (loaderScreen.width - errorScreen.width) / 2;
-                                errorScreen.y = (loaderScreen.height - errorScreen.height) / 2;
+                                errorScreen.y = (loaderScreen.height - errorScreen.height - errorMessage.height - 10) / 2;
+                                errorMessage.x = (loaderScreen.width - errorMessage.width) / 2;
+                                errorMessage.y = errorScreen.y + errorScreen.height + 10;
                                 loaderScreen.addChild(errorScreen);
+                                loaderScreen.addChild(errorMessage);
                         }
                 }