Changeset 1806

Timestamp:

05/26/11 14:29:28 (2 years ago)

Author:

pablo

Message:

Fixes a problem with single-item configurations and the OVA plugin

Location:

plugins/hd/v5

Files:

• hd.swf (modified) (previous)
• src/com/longtailvideo/plugins/hd/HD.as (modified) (3 diffs)

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

@@ -12 +12 @@
     import com.longtailvideo.jwplayer.plugins.PluginConfig;
     import com.longtailvideo.jwplayer.utils.Configger;
-
+    
     import flash.display.DisplayObject;
     import flash.display.MovieClip;
@@ -119 +119 @@
             // Reset the reset.
             _reset = -1;
-            // Set the file flashvar to the first playlistitem.
-            if(_config.file) {
-                _player.playlist.getItemAt(0)['hd.file'] = _config.file;
-            }
+                        // Which item should we apply the global 'hd.file' to?
+                        // We should skip ova.hidden items.
+                        var firstVisible:Number = 0;
             // Store all the original files into the playlist.
             for(var i:Number = 0; i < _player.playlist.length; i++) {
                 var item:PlaylistItem = _player.playlist.getItemAt(i);
+                                if (item['ova.hidden']) {
+                                        // This item is hidden by OVA; we shouldn't set its hd.file property. 
+                                        firstVisible++;
+                                }
+                                // Set the hd.file flashvar to the first playlistitem.
+                                if(i == firstVisible && _config.file) {
+                                        item['hd.file'] = _config.file;
+                                }
                 if(item.provider == 'youtube') {
                     item['youtube.quality'] = 'medium';
@@ -186 +193 @@
         /** Switch the currently playing file with a new one. **/
         private function _swap():void {
-            // Swap HD state in every playlist item.
-            for(var i:Number = 0; i<_player.playlist.length; i++) {
-                var item:PlaylistItem = _player.playlist.getItemAt(i);
-                 if (item.provider == 'youtube') {
-                    if(_config.state) {
-                        item['youtube.quality'] = 'hd720';
-                    } else {
-                        item['youtube.quality'] = 'medium';
-                    }
-                    
-                } else if(item['hd.file']) {
-                    if(_config.state) {
-                        item.file = item['hd.file'];
-                    } else {
-                        item.file = item['hd.original'];
-                    }
-                }
-            }
+                        // Swap HD state in every playlist item.
+                        for(var i:Number = 0; i<_player.playlist.length; i++) {
+                                var item:PlaylistItem = _player.playlist.getItemAt(i);
+                                if (!item['ova.hidden']) {
+                                        if (item.provider == 'youtube') {
+                                                if(_config.state) {
+                                                        item['youtube.quality'] = 'hd720';
+                                                } else {
+                                                        item['youtube.quality'] = 'medium';
+                                                }
+                                                
+                                        } else if(item['hd.file']) {
+                                                if(_config.state) {
+                                                        item.file = item['hd.file'];
+                                                } else {
+                                                        item.file = item['hd.original'];
+                                                }
+                                        }
+                                }
+                        }
             // Restart player if not IDLE.
             if(_player.state != PlayerState.IDLE) {