Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-08-08 20:17:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'development' of https://github.com/Stremio/stremio-web into feature-seasonal-notif

Browse source
This commit is contained in:
Tim 2023-12-14 22:07:48 +01:00
commit d1a384fcb7
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package-lock.json generated
View file

@ -12,7 +12,7 @@
"@babel/runtime": "7.16.0",
"@sentry/browser": "6.13.3",
"@stremio/stremio-colors": "5.0.1",
"@stremio/stremio-core-web": "0.44.30",
"@stremio/stremio-core-web": "0.45.0",
"@stremio/stremio-icons": "5.0.0-beta.3",
"@stremio/stremio-video": "0.0.26",
"a-color-picker": "1.2.1",
@ -3181,9 +3181,9 @@
"integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA=="
},
"node_modules/@stremio/stremio-core-web": {
"version": "0.44.30",
"resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.30.tgz",
"integrity": "sha512-iwasxT7Urf/1iCuPVMkEgfdTt1aQnL5eIeZfp7R0+ThBZGNuM9YNhq2r9BbOZNYmC1PIPTfsa8QmWtXC5J9oIQ==",
"version": "0.45.0",
"resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.45.0.tgz",
"integrity": "sha512-3+OBfWHtVWNQZsgq2cEovV/WGd8rP8EAa3pYh5mxGLRVEE+HK7J01YaxLtZBYRRt588fVK79wSklP38x6wY1iQ==",
"dependencies": {
"@babel/runtime": "7.16.0"
}
@ -18050,9 +18050,9 @@
"integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA=="
},
"@stremio/stremio-core-web": {
"version": "0.44.30",
"resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.30.tgz",
"integrity": "sha512-iwasxT7Urf/1iCuPVMkEgfdTt1aQnL5eIeZfp7R0+ThBZGNuM9YNhq2r9BbOZNYmC1PIPTfsa8QmWtXC5J9oIQ==",
"version": "0.45.0",
"resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.45.0.tgz",
"integrity": "sha512-3+OBfWHtVWNQZsgq2cEovV/WGd8rP8EAa3pYh5mxGLRVEE+HK7J01YaxLtZBYRRt588fVK79wSklP38x6wY1iQ==",
"requires": {
"@babel/runtime": "7.16.0"
}

2
package.json
View file

@ -15,7 +15,7 @@
"@babel/runtime": "7.16.0",
"@sentry/browser": "6.13.3",
"@stremio/stremio-colors": "5.0.1",
"@stremio/stremio-core-web": "0.44.30",
"@stremio/stremio-core-web": "0.45.0",
"@stremio/stremio-icons": "5.0.0-beta.3",
"@stremio/stremio-video": "0.0.26",
"a-color-picker": "1.2.1",

7
src/routes/Player/Player.js
View file

@ -260,8 +260,7 @@ const Player = ({ urlParams, queryParams }) => {
setError(null);
if (player.selected === null) {
dispatch({ type: 'command', commandName: 'unload' });
} else if (streamingServer.baseUrl !== null && streamingServer.baseUrl.type !== 'Loading' &&
(player.selected.metaRequest === null || (player.metaItem !== null && player.metaItem.type !== 'Loading'))) {
} else if (streamingServer.baseUrl !== null && (player.selected.metaRequest === null || (player.metaItem !== null && player.metaItem.type !== 'Loading'))) {
dispatch({
type: 'command',
commandName: 'load',
@ -286,9 +285,9 @@ const Player = ({ urlParams, queryParams }) => {
0,
forceTranscoding: forceTranscoding || casting,
maxAudioChannels: settings.surroundSound ? 32 : 2,
streamingServerURL: streamingServer.baseUrl.type === 'Ready' ?
streamingServerURL: streamingServer.baseUrl ?
casting ?
streamingServer.baseUrl.content
streamingServer.baseUrl
:
streamingServer.selected.transportUrl
: