Merge pull request #90 from bclwhitaker/bugfix/bufferPlaying

Fire playing on buffer full only when we are not pending a pause.
videojs · May 23, 2014 · 8a98910 · 8a98910
2 parents 31d78a8 + 86c8b93
commit 8a98910
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/com/videojs/providers/HTTPVideoProvider.as b/src/com/videojs/providers/HTTPVideoProvider.as
@@ -281,7 +281,9 @@ package com.videojs.providers{
                 _ns.resume();
                 _isPaused = false;
                 _model.broadcastEventExternally(ExternalEventName.ON_RESUME);
-                _model.broadcastEventExternally(ExternalEventName.ON_START);
+                if (!_isBuffering) {
+                    _model.broadcastEventExternally(ExternalEventName.ON_START);
+                }
                 _model.broadcastEvent(new VideoPlaybackEvent(VideoPlaybackEvent.ON_STREAM_START, {}));
             }
         }
@@ -306,7 +308,9 @@ package com.videojs.providers{
                 _ns.resume();
                 _isPaused = false;
                 _model.broadcastEventExternally(ExternalEventName.ON_RESUME);
-                _model.broadcastEventExternally(ExternalEventName.ON_START);
+                if (!_isBuffering) {
+                    _model.broadcastEventExternally(ExternalEventName.ON_START);
+                }
             }
         }
 
@@ -520,17 +524,18 @@ package com.videojs.providers{
                     break;
 
                 case "NetStream.Buffer.Full":
-                    _pausedSeekValue = -1;
-                    _isBuffering = false;
-                    _isPlaying = true;
                     _model.broadcastEventExternally(ExternalEventName.ON_BUFFER_FULL);
                     _model.broadcastEventExternally(ExternalEventName.ON_CAN_PLAY);
-                    _model.broadcastEventExternally(ExternalEventName.ON_START);
+                    _pausedSeekValue = -1;
+                    _isPlaying = true;
                     if(_pausePending){
                         _pausePending = false;
                         _ns.pause();
                         _isPaused = true;
+                    } else if (_isBuffering) {
+                        _model.broadcastEventExternally(ExternalEventName.ON_START);
                     }
+                    _isBuffering = false;
                     break;
 
                 case "NetStream.Buffer.Empty":