Changeset 475 for trunk/fl5/src/com/longtailvideo/jwplayer/model/PlayerConfig.as

Timestamp:

10/15/09 18:21:56 (4 years ago)

Author:

pablo

Message:

Playlist loading consistency fixes

File:

• trunk/fl5/src/com/longtailvideo/jwplayer/model/PlayerConfig.as (modified) (6 diffs)

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

@@ -14 +14 @@
         public dynamic class PlayerConfig extends EventDispatcher {
                 /** Internal playlist reference **/
-                private var _list:Playlist;
+//              private var _list:Playlist;
+                private var _singleItem:PlaylistItem;
 
                 private var _playlistfile:String        = null;
@@ -52 +53 @@
                 private var _playerready:String         = "";
                 
-                public function PlayerConfig(newlist:Playlist):void {
+                public function PlayerConfig():void {
                         controlbar = _controlbar;
                         playlist = _playlist;
                         playlistsize = _playlistsize;
-                        setPlaylist(newlist);
+//                      _list = newlist;
+//                      setPlaylist(newlist);
                         
                         //Unsupported config variables
@@ -62 +64 @@
                 }
                 
+/*              
                 public function setPlaylist(list:Playlist):void {
                         _list = list;
                 }
-                
+*/              
                 public function setConfig(config:Object):void {
-                        var newItem:PlaylistItem = new PlaylistItem();
                         var playlistItems:Boolean = false;
+                        if (!_singleItem) { _singleItem = new PlaylistItem(); }
                         for (var item:String in config) {
-                                if (newItem.hasOwnProperty(item)) {
+                                if (_singleItem.hasOwnProperty(item)) {
                                         if (item == "file" && Strings.extension(config[item]) == "xml") {
                                                 setProperty("playlistfile", config[item]);                                      
-                                        } else if (_list.length > 0) {
-                                                _list.currentItem[item] = config[item];
+//                                      } //else if (_list.length > 0) {
+//                                              _list.currentItem[item] = config[item];
                                         } else {
-                                                newItem[item] = config[item];
+                                                _singleItem[item] = config[item];
                                                 playlistItems = true;
                                         }
@@ -85 +88 @@
                                 }
                         }
-                        if (playlistItems && _list.length == 0) {
-                                _list.insertItem(newItem, 0);
-                        }
+//                      if (playlistItems && _list.length == 0) {
+//                              _list.insertItem(newItem, 0);
+//                      }
                 }
                 
@@ -125 +128 @@
                 private function playlistItem(key:String):String {
                         try {
-                                return _list.currentItem[key].toString();
+//                              return _list.currentItem[key].toString();
+                                return _singleItem[key].toString();
                         } catch (e:Error) {
                         }
@@ -195 +199 @@
                 public function get type():String { return playlistItem('provider'); }
 
+                /** PlaylistItem representing single-item playlist based on flashvars (e.g. config[file], config[image], etc. **/
+                public function get singleItem():PlaylistItem { return _singleItem; }
+
                 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 // LAYOUT PROPERTIES