Load the playlist into the mainSegmentLoader_ on a `mediachange` event from the …

…PlaylistLoader (#724)

The PlaylistLoader signals that the active playlist has changed by triggering a mediachange event and the segmentloader needs to know about the new playlist or it will continue to select segments from the old playlist

@@ -118,6 +118,10 @@ export default class MasterPlaylistController extends videojs.EventTarget {
         return;
         return;
       }
       }
 
 
+      // TODO: Create a new event on the PlaylistLoader that signals
+      // that the segments have changed in some way and use that to
+      // update the SegmentLoader instead of doing it twice here and
+      // on `mediachange`
       this.mainSegmentLoader_.playlist(updatedPlaylist);
       this.mainSegmentLoader_.playlist(updatedPlaylist);
       this.mainSegmentLoader_.expired(this.masterPlaylistLoader_.expired_);
       this.mainSegmentLoader_.expired(this.masterPlaylistLoader_.expired_);
       this.updateDuration();
       this.updateDuration();
@@ -138,8 +142,18 @@ export default class MasterPlaylistController extends videojs.EventTarget {
     });
     });
 
 
     this.masterPlaylistLoader_.on('mediachange', () => {
     this.masterPlaylistLoader_.on('mediachange', () => {
+      let media = this.masterPlaylistLoader_.media();
+
       this.mainSegmentLoader_.abort();
       this.mainSegmentLoader_.abort();
+
+      // TODO: Create a new event on the PlaylistLoader that signals
+      // that the segments have changed in some way and use that to
+      // update the SegmentLoader instead of doing it twice here and
+      // on `loadedplaylist`
+      this.mainSegmentLoader_.playlist(media);
+      this.mainSegmentLoader_.expired(this.masterPlaylistLoader_.expired_);
       this.mainSegmentLoader_.load();
       this.mainSegmentLoader_.load();
+
       this.tech_.trigger({
       this.tech_.trigger({
         type: 'mediachange',
         type: 'mediachange',
         bubbles: true
         bubbles: true

@@ -409,7 +409,7 @@ QUnit.test('updates the combined segment loader on media changes', function() {
   this.masterPlaylistController.mediaSource.sourceBuffers[0].trigger('updateend');
   this.masterPlaylistController.mediaSource.sourceBuffers[0].trigger('updateend');
   // media
   // media
   standardXHRResponse(this.requests.shift());
   standardXHRResponse(this.requests.shift());
-  QUnit.equal(updates.length, 1, 'updated the segment list');
+  QUnit.ok(updates.length > 0, 'updated the segment list');
 
 
   // verify stats
   // verify stats
   QUnit.equal(this.player.tech_.hls.stats.bandwidth, Infinity, 'Live stream');
   QUnit.equal(this.player.tech_.hls.stats.bandwidth, Infinity, 'Live stream');