Remove broken media events code

This commit is contained in:
hensm
2018-12-06 16:56:17 +00:00
parent 6571ed547f
commit fec2e0808b

View File

@@ -37,49 +37,26 @@ function getLocalAddress () {
}); });
} }
// TODO: Fix this broken mess
let ignoreMediaEvents = false;
function silent (fn) {
ignoreMediaEvents = true;
fn();
}
mediaElement.addEventListener("play", () => { mediaElement.addEventListener("play", () => {
if (ignoreMediaEvents) {
ignoreMediaEvents = false;
return;
}
currentMedia.play(null currentMedia.play(null
, onMediaPlaySuccess , onMediaPlaySuccess
, onMediaPlayError); , onMediaPlayError);
}); });
mediaElement.addEventListener("pause", () => { mediaElement.addEventListener("pause", () => {
if (ignoreMediaEvents) {
ignoreMediaEvents = false;
return;
}
currentMedia.pause(null currentMedia.pause(null
, onMediaPauseSuccess , onMediaPauseSuccess
, onMediaPauseError); , onMediaPauseError);
}); });
mediaElement.addEventListener("suspend", () => { mediaElement.addEventListener("suspend", () => {
if (ignoreMediaEvents) return;
/*currentMedia.stop(null /*currentMedia.stop(null
, onMediaStopSuccess , onMediaStopSuccess
, onMediaStopError);*/ , onMediaStopError);*/
}); });
mediaElement.addEventListener("seeking", () => { mediaElement.addEventListener("seeking", () => {
if (ignoreMediaEvents) {
ignoreMediaEvents = false;
return;
}
const seekRequest = new chrome.cast.media.SeekRequest(); const seekRequest = new chrome.cast.media.SeekRequest();
seekRequest.currentTime = mediaElement.currentTime; seekRequest.currentTime = mediaElement.currentTime;
@@ -89,11 +66,6 @@ mediaElement.addEventListener("seeking", () => {
}); });
mediaElement.addEventListener("ratechange", () => { mediaElement.addEventListener("ratechange", () => {
if (ignoreMediaEvents) {
ignoreMediaEvents = false;
return;
}
currentMedia._sendMediaMessage({ currentMedia._sendMediaMessage({
type: "SET_PLAYBACK_RATE" type: "SET_PLAYBACK_RATE"
, playbackRate: mediaElement.playbackRate , playbackRate: mediaElement.playbackRate
@@ -101,11 +73,6 @@ mediaElement.addEventListener("ratechange", () => {
}); });
mediaElement.addEventListener("volumechange", () => { mediaElement.addEventListener("volumechange", () => {
if (ignoreMediaEvents) {
ignoreMediaEvents = false;
return;
}
const newVolume = new chrome.cast.Volume( const newVolume = new chrome.cast.Volume(
currentMedia.volume currentMedia.volume
, currentMedia.muted); , currentMedia.muted);
@@ -205,21 +172,17 @@ function onLoadMediaSuccess (media) {
if (localPlayerState !== currentMedia.playerState) { if (localPlayerState !== currentMedia.playerState) {
switch (currentMedia.playerState) { switch (currentMedia.playerState) {
case chrome.cast.media.PlayerState.PLAYING: case chrome.cast.media.PlayerState.PLAYING:
silent(() => { mediaElement.play();
mediaElement.play();
});
break; break;
case chrome.cast.media.PlayerState.PAUSED: case chrome.cast.media.PlayerState.PAUSED:
silent(() => { mediaElement.pause();
mediaElement.pause();
});
break; break;
} }
} }
// RepeatMode // RepeatMode
const localRepeatMode = mediaElement.loop const localRepeatMode = mediaElement.loop
? chrome.cast.media.RepeatMode.SINGLE ? chrome.cast.media.RepeatMode.SINGLE
: chrome.cast.media.RepeatMode.OFF; : chrome.cast.media.RepeatMode.OFF;
@@ -238,9 +201,7 @@ function onLoadMediaSuccess (media) {
// currentTime // currentTime
if (currentMedia.currentTime !== mediaElement.currentTime) { if (currentMedia.currentTime !== mediaElement.currentTime) {
silent(() => { mediaElement.currentTime = currentMedia.currentTime;
mediaElement.currentTime = currentMedia.currentTime;
});
} }
}); });
} }