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

Kill shaka and fix livetvschedule

Browse source
This commit is contained in:
MrTimscampi 2020-07-23 22:54:34 +02:00
parent a09a9e9a3a
commit 29759ac884
7 changed files with 3 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -76,7 +76,6 @@
"query-string": "^6.13.1",
"resize-observer-polyfill": "^1.5.1",
"screenfull": "^5.0.2",
"shaka-player": "^2.5.13",
"sortablejs": "^1.10.2",
"swiper": "^5.4.5",
"webcomponents.js": "^0.7.24",

6
src/bundle.js
View file

@ -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() {

14
src/components/htmlMediaHelper.js
View file

@ -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 = {

4
src/controllers/livetv/livetvschedule.js
View file

@ -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 || {}));

2
src/plugins/htmlVideoPlayer/plugin.js
View file

@ -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'

1
src/scripts/site.js
View file

@ -677,7 +677,6 @@ function initClient() {
'howler',
'native-promise-only',
'resize-observer-polyfill',
'shaka',
'swiper',
'queryString',
'sortable',

12
yarn.lock
View file

@ -3643,11 +3643,6 @@ elliptic@^6.0.0:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.0"
eme-encryption-scheme-polyfill@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.0.1.tgz#b080b01bffd74c75c9cf8044c1cabedf3b83954f"
integrity sha512-Wz+Ro1c0/2Wsx2RLFvTOO0m4LvYn+7cSnq3XOvRvLLBq8jbvUACH/zpU9s0/5+mQa5oaelkU69x+q0z/iWYrFA==
emoji-regex@^7.0.1:
version "7.0.3"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@ -10085,13 +10080,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
inherits "^2.0.1"
safe-buffer "^5.0.1"
shaka-player@^2.5.13:
version "2.5.13"
resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-2.5.13.tgz#f8c493b825c735fc86d619cba8b2eb2f2a382233"
integrity sha512-rEh7juGlTvvF10oD7+EukS12EysZXI2fiGvNLqO7GsBQ5R/sFwcTGEB8A6lWlHQXeGVbT+MxZWKMZwFE805G6A==
dependencies:
eme-encryption-scheme-polyfill "^2.0.1"
shebang-command@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"