Skip to content
This repository has been archived by the owner on Jun 29, 2018. It is now read-only.

[#983781] Ensure we don't change audio after loading until we need to an... #393

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[#983781] Ensure we don't change audio after loading until we need to an... #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions wrappers/youtube/popcorn.HTMLYouTubeVideoElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@
self.dispatchEvent( "error" );
}

function unMuteAfterReady() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you move this up into line 200 where it's being used?

removeYouTubeEvent( "play", unMuteAfterReady );
if( !impl.muted ) {
player.unMute();
}
}

function onReady() {

addYouTubeEvent( "play", onPlay );
Expand All @@ -190,9 +197,7 @@
}

// Ensure video will now be unmuted when playing due to the mute on initial load.
if( !impl.muted ) {
player.unMute();
}
addYouTubeEvent( "play", unMuteAfterReady );

impl.readyState = self.HAVE_METADATA;
self.dispatchEvent( "loadedmetadata" );
Expand Down Expand Up @@ -576,7 +581,12 @@
impl.muted = aValue;
if( !mediaReady ) {
addMediaReadyCallback( function() {
setMuted( impl.muted );
impl.muted = aValue;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't you already set the impl.muted value on line 581? Why do it again?

self.dispatchEvent( "volumechange" );
});
addYouTubeEvent( "play", function volumeWhenReady() {
removeYouTubeEvent( "play", volumeWhenReady );
player[ aValue ? "mute" : "unMute" ]();
});
return;
}
Expand Down Expand Up @@ -688,7 +698,12 @@
impl.volume = aValue;
if( !mediaReady ) {
addMediaReadyCallback( function() {
self.volume = aValue;
impl.volume = aValue;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't you already set the impl.volume value on line 581? Why do it again?

self.dispatchEvent( "volumechange" );
});
addYouTubeEvent( "play", function volumeWhenReady() {
removeYouTubeEvent( "play", volumeWhenReady );
player.setVolume( impl.volume * 100 );
});
return;
}
Expand Down