mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Apply Suggestions

Browse source
This commit is contained in:
Cameron 2020-08-01 21:03:27 +01:00
parent 7ffb7ab0fc
commit 91cd1a75d7
2 changed files with 25 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/components/playback/playbackmanager.js
View file

@ -3147,8 +3147,7 @@ class PlaybackManager {
} }
}; };
self.playbackStartTime = function (player) { self.playbackStartTime = function (player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) { if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) {
return player.playbackStartTime(); return player.playbackStartTime();
} }
@ -3169,8 +3168,7 @@ class PlaybackManager {
return this._currentPlayer; return this._currentPlayer;
} }
currentTime(player) { currentTime(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) { if (player && !enableLocalPlaylistManagement(player) && !player.isLocalPlayer) {
return player.currentTime(); return player.currentTime();
} }
@ -3178,9 +3176,7 @@ class PlaybackManager {
return this.getCurrentTicks(player); return this.getCurrentTicks(player);
} }
nextItem(player) { nextItem(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
return player.nextItem(); return player.nextItem();
} }
@ -3210,9 +3206,7 @@ class PlaybackManager {
return false; return false;
} }
isMuted(player) { isMuted(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
return player.isMuted(); return player.isMuted();
} }
@ -3220,16 +3214,13 @@ class PlaybackManager {
return false; return false;
} }
setMute(mute, player) { setMute(mute, player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
player.setMute(mute); player.setMute(mute);
} }
} }
toggleMute(mute, player) { toggleMute(mute, player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
if (player.toggleMute) { if (player.toggleMute) {
player.toggleMute(); player.toggleMute();
@ -3253,8 +3244,7 @@ class PlaybackManager {
return (appSettings.get('displaymirror') || '') !== '0'; return (appSettings.get('displaymirror') || '') !== '0';
} }
nextChapter(player) { nextChapter(player = this._currentPlayer) {
player = player || this._currentPlayer;
const item = this.currentItem(player); const item = this.currentItem(player);
const ticks = this.getCurrentTicks(player); const ticks = this.getCurrentTicks(player);
@ -3270,8 +3260,7 @@ class PlaybackManager {
} }
} }
previousChapter(player) { previousChapter(player = this._currentPlayer) {
player = player || this._currentPlayer;
const item = this.currentItem(player); const item = this.currentItem(player);
let ticks = this.getCurrentTicks(player); let ticks = this.getCurrentTicks(player);
@ -3295,9 +3284,7 @@ class PlaybackManager {
} }
} }
fastForward(player) { fastForward(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player.fastForward != null) { if (player.fastForward != null) {
player.fastForward(userSettings.skipForwardLength()); player.fastForward(userSettings.skipForwardLength());
return; return;
@ -3309,9 +3296,7 @@ class PlaybackManager {
this.seekRelative(offsetTicks, player); this.seekRelative(offsetTicks, player);
} }
rewind(player) { rewind(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player.rewind != null) { if (player.rewind != null) {
player.rewind(userSettings.skipBackLength()); player.rewind(userSettings.skipBackLength());
return; return;
@ -3323,9 +3308,7 @@ class PlaybackManager {
this.seekRelative(offsetTicks, player); this.seekRelative(offsetTicks, player);
} }
seekPercent(percent, player) { seekPercent(percent, player = this._currentPlayer) {
player = player || this._currentPlayer;
let ticks = this.duration(player) || 0; let ticks = this.duration(player) || 0;
percent /= 100; percent /= 100;
@ -3333,9 +3316,7 @@ class PlaybackManager {
this.seek(parseInt(ticks), player); this.seek(parseInt(ticks), player);
} }
seekMs(ms, player) { seekMs(ms, player = this._currentPlayer) {
player = player || this._currentPlayer;
const ticks = ms * 10000; const ticks = ms * 10000;
this.seek(ticks, player); this.seek(ticks, player);
} }
@ -3384,9 +3365,8 @@ class PlaybackManager {
return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl; return !textStream.IsExternalUrl ? apiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
} }
stop(player) { stop(player ) {
player = player || this._currentPlayer; player = player || this._currentPlayer;
if (player) { if (player) {
if (enableLocalPlaylistManagement(player)) { if (enableLocalPlaylistManagement(player)) {
this._playNextAfterEnded = false; this._playNextAfterEnded = false;
@ -3399,9 +3379,7 @@ class PlaybackManager {
return Promise.resolve(); return Promise.resolve();
} }
getBufferedRanges(player) { getBufferedRanges(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
if (player.getBufferedRanges) { if (player.getBufferedRanges) {
return player.getBufferedRanges(); return player.getBufferedRanges();
@ -3411,9 +3389,7 @@ class PlaybackManager {
return []; return [];
} }
playPause(player) { playPause(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
if (player.playPause) { if (player.playPause) {
return player.playPause(); return player.playPause();
@ -3427,25 +3403,19 @@ class PlaybackManager {
} }
} }
paused(player) { paused(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
return player.paused(); return player.paused();
} }
} }
pause(player) { pause(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
player.pause(); player.pause();
} }
} }
unpause(player) { unpause(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player) { if (player) {
player.unpause(); player.unpause();
} }
@ -3465,8 +3435,7 @@ class PlaybackManager {
return null; return null;
} }
instantMix(item, player) { instantMix(item, player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player && player.instantMix) { if (player && player.instantMix) {
return player.instantMix(item); return player.instantMix(item);
} }
@ -3486,8 +3455,7 @@ class PlaybackManager {
}); });
} }
shuffle(shuffleItem, player) { shuffle(shuffleItem, player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player && player.shuffle) { if (player && player.shuffle) {
return player.shuffle(shuffleItem); return player.shuffle(shuffleItem);
} }
@ -3495,8 +3463,7 @@ class PlaybackManager {
return this.play({ items: [shuffleItem], shuffle: true }); return this.play({ items: [shuffleItem], shuffle: true });
} }
audioTracks(player) { audioTracks(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player.audioTracks) { if (player.audioTracks) {
const result = player.audioTracks(); const result = player.audioTracks();
if (result) { if (result) {
@ -3512,8 +3479,7 @@ class PlaybackManager {
}); });
} }
subtitleTracks(player) { subtitleTracks(player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player.subtitleTracks) { if (player.subtitleTracks) {
const result = player.subtitleTracks(); const result = player.subtitleTracks();
if (result) { if (result) {
@ -3661,8 +3627,7 @@ class PlaybackManager {
}); });
} }
displayContent(options, player) { displayContent(options, player = this._currentPlayer) {
player = player || this._currentPlayer;
if (player && player.displayContent) { if (player && player.displayContent) {
player.displayContent(options); player.displayContent(options);
} }

2
src/libraries/screensavermanager.js
View file

@ -1,6 +1,8 @@
define(["events", "playbackManager", "pluginManager", "inputManager", "connectionManager", "userSettings"], function (events, playbackManager, pluginManager, inputManager, connectionManager, userSettings) { define(["events", "playbackManager", "pluginManager", "inputManager", "connectionManager", "userSettings"], function (events, playbackManager, pluginManager, inputManager, connectionManager, userSettings) {
"use strict"; "use strict";
playbackManager = playbackManager.default || playbackManager;
function getMinIdleTime() { function getMinIdleTime() {
// Returns the minimum amount of idle time required before the screen saver can be displayed // Returns the minimum amount of idle time required before the screen saver can be displayed
//time units used Millisecond //time units used Millisecond