Changeset 1159

Timestamp:

07/15/10 01:37:24 (3 years ago)

Author:

zach

Message:

• Added hd.streamer flashvar #950
• Fixed RTMP switching issue #978
• Fixed SD revert on complete issue #970

Location:

plugins/hd/v5/trunk

Files:

• hd.swf (modified) (previous)
• hd.xml (modified) (1 diff)
• src/com/longtailvideo/plugins/hd/HD.as (modified) (9 diffs)
• testing/files/hd.xml (modified) (1 diff)

plugins/hd/v5/trunk/hd.xml

@@ -23 +23 @@
                 </flashvar>
                 <flashvar>
+                        <name>streamer</name>
+                        <default></default>
+                        <description>
+                                Location of the HD video server the player should use.
+                                The regular 'streamer' flashvar holds the location of the fallback server.
+                        </description>
+                </flashvar>
+                <flashvar>
                         <name>fullscreen</name>
                         <default>false</default>

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

@@ -1 +1 @@
 
 package com.longtailvideo.plugins.hd {
-        
+
         import com.longtailvideo.jwplayer.events.MediaEvent;
+        import com.longtailvideo.jwplayer.events.PlayerStateEvent;
         import com.longtailvideo.jwplayer.events.PlaylistEvent;
         import com.longtailvideo.jwplayer.model.IPlaylist;
@@ -60 +61 @@
                         _player.addEventListener(MediaEvent.JWPLAYER_MEDIA_TIME, timeHandler);
                         _player.addEventListener(PlaylistEvent.JWPLAYER_PLAYLIST_ITEM, itemHandler);
-                        _player.addEventListener(MediaEvent.JWPLAYER_MEDIA_COMPLETE, completeHandler);
+                        _player.addEventListener(PlayerStateEvent.JWPLAYER_PLAYER_STATE, stateHandler);
 
                         if (_player.config.dock) {
@@ -142 +143 @@
                 private function itemHandler(evt:Event=null):void {
                         if (_currentItem != _player.playlist.currentItem) {
+                                if (_currentItem != null){
+                                        resetItem();    
+                                }
                                 _currentItem = _player.playlist.currentItem;
                                 if (!_currentItem.hasOwnProperty('hd.originalfile')) {
                                         _currentItem['hd.originalfile'] = _currentItem.file;
                                         _currentItem['hd.originalstart'] = _currentItem.start;
+                                        _currentItem['hd.originalstreamer'] = _currentItem.streamer;
                                 }
                                 // Prevents multiple item events from being fired when playlist is reloaded
@@ -152 +157 @@
                                 } else {
                                         var stateFile:String = stateFile();
+                                        var stateStreamer:String = stateStreamer();
                                         if (stateFile){
                                                 _player.playlist.currentItem['file'] = stateFile;
+                                        }
+                                        if (stateStreamer){
+                                                _player.playlist.currentItem['streamer'] = stateStreamer;
                                         }
                                 }
@@ -164 +173 @@
                         if (swapFile) {
                                 if (_currentItem.file != swapFile) {
-                                        swap(swapFile);
+                                        var swapStreamer:String = stateStreamer();
+                                        if (swapStreamer) {
+                                                swap(swapFile, swapStreamer);
+                                        } else {
+                                                swap(swapFile); 
+                                        }
                                 }
                         }
                         setUI();
                 }
-                
-                private function completeHandler(evt:MediaEvent):void {
+
+                private function stateHandler(evt:PlayerStateEvent):void {
+                        if (evt.newstate == PlayerState.IDLE){
+                                if (_currentItem['hd.originalfile']) {
+                                        _currentItem.start = _currentItem['hd.originalstart'];
+                                }
+                        }
+                }
+                
+                private function resetItem():void{
                         if (_currentItem['hd.originalfile']) {
                                 _currentItem.file = _currentItem['hd.originalfile'];
                                 _currentItem.start = _currentItem['hd.originalstart'];
+                                _currentItem.streamer = _currentItem['hd.originalstreamer'];
                         }       
                 }
@@ -179 +202 @@
 
                 /** Switch the currently playing file with a new one. **/
-                private function swap(newFile:String):void {
+                private function swap(newFile:String, newStreamer:String = null):void {
                         _swapped = true;
                         var newList:Array = playlistToArray(_player.playlist);
@@ -186 +209 @@
                                 newItem['hd.originalfile'] = newItem.file;      
                                 newItem['hd.originalstart'] = newItem.start;    
+                                newItem['hd.originalstreamer'] = newItem.streamer;
                         }
                         newItem.file = newFile;
                         newItem.start = _position;
+                        newItem.streamer = newStreamer;
                         
                         // Load a new playlist instead of changing the item's file property.
@@ -215 +240 @@
                                 } else if (_currentItem.hasOwnProperty('hd.file') || config.hasOwnProperty('file')) {
                                         return _currentItem.file;
+                                } else {
+                                        return '';
+                                }
+                        }
+                }
+                
+                /** Which streamer to use, based on the current streamer **/
+                private function stateStreamer():String {
+                        if (config.state) {
+                                if (_currentItem.hasOwnProperty('hd.streamer')) {
+                                        return _currentItem['hd.streamer'];
+                                } else if (config.hasOwnProperty('streamer')) {
+                                        return config['streamer'];
+                                } else if (_currentItem.hasOwnProperty('streamer') != '') {
+                                        return _currentItem.streamer;
+                                } else {
+                                        return '';
+                                }
+                        } else {
+                                if (_currentItem.hasOwnProperty('hd.originalstreamer')) {
+                                        return _currentItem['hd.originalstreamer'];
+                                } else if (_currentItem.hasOwnProperty('hd.streamer') || config.hasOwnProperty('streamer')) {
+                                        return _currentItem.streamer;
                                 } else {
                                         return '';
@@ -243 +291 @@
                         newItem.provider = source.provider;
                         newItem.start = source.start;
+                        newItem.streamer = source.streamer;
                         newItem.tags = source.tags;
                         newItem.title = source.title;
+                        newItem.type = source.type;
                         return newItem;
                 }

plugins/hd/v5/trunk/testing/files/hd.xml

@@ -97 +97 @@
                         <jwplayer:autostart>true</jwplayer:autostart>
                 </item>
+                
+                <item>
+                        <title>RTMP Streaming HD File w/ HD.streamer</title>
+                        <jwplayer:type>RTMP</jwplayer:type>
+                        <jwplayer:streamer>rtmp://fms.12E5.edgecastcdn.net/0012E5</jwplayer:streamer>
+                        <media:content url="videos/8Juv1MVa-483.mp4" />
+                        <jwplayer:hd.file>videos/8Juv1MVa-67727.mp4</jwplayer:hd.file>
+                        <jwplayer:hd.streamer>rtmp://fms.12E5.edgecastcdn.net/0012E6</jwplayer:hd.streamer>
+                </item>
+
+                <item>
+                        <title>RTMP Streaming HD File, HD Enabled w/ HD.streamer</title>
+                        <jwplayer:type>RTMP</jwplayer:type>
+                        <jwplayer:streamer>rtmp://fms.12E5.edgecastcdn.net/0012E5</jwplayer:streamer>
+                        <media:content url="videos/8Juv1MVa-483.mp4" />
+                        <jwplayer:hd.file>videos/8Juv1MVa-67727.mp4</jwplayer:hd.file>
+                        <jwplayer:hd.state>true</jwplayer:hd.state>
+                        <jwplayer:hd.streamer>rtmp://fms.12E5.edgecastcdn.net/0012E6</jwplayer:hd.streamer>
+                </item>
+
+                <item>
+                        <title>RTMP Streaming HD File, HD Enabled, Autostart enabled w/ HD.streamer</title>
+                        <jwplayer:type>RTMP</jwplayer:type>
+                        <jwplayer:streamer>rtmp://fms.12E5.edgecastcdn.net/0012E5</jwplayer:streamer>
+                        <media:content url="videos/8Juv1MVa-483.mp4" />
+                        <jwplayer:hd.file>videos/8Juv1MVa-67727.mp4</jwplayer:hd.file>
+                        <jwplayer:hd.state>true</jwplayer:hd.state>
+                        <jwplayer:autostart>true</jwplayer:autostart>
+                        <jwplayer:hd.streamer>rtmp://fms.12E5.edgecastcdn.net/0012E6</jwplayer:hd.streamer>
+                </item>
         </channel>
 </rss>