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

Merge branch 'master' into fix_long_getItems_request_URL

This commit is contained in:
dann-merlin 2023-03-14 22:03:44 +00:00 committed by GitHub
commit 09a6ef2cdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
85 changed files with 358 additions and 320 deletions

View file

@ -11,6 +11,7 @@ import { appHost } from '../apphost';
import Screenfull from 'screenfull';
import ServerConnections from '../ServerConnections';
import alert from '../alert';
import { PluginType } from '../../types/plugin.ts';
import { includesAny } from '../../utils/container.ts';
import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts';
@ -1693,7 +1694,7 @@ class PlaybackManager {
function changeStream(player, ticks, params) {
if (canPlayerSeek(player) && params == null) {
player.currentTime(parseInt(ticks / 10000));
player.currentTime(parseInt(ticks / 10000, 10));
return;
}
@ -1717,7 +1718,7 @@ class PlaybackManager {
const apiClient = ServerConnections.getApiClient(currentItem.ServerId);
if (ticks) {
ticks = parseInt(ticks);
ticks = parseInt(ticks, 10);
}
const maxBitrate = params.MaxStreamingBitrate || self.getMaxStreamingBitrate(player);
@ -2268,7 +2269,7 @@ class PlaybackManager {
function runInterceptors(item, playOptions) {
return new Promise(function (resolve, reject) {
const interceptors = pluginManager.ofType('preplayintercept');
const interceptors = pluginManager.ofType(PluginType.PreplayIntercept);
interceptors.sort(function (a, b) {
return (a.order || 0) - (b.order || 0);
@ -3429,12 +3430,12 @@ class PlaybackManager {
}
Events.on(pluginManager, 'registered', function (e, plugin) {
if (plugin.type === 'mediaplayer') {
if (plugin.type === PluginType.MediaPlayer) {
initMediaPlayer(plugin);
}
});
pluginManager.ofType('mediaplayer').forEach(initMediaPlayer);
pluginManager.ofType(PluginType.MediaPlayer).forEach(initMediaPlayer);
function sendProgressUpdate(player, progressEventName, reportPlaylist) {
if (!player) {
@ -3649,7 +3650,7 @@ class PlaybackManager {
percent /= 100;
ticks *= percent;
this.seek(parseInt(ticks), player);
this.seek(parseInt(ticks, 10), player);
}
seekMs(ms, player = this._currentPlayer) {
@ -4036,13 +4037,13 @@ class PlaybackManager {
this.setBrightness(cmd.Arguments.Brightness, player);
break;
case 'SetAudioStreamIndex':
this.setAudioStreamIndex(parseInt(cmd.Arguments.Index), player);
this.setAudioStreamIndex(parseInt(cmd.Arguments.Index, 10), player);
break;
case 'SetSubtitleStreamIndex':
this.setSubtitleStreamIndex(parseInt(cmd.Arguments.Index), player);
this.setSubtitleStreamIndex(parseInt(cmd.Arguments.Index, 10), player);
break;
case 'SetMaxStreamingBitrate':
this.setMaxStreamingBitrate(parseInt(cmd.Arguments.Bitrate), player);
this.setMaxStreamingBitrate(parseInt(cmd.Arguments.Bitrate, 10), player);
break;
case 'ToggleFullscreen':
this.toggleFullscreen(player);