milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More MediaSession cleanup

Browse source
This commit is contained in:
MrTimscampi 2020-04-15 08:14:08 +02:00
parent 3dd141915e
commit 9bcb270942
1 changed files with 18 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/components/playback/mediasession.js
View file

@ -9,36 +9,20 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
// Reports media playback to the device for lock screen control // Reports media playback to the device for lock screen control
var currentPlayer; var currentPlayer;
var lastUpdateTime = 0;
function seriesImageUrl(item, options = {}) {
function seriesImageUrl(item, options = {}, type = options.type || 'Primary') {
if (item.Type !== 'Episode') { if (item.Type !== 'Episode') {
return null; return null;
} } else if (type === 'Primary' && item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag;
options.type = options.type || "Primary";
if (options.type === 'Primary') {
if (item.SeriesPrimaryImageTag) {
options.tag = item.SeriesPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
}
}
if (options.type === 'Thumb') {
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} else if (type === 'Thumb') {
if (item.SeriesThumbImageTag) { if (item.SeriesThumbImageTag) {
options.tag = item.SeriesThumbImageTag; options.tag = item.SeriesThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options); return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.SeriesId, options);
} } else if (item.ParentThumbImageTag) {
if (item.ParentThumbImageTag) {
options.tag = item.ParentThumbImageTag; options.tag = item.ParentThumbImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options); return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.ParentThumbItemId, options);
@ -48,18 +32,14 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
return null; return null;
} }
function imageUrl(item, options = {}) { function imageUrl(item, options = {}, type = options.type || 'Primary') {
options.type = options.type || "Primary"; if (item.ImageTags && item.ImageTags[type]) {
options.tag = item.ImageTags[type];
if (item.ImageTags && item.ImageTags[options.type]) {
options.tag = item.ImageTags[options.type];
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options); return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.Id, options);
} } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
if (item.AlbumId && item.AlbumPrimaryImageTag) {
options.tag = item.AlbumPrimaryImageTag; options.tag = item.AlbumPrimaryImageTag;
return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options); return connectionManager.getApiClient(item.ServerId).getScaledImageUrl(item.AlbumId, options);
} }
@ -79,9 +59,8 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
} }
} }
function getImageUrls(item) { function getImageUrls(item, imageSizes = [96, 128, 192, 256, 384, 512]) {
var list = []; var list = [];
const imageSizes = [96, 128, 192, 256, 384, 512];
imageSizes.forEach((size) => { imageSizes.forEach((size) => {
list.push(pushImageUrl(item, {height: size})); list.push(pushImageUrl(item, {height: size}));
@ -166,37 +145,25 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
} }
function onGeneralEvent(e) { function onGeneralEvent(e) {
var state = playbackManager.getPlayerState(this);
var player = this; updatePlayerState(this, state, e.type);
var state = playbackManager.getPlayerState(player);
updatePlayerState(player, state, e.type);
} }
function onStateChanged(e, state) { function onStateChanged(e, state) {
updatePlayerState(this, state, 'statechange');
var player = this;
updatePlayerState(player, state, 'statechange');
} }
function onPlaybackStart(e, state) { function onPlaybackStart(e, state) {
updatePlayerState(this, state, e.type);
var player = this;
updatePlayerState(player, state, e.type);
} }
function onPlaybackStopped(e, state) { function onPlaybackStopped() {
var player = this;
hideMediaControls(); hideMediaControls();
} }
function releaseCurrentPlayer() { function releaseCurrentPlayer() {
if (currentPlayer) { if (currentPlayer) {
events.off(currentPlayer, 'playbackstart', onPlaybackStart); events.off(currentPlayer, 'playbackstart', onPlaybackStart);
events.off(currentPlayer, 'playbackstop', onPlaybackStopped); events.off(currentPlayer, 'playbackstop', onPlaybackStopped);
events.off(currentPlayer, 'unpause', onGeneralEvent); events.off(currentPlayer, 'unpause', onGeneralEvent);
@ -211,8 +178,6 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
} }
function hideMediaControls() { function hideMediaControls() {
lastUpdateTime = 0;
if (navigator.mediaSession) { if (navigator.mediaSession) {
navigator.mediaSession.metadata = null; navigator.mediaSession.metadata = null;
} else { } else {
@ -221,7 +186,6 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
} }
function bindToPlayer(player) { function bindToPlayer(player) {
releaseCurrentPlayer(); releaseCurrentPlayer();
if (!player) { if (!player) {
@ -244,8 +208,8 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
function execute(name) { function execute(name) {
playbackManager[name](currentPlayer); playbackManager[name](currentPlayer);
} }
if (navigator.mediaSession) {
if (navigator.mediaSession) {
navigator.mediaSession.setActionHandler('previoustrack', function () { navigator.mediaSession.setActionHandler('previoustrack', function () {
execute('previousTrack'); execute('previousTrack');
}); });
@ -272,7 +236,6 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
} }
events.on(playbackManager, 'playerchange', function () { events.on(playbackManager, 'playerchange', function () {
bindToPlayer(playbackManager.getCurrentPlayer()); bindToPlayer(playbackManager.getCurrentPlayer());
}); });