Skip to content

Commit

Permalink
Fix Src= Build Issue after Bad Merge
Browse files Browse the repository at this point in the history
Two changes around src= went in around the same time and they merged
poorly, resulting in a broken build. This change corrects that.

Issue #816
Issue #997

Change-Id: I1c84e56c06de0b80c11933144b453907f3e75786
  • Loading branch information
vaage committed Apr 2, 2019
1 parent 58020e2 commit 6923b07
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions lib/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ shaka.Player.prototype.destroy = async function() {
// from interrupting our final move to the detached state.
this.loadMode_ = shaka.Player.LoadMode.DESTROYED;

// Because we have set |isAlive_| to false, we can't call |detach|, so we
// must talk to the walker directly.
// Because we have set |loadMode_| to |DESTROYED| we can't call |detach|. We
// must talk to |this.walker_| directly.
const events = this.walker_.startNewRoute((currentPayload) => {
return {
node: this.detachNode_,
Expand Down Expand Up @@ -728,10 +728,6 @@ shaka.Player.probeSupport = function() {
*/
shaka.Player.prototype.attach = function(mediaElement,
initializeMediaSource = true) {
goog.asserts.assert(
this.isAlive_,
'We should not be calling attach after destroy');

// Do not allow the player to be used after |destroy| is called.
if (this.loadMode_ == shaka.Player.LoadMode.DESTROYED) {
return Promise.reject(this.createAbortLoadError_());
Expand Down Expand Up @@ -781,10 +777,6 @@ shaka.Player.prototype.attach = function(mediaElement,
* @export
*/
shaka.Player.prototype.detach = function() {
goog.asserts.assert(
this.isAlive_,
'We should not be calling detach after destroy');

// Do not allow the player to be used after |destroy| is called.
if (this.loadMode_ == shaka.Player.LoadMode.DESTROYED) {
return Promise.reject(this.createAbortLoadError_());
Expand Down Expand Up @@ -821,10 +813,6 @@ shaka.Player.prototype.detach = function() {
* @export
*/
shaka.Player.prototype.unload = function(initializeMediaSource = true) {
goog.asserts.assert(
this.isAlive_,
'We should not be calling unload after destroy');

// Do not allow the player to be used after |destroy| is called.
if (this.loadMode_ == shaka.Player.LoadMode.DESTROYED) {
return Promise.reject(this.createAbortLoadError_());
Expand Down Expand Up @@ -903,10 +891,6 @@ shaka.Player.prototype.unload = function(initializeMediaSource = true) {
* @export
*/
shaka.Player.prototype.load = function(assetUri, startTime, mimeType) {
goog.asserts.assert(
this.isAlive_,
'We should not be calling load after destroy');

// Do not allow the player to be used after |destroy| is called.
if (this.loadMode_ == shaka.Player.LoadMode.DESTROYED) {
return Promise.reject(this.createAbortLoadError_());
Expand Down

0 comments on commit 6923b07

Please sign in to comment.