mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Kill shaka and fix livetvschedule
This commit is contained in:
parent
a09a9e9a3a
commit
29759ac884
7 changed files with 3 additions and 37 deletions
|
@ -78,12 +78,6 @@ _define('webcomponents', function() {
|
|||
return webcomponents;
|
||||
});
|
||||
|
||||
// shaka
|
||||
var shaka = require('shaka-player');
|
||||
_define('shaka', function() {
|
||||
return shaka;
|
||||
});
|
||||
|
||||
// libass-wasm
|
||||
var libassWasm = require('libass-wasm');
|
||||
_define('JavascriptSubtitlesOctopus', function() {
|
||||
|
|
|
@ -246,19 +246,6 @@ import events from 'events';
|
|||
}
|
||||
}
|
||||
|
||||
export function destroyShakaPlayer(instance) {
|
||||
var player = instance._shakaPlayer;
|
||||
if (player) {
|
||||
try {
|
||||
player.destroy();
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
}
|
||||
|
||||
instance._shakaPlayer = null;
|
||||
}
|
||||
}
|
||||
|
||||
export function destroyHlsPlayer(instance) {
|
||||
var player = instance._hlsPlayer;
|
||||
if (player) {
|
||||
|
@ -389,7 +376,6 @@ import events from 'events';
|
|||
|
||||
destroyHlsPlayer(instance);
|
||||
destroyFlvPlayer(instance);
|
||||
destroyShakaPlayer(instance);
|
||||
destroyCastPlayer(instance);
|
||||
|
||||
var stopInfo = {
|
||||
|
|
|
@ -36,8 +36,8 @@ define(['layoutManager', 'cardBuilder', 'apphost', 'imageLoader', 'loading', 'sc
|
|||
showTitle: true,
|
||||
showParentTitle: true,
|
||||
coverImage: true,
|
||||
cardLayout: appHost.preferVisualCards,
|
||||
centerText: !appHost.preferVisualCards,
|
||||
cardLayout: false,
|
||||
centerText: false,
|
||||
allowBottomPadding: !enableScrollX(),
|
||||
preferThumb: 'auto'
|
||||
}, cardOptions || {}));
|
||||
|
|
|
@ -1633,7 +1633,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
|
|||
link = null;
|
||||
}
|
||||
|
||||
if (this._hlsPlayer || this._shakaPlayer) {
|
||||
if (this._hlsPlayer) {
|
||||
mediaCategory.stats.push({
|
||||
label: globalize.translate('LabelStreamType'),
|
||||
value: 'HLS'
|
||||
|
|
|
@ -677,7 +677,6 @@ function initClient() {
|
|||
'howler',
|
||||
'native-promise-only',
|
||||
'resize-observer-polyfill',
|
||||
'shaka',
|
||||
'swiper',
|
||||
'queryString',
|
||||
'sortable',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue