Changeset 413

Timestamp:

10/08/09 10:06:10 (4 years ago)

Author:

pablo

Message:

PlayerEvent.STATE -> PlayerStateEvent.PLAYER_STATE

Location:

trunk/fl5/src/com/longtailvideo/jwplayer

Files:

• events/PlayerEvent.as (modified) (1 diff)
• events/PlayerStateEvent.as (modified) (1 diff)
• view/components/ControlbarComponentV4.as (modified) (5 diffs)
• view/components/DisplayComponent.as (modified) (3 diffs)

trunk/fl5/src/com/longtailvideo/jwplayer/events/PlayerEvent.as

@@ -50 +50 @@
                 public static var JWPLAYER_ERROR:String = "jwplayerError";
                 
-                /**
-                 * The PlayerEvent.JWPLAYER_ERROR constant defines the value of the
-                 * <code>type</code> property of the event object
-                 * for a <code>jwplayerError</code> event.
-                 *
-             * <table class="innertable">
-         *              <tr><th>Property</th><th>Value</th></tr>
-             *          <tr><td><code>id</code></td><td>ID of the player in the HTML DOM. Used by javascript to reference the player.</td></tr>
-             *          <tr><td><code>client</code></td><td>A string representing the client the player runs in (e.g. FLASH WIN 9,0,115,0).</td></tr>
-             *          <tr><td><code>version</code></td><td>A string representing the major version, minor version and revision number of the player (e.g. 5.0.395).</td></tr>
-             *          <tr><td><code>message</code></td><td>Message explaining the cause of the error</td></tr>
-             * </table>
-             * 
-                 * @see com.longtailvideo.jwplayer.player.Player
-                 * @eventType jwplayerState
-                 */
-                public static var JWPLAYER_STATE:String = "jwplayerState";
-
                 public var id:String;
                 public var client:String;

trunk/fl5/src/com/longtailvideo/jwplayer/events/PlayerStateEvent.as

@@ -3 +3 @@
 
         public class PlayerStateEvent extends PlayerEvent {
+
+                /**
+                 * The PlayerEvent.JWPLAYER_PLAYER_STATE constant defines the value of the
+                 * <code>type</code> property of the event object
+                 * for a <code>jwplayerPlayerState</code> event.
+                 *
+             * <table class="innertable">
+         *              <tr><th>Property</th><th>Value</th></tr>
+             *          <tr><td><code>id</code></td><td>ID of the player in the HTML DOM. Used by javascript to reference the player.</td></tr>
+             *          <tr><td><code>client</code></td><td>A string representing the client the player runs in (e.g. FLASH WIN 9,0,115,0).</td></tr>
+             *          <tr><td><code>version</code></td><td>A string representing the major version, minor version and revision number of the player (e.g. 5.0.395).</td></tr>
+             *          <tr><td><code>newstate</code></td><td>The new state of the player</td></tr>
+             *          <tr><td><code>oldstate</code></td><td>The previous state of the player</td></tr>
+             * </table>
+             * 
+                 * @see com.longtailvideo.jwplayer.player.PlayerState
+                 * @eventType jwplayerPlayerState
+                 */
                 public static var JWPLAYER_PLAYER_STATE:String = "jwplayerPlayerState";
+
                 
                 public var newstate:String = "";

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/ControlbarComponentV4.as

@@ -2 +2 @@
         import com.longtailvideo.jwplayer.events.MediaEvent;
         import com.longtailvideo.jwplayer.events.PlayerEvent;
+        import com.longtailvideo.jwplayer.events.PlayerStateEvent;
         import com.longtailvideo.jwplayer.events.PlaylistEvent;
         import com.longtailvideo.jwplayer.events.ViewEvent;
@@ -9 +10 @@
         import com.longtailvideo.jwplayer.utils.Stacker;
         import com.longtailvideo.jwplayer.utils.Strings;
-        import com.longtailvideo.jwplayer.view.components.CoreComponent;
         import com.longtailvideo.jwplayer.view.interfaces.IControlbarComponent;
         
@@ -25 +25 @@
         
         import mx.effects.Fade;
-        import com.longtailvideo.jwplayer.view.interfaces.IControlbarComponent;
         
         
@@ -74 +73 @@
                         skin.y = 0;
                         addChild(skin);
-                        player.addEventListener(PlayerEvent.JWPLAYER_STATE, stateHandler);
+                        player.addEventListener(PlayerStateEvent.JWPLAYER_PLAYER_STATE, stateHandler);
                         player.addEventListener(MediaEvent.JWPLAYER_MEDIA_TIME, timeHandler);
                         player.addEventListener(MediaEvent.JWPLAYER_MEDIA_MUTE, muteHandler);
@@ -404 +403 @@
                         } catch (err:Error) {
                         }
-                        switch (player.config.state) {
+                        switch (player.state) {
                                 case PlayerState.PLAYING:
                                 case PlayerState.BUFFERING:

trunk/fl5/src/com/longtailvideo/jwplayer/view/components/DisplayComponent.as

@@ -2 +2 @@
         import com.longtailvideo.jwplayer.events.MediaEvent;
         import com.longtailvideo.jwplayer.events.PlayerEvent;
+        import com.longtailvideo.jwplayer.events.PlayerStateEvent;
         import com.longtailvideo.jwplayer.events.ViewEvent;
         import com.longtailvideo.jwplayer.player.Player;
         import com.longtailvideo.jwplayer.player.PlayerState;
-        import com.longtailvideo.jwplayer.view.components.CoreComponent;
         import com.longtailvideo.jwplayer.view.interfaces.IDisplayComponent;
         
@@ -30 +30 @@
                 private function addListeners():void {
                         player.addEventListener(MediaEvent.JWPLAYER_MEDIA_MUTE, muteHandler);
-                        player.addEventListener(PlayerEvent.JWPLAYER_STATE, stateHandler);
+                        player.addEventListener(PlayerStateEvent.JWPLAYER_PLAYER_STATE, stateHandler);
                         player.addEventListener(PlayerEvent.JWPLAYER_ERROR, errorHandler);
                         addEventListener(MouseEvent.CLICK, clickHandler);
@@ -94 +94 @@
                 }
                 
-                protected function stateHandler(event:PlayerEvent):void {
-                        switch (event.type) {
+                protected function stateHandler(event:PlayerStateEvent):void {
+                        switch (event.newstate) {
                                 case PlayerState.BUFFERING:
                                         setDisplay(getSkinElement('display', 'bufferIcon'));