Changeset 853

Timestamp:

02/24/10 16:29:52 (3 years ago)

Author:

pablo

Message:

Fixing hd.state issue

Location:

branches/plugins/hd

Files:

• bin-release/hd.swf (modified) (previous)
• src/com/longtailvideo/plugins/hd/HD.as (modified) (4 diffs)

branches/plugins/hd/src/com/longtailvideo/plugins/hd/HD.as

@@ -50 +50 @@
                         _player = player;
                         _config = cfg;
-                        if (config.state == 'true') {
+                        if (config.state.toString() == 'true') {
                                 config.state = true;
                         } else {
@@ -57 +57 @@
                         _player.addEventListener(MediaEvent.JWPLAYER_MEDIA_TIME, timeHandler);
                         _player.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_ITEM, itemHandler);
-                        if (config.state) {
-                                config.file = config.file;
-                        }
+
                         if (_player.config.dock) {
                                 if (_player.skin.getSkinElement('hd', 'dockIcon')) {
@@ -139 +137 @@
                 /** Updates the playlist with either the HD or default video. **/
                 private function itemHandler(evt:Event=null):void {
-                        if (_currentItem != _player.playlist.currentItem) {
+                        if (_currentItem == null && config.state) {
+                                // Little hack to avoid re-loading the playlist on startup.
+                                _currentItem = _player.playlist.currentItem; 
+                                _currentItem['hd.originalfile'] = _currentItem.file;
+                                _currentItem.file = swapFile;
+                        } else  if (_currentItem != _player.playlist.currentItem) {
                                 _currentItem = _player.playlist.currentItem;
                         } 
@@ -165 +168 @@
                         // Load a new playlist instead of changing the item's file property.
                         // This is necessary due to a bug in 5.0 that doesn't load a new file if the PlaylistItem object doesn't change.
-                        _player.load(newList);
-                        _player.play();
-                        _player.seek(_position);
+                        if (_player.state == PlayerState.PLAYING || _player.state == PlayerState.BUFFERING) {
+                                _player.load(newList);
+                                _player.play();
+                                _player.seek(_position);
+                        } else {
+                                _player.load(newList);
+                        }
                 }