diff --git a/package.json b/package.json index 36ac58dafa..8cbe42cc8c 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/bundle.js b/src/bundle.js index dd1ff6548b..ae2a59f0d5 100644 --- a/src/bundle.js +++ b/src/bundle.js @@ -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() { diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js index fd740d98e5..35f14f0d5a 100644 --- a/src/components/htmlMediaHelper.js +++ b/src/components/htmlMediaHelper.js @@ -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 = { diff --git a/src/controllers/livetv/livetvschedule.js b/src/controllers/livetv/livetvschedule.js index 9668d59d9f..3a8ba91c34 100644 --- a/src/controllers/livetv/livetvschedule.js +++ b/src/controllers/livetv/livetvschedule.js @@ -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 || {})); diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js index 30d89de3b1..2b80712f0e 100644 --- a/src/plugins/htmlVideoPlayer/plugin.js +++ b/src/plugins/htmlVideoPlayer/plugin.js @@ -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' diff --git a/src/scripts/site.js b/src/scripts/site.js index f150f935c8..1f958a4466 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -677,7 +677,6 @@ function initClient() { 'howler', 'native-promise-only', 'resize-observer-polyfill', - 'shaka', 'swiper', 'queryString', 'sortable', diff --git a/yarn.lock b/yarn.lock index e7881d1608..05e29610f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"