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

Use forked version of JavascriptSubtitlesOctopus

Browse source 
The fork contains an asm.js compatibility patch that we need for older client. This commit switched to using our forked version while we wait for an upstream merge.
This commit is contained in:
MrTimscampi 2020-03-02 19:54:29 +01:00
parent 29232ac727
commit b1d1cee634
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -31,7 +31,7 @@
"jellyfin-noto": "https://github.com/jellyfin/jellyfin-noto",
"jquery": "^3.4.1",
"jstree": "^3.3.7",
"libass-wasm": "^2.1.1",
"libass-wasm": "https://github.com/jellyfin/JavascriptSubtitlesOctopus",
"libjass": "^0.11.0",
"material-design-icons-iconfont": "^5.0.1",
"native-promise-only": "^0.8.0-a",

3
src/components/htmlvideoplayer/plugin.js
View file

@ -1056,8 +1056,9 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return i.DeliveryUrl;
}),
workerUrl: appRouter.baseUrl() + "/libraries/subtitles-octopus-worker.js",
legacyWorkerUrl: appRouter.baseUrl() + "/libraries/subtitles-octopus-worker-legacy.js",
onError: function() {
htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror')
htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror');
}
};
require(['JavascriptSubtitlesOctopus'], function(SubtitlesOctopus) {

5
webpack.common.js
View file

@ -8,7 +8,10 @@ const Assets = [
"native-promise-only/npo.js",
"libass-wasm/dist/subtitles-octopus-worker.js",
"libass-wasm/dist/subtitles-octopus-worker.data",
"libass-wasm/dist/subtitles-octopus-worker.wasm"
"libass-wasm/dist/subtitles-octopus-worker.wasm",
"libass-wasm/dist/subtitles-octopus-worker-legacy.js",
"libass-wasm/dist/subtitles-octopus-worker-legacy.data",
"libass-wasm/dist/subtitles-octopus-worker-legacy.js.mem"
];
module.exports = {

7
yarn.lock
View file

@ -3683,10 +3683,9 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"
libass-wasm@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/libass-wasm/-/libass-wasm-2.1.1.tgz#f12f4fdb9579dd422dcbc348bc3bd61097f4d07d"
integrity sha512-d45bHQ7tFVsLW3QstQDrDog2m+0D6Cja4GTrkGi70R9A5+aeLunPSUz3G4CVB+sKffNgiWjK4QI5NZLHQKZ9oQ==
"libass-wasm@https://github.com/jellyfin/JavascriptSubtitlesOctopus":
version "3.0.2"
resolved "https://github.com/jellyfin/JavascriptSubtitlesOctopus#7f331237026db75af2441717a4132d2398e96735"
libjass@^0.11.0:
version "0.11.0"