f569af13 by Steve Mayhew Committed by David LaPalomento

Rename the method.

Hopefully all agree is a better name choice.  Also, maybe this will
trigger Travis CI to a better build.
1 parent ea5d246a
...@@ -472,20 +472,20 @@ videojs.Hls.prototype.fillBuffer = function(offset) { ...@@ -472,20 +472,20 @@ videojs.Hls.prototype.fillBuffer = function(offset) {
472 } 472 }
473 473
474 // resolve the segment URL relative to the playlist 474 // resolve the segment URL relative to the playlist
475 segmentUri = this.resolveSegmentUrl(segment.uri); 475 segmentUri = this.playlistUriToUrl(segment.uri);
476 476
477 this.loadSegment(segmentUri, offset); 477 this.loadSegment(segmentUri, offset);
478 }; 478 };
479 479
480 videojs.Hls.prototype.resolveSegmentUrl = function(segmentRelativeUrl) { 480 videojs.Hls.prototype.playlistUriToUrl = function(segmentRelativeUrl) {
481 var segmentUrl; 481 var playListUrl;
482 // resolve the segment URL relative to the playlist 482 // resolve the segment URL relative to the playlist
483 if (this.playlists.media().uri === this.src_) { 483 if (this.playlists.media().uri === this.src_) {
484 segmentUrl = resolveUrl(this.src_, segmentRelativeUrl); 484 playListUrl = resolveUrl(this.src_, segmentRelativeUrl);
485 } else { 485 } else {
486 segmentUrl = resolveUrl(resolveUrl(this.src_, this.playlists.media().uri || ''), segmentRelativeUrl); 486 playListUrl = resolveUrl(resolveUrl(this.src_, this.playlists.media().uri || ''), segmentRelativeUrl);
487 } 487 }
488 return segmentUrl; 488 return playListUrl;
489 }; 489 };
490 490
491 /* 491 /*
...@@ -691,7 +691,7 @@ videojs.Hls.prototype.fetchKeys = function(playlist, index) { ...@@ -691,7 +691,7 @@ videojs.Hls.prototype.fetchKeys = function(playlist, index) {
691 key = playlist.segments[i].key; 691 key = playlist.segments[i].key;
692 if (key && !key.bytes && !keyFailed(key)) { 692 if (key && !key.bytes && !keyFailed(key)) {
693 keyXhr = videojs.Hls.xhr({ 693 keyXhr = videojs.Hls.xhr({
694 url: this.resolveSegmentUrl(key.uri), 694 url: this.playlistUriToUrl(key.uri),
695 responseType: 'arraybuffer', 695 responseType: 'arraybuffer',
696 withCredentials: settings.withCredentials 696 withCredentials: settings.withCredentials
697 }, function(err, url) { 697 }, function(err, url) {
......