Changeset 1252 for trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as

Timestamp:

08/30/10 19:06:53 (3 years ago)

Author:

pablo

Message:

• Queues calls to seek() if called before the MediaProvidre is ready to seek (749)
• Fixes an issue related to 606, where changing the stretching mode while in fullscreen could break the layout.

File:

• trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as (modified) (5 diffs)

trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as

@@ -84 +84 @@
                 /** Whether the playlist has been loaded yet **/
                 protected var _playlistReady:Boolean = false;
-                
+                /** Set this value if a seek request comes in before the seek is possible **/           
+                protected var _queuedSeek:Number = -1;
                 
                 /** A list with legacy CDN classes that are now redirected to buit-in ones. **/
@@ -373 +374 @@
                                                 break;
                                         case PlayerState.PAUSED:
-                                                _model.media.play();
+                                                if (_queuedSeek >= 0) {
+                                                        _model.media.seek(_queuedSeek);
+                                                        _queuedSeek = -1;
+                                                } else {
+                                                        _model.media.play();
+                                                }
                                                 break;
                                 }
@@ -478 +484 @@
                 }
 
-
                 public function seek(pos:Number):Boolean {
                         if (locking) {
                                 return false;
                         }
-                        if (!_model.media)
-                                return false;
+                        if (!_model.media) {
+                                _queuedSeek = pos;
+                                return false;
+                        }
 
                         switch (_model.media.state) {
                                 case PlayerState.PLAYING:
-                                case PlayerState.BUFFERING:
                                 case PlayerState.PAUSED:
                                         _model.media.seek(pos);
                                         return true;
+                                        break;
+                                case PlayerState.BUFFERING:
+                                case PlayerState.IDLE:
+                                        _queuedSeek = pos;
                                         break;
                         }
@@ -630 +640 @@
                 private function bufferFullHandler(evt:MediaEvent):void {
                         if (!locking) {
-                                _model.media.play();
+                                if (_queuedSeek >= 0) {
+                                        _model.media.seek(_queuedSeek);
+                                        _queuedSeek = -1;
+                                } else {
+                                        _model.media.play();
+                                }
                         } else {
                                 _lockingResume = true;
@@ -647 +662 @@
 
                 public function fullscreen(mode:Boolean):Boolean {
+                        _view.fullscreen(mode);
                         _model.fullscreen = mode;
-                        _view.fullscreen(mode);
                         dispatchEvent(new PlayerEvent(PlayerEvent.JWPLAYER_FULLSCREEN, mode.toString()));
                         return true;