owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Defer media session after audio context init. Seems to fix random media session issues

Browse Source
This commit is contained in:
emeric
2022-09-03 20:20:12 +02:00
parent e3f5d9c027
commit 91bc963c42
1 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docroot/js/mediaplayer.js
+37 -34
View File
@@ -42,8 +42,10 @@ LMS.mediaplayer = function () {
document.addEventListener("click", _unlock);
var _initAudioCtx = function() {
if (_audioIsInit)
if (_audioIsInit) {
_audioCtx.resume(); // not sure of this
return;
}
_audioIsInit = true;
@@ -54,6 +56,21 @@ LMS.mediaplayer = function () {
_gainNode.connect(_audioCtx.destination);
_audioCtx.resume(); // not sure of this
if ("mediaSession" in navigator) {
navigator.mediaSession.setActionHandler("play", function() {
_playPause();
});
navigator.mediaSession.setActionHandler("pause", function() {
_playPause();
});
navigator.mediaSession.setActionHandler("previoustrack", function() {
_playPrevious();
});
navigator.mediaSession.setActionHandler("nexttrack", function() {
_playNext();
});
}
if (_pendingTrackParameters != null) {
_applyAudioTrackParameters(_pendingTrackParameters, false);
_pendingTrackParameters = null;
@@ -68,10 +85,18 @@ LMS.mediaplayer = function () {
if (_elems.audio.paused) {
_elems.playpause.firstElementChild.classList.remove(pauseClass);
_elems.playpause.firstElementChild.classList.add(playClass);
if ("mediaSession" in navigator) {
navigator.mediaSession.playbackState = "paused";
console.log("paused");
}
}
else {
_elems.playpause.firstElementChild.classList.remove(playClass);
_elems.playpause.firstElementChild.classList.add(pauseClass);
if ("mediaSession" in navigator) {
navigator.mediaSession.playbackState = "playing";
console.log("playing");
}
}
}
@@ -107,16 +132,9 @@ LMS.mediaplayer = function () {
}
var _playTrack = function() {
var playPromise = _elems.audio.play();
if (playPromise !== undefined) {
playPromise.then(_ => {
// Automatic playback started
})
.catch(error => {
// Auto-play was prevented
});
}
_elems.audio.play()
.then(_ => {})
.catch(error => { console.log("Cannot play audio: " + error); });
}
var _playPause = function() {
@@ -305,20 +323,6 @@ LMS.mediaplayer = function () {
event.preventDefault();
});
if ('mediaSession' in navigator) {
navigator.mediaSession.setActionHandler("play", function() {
_playPause();
});
navigator.mediaSession.setActionHandler("pause", function() {
_playPause();
});
navigator.mediaSession.setActionHandler("previoustrack", function() {
_playPrevious();
});
navigator.mediaSession.setActionHandler("nexttrack", function() {
_playNext();
});
}
}
var _removeAudioSources = function() {
@@ -371,15 +375,6 @@ LMS.mediaplayer = function () {
_elems.curtime.innerHTML = _durationToString(_offset);
_elems.duration.innerHTML = _durationToString(_duration);
if ('mediaSession' in navigator) {
navigator.mediaSession.metadata = new MediaMetadata({
title: params.title,
artist: params.artist,
album: params.release,
artwork: params.artwork,
});
}
if (!_audioIsInit) {
_pendingTrackParameters = params;
return;
@@ -394,6 +389,14 @@ LMS.mediaplayer = function () {
var _applyAudioTrackParameters = function(params)
{
_setReplayGain(params.replayGain);
if ("mediaSession" in navigator) {
navigator.mediaSession.metadata = new MediaMetadata({
title: params.title,
artist: params.artist,
album: params.release,
artwork: params.artwork,
});
}
}
var stop = function() {