+ {
+ Array.isArray(props.audioTracks) && props.audioTracks.length > 1 ?
+
+
Audio Languages
+
+ {props.audioTracks.map(({ id, label, lang }, index) => (
+
+ ))}
+
+
+ :
+ null
+ }
-
Languages
+
Subtitles Languages
-
-
Variants
+
Subtitles Variants
{
- tracksForLanguage.length > 0 ?
+ subtitlesTracksForLanguage.length > 0 ?
- {tracksForLanguage.map((track, index) => (
-
-
Settings
+
Subtitles Settings
);
-};
+});
+
+SubtitlesMenu.displayName = 'MainNavBars';
SubtitlesMenu.propTypes = {
className: PropTypes.string,
- tracks: PropTypes.arrayOf(PropTypes.shape({
+ subtitlesTracks: PropTypes.arrayOf(PropTypes.shape({
id: PropTypes.string.isRequired,
lang: PropTypes.string.isRequired,
origin: PropTypes.string.isRequired
})),
- selectedTrackId: PropTypes.string,
- extraTracks: PropTypes.arrayOf(PropTypes.shape({
+ selectedSubtitlesTrackId: PropTypes.string,
+ subtitlesOffset: PropTypes.number,
+ subtitlesSize: PropTypes.number,
+ extraSubtitlesTracks: PropTypes.arrayOf(PropTypes.shape({
id: PropTypes.string.isRequired,
lang: PropTypes.string.isRequired,
- origin: PropTypes.string.isRequired
+ origin: PropTypes.string.isRequired,
+ label: PropTypes.string.isRequired
})),
- selectedExtraTrackId: PropTypes.string,
- extraDelay: PropTypes.number,
- extraSize: PropTypes.number,
- extraOffset: PropTypes.number,
- onTrackSelected: PropTypes.func,
- onExtraTrackSelected: PropTypes.func,
- onExtraDelayChanged: PropTypes.func,
- onExtraSizeChanged: PropTypes.func,
- onExtraOffsetChanged: PropTypes.func
+ selectedExtraSubtitlesTrackId: PropTypes.string,
+ extraSubtitlesOffset: PropTypes.number,
+ extraSubtitlesDelay: PropTypes.number,
+ extraSubtitlesSize: PropTypes.number,
+ audioTracks: PropTypes.arrayOf(PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ lang: PropTypes.string.isRequired,
+ origin: PropTypes.string.isRequired,
+ label: PropTypes.string.isRequired
+ })),
+ selectedAudioTrackId: PropTypes.string,
+ onSubtitlesTrackSelected: PropTypes.func,
+ onExtraSubtitlesTrackSelected: PropTypes.func,
+ onAudioTrackSelected: PropTypes.func,
+ onSubtitlesOffsetChanged: PropTypes.func,
+ onSubtitlesSizeChanged: PropTypes.func,
+ onExtraSubtitlesOffsetChanged: PropTypes.func,
+ onExtraSubtitlesDelayChanged: PropTypes.func,
+ onExtraSubtitlesSizeChanged: PropTypes.func
};
module.exports = SubtitlesMenu;
diff --git a/src/routes/Player/SubtitlesMenu/index.js b/src/routes/Player/SubtitlesMenu/index.js
index b5ad0ae6a..bb0b5b062 100644
--- a/src/routes/Player/SubtitlesMenu/index.js
+++ b/src/routes/Player/SubtitlesMenu/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const SubtitlesMenu = require('./SubtitlesMenu');
diff --git a/src/routes/Player/SubtitlesMenu/styles.less b/src/routes/Player/SubtitlesMenu/styles.less
index 8720e10df..bc2803513 100644
--- a/src/routes/Player/SubtitlesMenu/styles.less
+++ b/src/routes/Player/SubtitlesMenu/styles.less
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
@import (reference) '~@stremio/stremio-colors/less/stremio-colors.less';
diff --git a/src/routes/Player/Video/Video.js b/src/routes/Player/Video/Video.js
index 1451c2c48..e3b7fd481 100644
--- a/src/routes/Player/Video/Video.js
+++ b/src/routes/Player/Video/Video.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const PropTypes = require('prop-types');
@@ -17,10 +17,13 @@ const Video = React.forwardRef(({ className, ...props }, ref) => {
const onImplementationChangedRef = useLiveRef(props.onImplementationChanged);
const videoElementRef = React.useRef(null);
const videoRef = React.useRef(null);
- const dispatch = React.useCallback((action) => {
+ const dispatch = React.useCallback((action, options = {}) => {
if (videoRef.current !== null) {
try {
- videoRef.current.dispatch(action);
+ videoRef.current.dispatch(action, {
+ ...options,
+ containerElement: videoElementRef.current
+ });
} catch (error) {
console.error('Video', error);
}
@@ -29,7 +32,7 @@ const Video = React.forwardRef(({ className, ...props }, ref) => {
React.useImperativeHandle(ref, () => ({ dispatch }), []);
React.useEffect(() => {
if (videoElementRef.current !== null) {
- videoRef.current = new StremioVideo({ containerElement: videoElementRef.current });
+ videoRef.current = new StremioVideo();
videoRef.current.on('ended', () => {
if (typeof onEndedRef.current === 'function') {
onEndedRef.current();
diff --git a/src/routes/Player/Video/index.js b/src/routes/Player/Video/index.js
index 8fd7b815e..f6c5f0ae0 100644
--- a/src/routes/Player/Video/index.js
+++ b/src/routes/Player/Video/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Video = require('./Video');
diff --git a/src/routes/Player/Video/styles.less b/src/routes/Player/Video/styles.less
index 137e99128..c2eed645e 100644
--- a/src/routes/Player/Video/styles.less
+++ b/src/routes/Player/Video/styles.less
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
.video-container {
.video {
diff --git a/src/routes/Player/index.js b/src/routes/Player/index.js
index 4b8881def..694a57274 100644
--- a/src/routes/Player/index.js
+++ b/src/routes/Player/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Player = require('./Player');
diff --git a/src/routes/Player/styles.less b/src/routes/Player/styles.less
index e4fe58c55..fe454c9d4 100644
--- a/src/routes/Player/styles.less
+++ b/src/routes/Player/styles.less
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
@import (reference) '~@stremio/stremio-colors/less/stremio-colors.less';
diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js
index 54b6ded23..58270f286 100644
--- a/src/routes/Player/usePlayer.js
+++ b/src/routes/Player/usePlayer.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const pako = require('pako');
@@ -9,7 +9,8 @@ const init = () => ({
selected: null,
metaItem: null,
subtitles: [],
- nextVideoDeepLinks: null,
+ nextVideo: null,
+ seriesInfo: null,
libraryItem: null,
title: null,
addon: null,
@@ -17,27 +18,30 @@ const init = () => ({
const map = (player) => ({
...player,
- metaItem: player.metaItem !== null ?
+ metaItem: player.metaItem !== null && player.metaItem.type === 'Ready' ?
{
...player.metaItem,
- released: new Date(
- typeof player.metaItem.released === 'string' ?
- player.metaItem.released
- :
- NaN
- ),
- videos: player.metaItem.videos.map((video) => ({
- ...video,
+ content: {
+ ...player.metaItem.content,
released: new Date(
- typeof video.released === 'string' ?
- video.released
+ typeof player.metaItem.content.released === 'string' ?
+ player.metaItem.content.released
:
NaN
),
- }))
+ videos: player.metaItem.content.videos.map((video) => ({
+ ...video,
+ released: new Date(
+ typeof video.released === 'string' ?
+ video.released
+ :
+ NaN
+ ),
+ }))
+ }
}
:
- null,
+ player.metaItem,
});
const usePlayer = (urlParams) => {
diff --git a/src/routes/Player/useSettings.js b/src/routes/Player/useSettings.js
index 0ffef6a4b..f72915a54 100644
--- a/src/routes/Player/useSettings.js
+++ b/src/routes/Player/useSettings.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const { useServices } = require('stremio/services');
diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js
index 94066ab90..1bbd2492f 100644
--- a/src/routes/Search/Search.js
+++ b/src/routes/Search/Search.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const PropTypes = require('prop-types');
diff --git a/src/routes/Search/index.js b/src/routes/Search/index.js
index 867baac80..3ce9e91d3 100644
--- a/src/routes/Search/index.js
+++ b/src/routes/Search/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Search = require('./Search');
diff --git a/src/routes/Search/styles.less b/src/routes/Search/styles.less
index b82ed2fc1..eaff44891 100644
--- a/src/routes/Search/styles.less
+++ b/src/routes/Search/styles.less
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
@import (reference) '~@stremio/stremio-colors/less/stremio-colors.less';
@import (reference) '~stremio/common/screen-sizes.less';
diff --git a/src/routes/Search/useSearch.js b/src/routes/Search/useSearch.js
index 64dce1ea8..3bc2ed78a 100644
--- a/src/routes/Search/useSearch.js
+++ b/src/routes/Search/useSearch.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const { useModelState } = require('stremio/common');
diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js
index 85d014f5f..bffa9da66 100644
--- a/src/routes/Settings/Settings.js
+++ b/src/routes/Settings/Settings.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const classnames = require('classnames');
diff --git a/src/routes/Settings/index.js b/src/routes/Settings/index.js
index 2db4ebdb3..4055638dd 100644
--- a/src/routes/Settings/index.js
+++ b/src/routes/Settings/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Settings = require('./Settings');
diff --git a/src/routes/Settings/styles.less b/src/routes/Settings/styles.less
index 4ef61610a..8db495f79 100644
--- a/src/routes/Settings/styles.less
+++ b/src/routes/Settings/styles.less
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
@import (reference) '~@stremio/stremio-colors/less/stremio-colors.less';
@import (reference) '~stremio/common/screen-sizes.less';
diff --git a/src/routes/Settings/useProfileSettingsInputs.js b/src/routes/Settings/useProfileSettingsInputs.js
index 8cb558146..5534fd6e4 100644
--- a/src/routes/Settings/useProfileSettingsInputs.js
+++ b/src/routes/Settings/useProfileSettingsInputs.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const { useServices } = require('stremio/services');
const { CONSTANTS, languageNames, useDeepEqualMemo } = require('stremio/common');
diff --git a/src/routes/Settings/useStreamingServerSettingsInputs.js b/src/routes/Settings/useStreamingServerSettingsInputs.js
index bce67ead2..0318d0f49 100644
--- a/src/routes/Settings/useStreamingServerSettingsInputs.js
+++ b/src/routes/Settings/useStreamingServerSettingsInputs.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const isEqual = require('lodash.isequal');
const { useServices } = require('stremio/services');
diff --git a/src/routes/index.js b/src/routes/index.js
index 93366d734..1ada48a2f 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Addons = require('./Addons');
const Board = require('./Board');
diff --git a/src/services/Chromecast/Chromecast.js b/src/services/Chromecast/Chromecast.js
index 77dca3379..7d7c4b828 100644
--- a/src/services/Chromecast/Chromecast.js
+++ b/src/services/Chromecast/Chromecast.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const EventEmitter = require('eventemitter3');
const ChromecastTransport = require('./ChromecastTransport');
@@ -77,8 +77,7 @@ function Chromecast() {
starting = false;
onStateChanged();
if (transport !== null) {
- transport.off('init', onTransportInit);
- transport.off('error', onTransportError);
+ transport.removeAllListeners();
transport = null;
}
};
diff --git a/src/services/Chromecast/ChromecastTransport.js b/src/services/Chromecast/ChromecastTransport.js
index 47daddcfe..0d3f7041c 100644
--- a/src/services/Chromecast/ChromecastTransport.js
+++ b/src/services/Chromecast/ChromecastTransport.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const EventEmitter = require('eventemitter3');
diff --git a/src/services/Chromecast/index.js b/src/services/Chromecast/index.js
index a4d3d8e8f..e6e69bba1 100644
--- a/src/services/Chromecast/index.js
+++ b/src/services/Chromecast/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Chromecast = require('./Chromecast');
diff --git a/src/services/Core/Core.js b/src/services/Core/Core.js
index 38d290d27..9716cf2b3 100644
--- a/src/services/Core/Core.js
+++ b/src/services/Core/Core.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const EventEmitter = require('eventemitter3');
const CoreTransport = require('./CoreTransport');
@@ -77,8 +77,7 @@ function Core() {
starting = false;
onStateChanged();
if (transport !== null) {
- transport.off('init', onTransportInit);
- transport.off('error', onTransportError);
+ transport.removeAllListeners();
transport = null;
}
};
diff --git a/src/services/Core/CoreTransport.js b/src/services/Core/CoreTransport.js
index 688fd9134..5a74eedd3 100644
--- a/src/services/Core/CoreTransport.js
+++ b/src/services/Core/CoreTransport.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const EventEmitter = require('eventemitter3');
const { default: initialize_api, initialize_runtime, get_state, get_debug_state, dispatch, analytics } = require('@stremio/stremio-core-web');
diff --git a/src/services/Core/index.js b/src/services/Core/index.js
index 4d723d28f..085c8db71 100644
--- a/src/services/Core/index.js
+++ b/src/services/Core/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Core = require('./Core');
diff --git a/src/services/KeyboardShortcuts/KeyboardShortcuts.js b/src/services/KeyboardShortcuts/KeyboardShortcuts.js
index ebc37c630..d6984ef42 100644
--- a/src/services/KeyboardShortcuts/KeyboardShortcuts.js
+++ b/src/services/KeyboardShortcuts/KeyboardShortcuts.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const EventEmitter = require('eventemitter3');
diff --git a/src/services/KeyboardShortcuts/index.js b/src/services/KeyboardShortcuts/index.js
index cebb92926..cf143a59f 100644
--- a/src/services/KeyboardShortcuts/index.js
+++ b/src/services/KeyboardShortcuts/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const KeyboardShortcuts = require('./KeyboardShortcuts');
diff --git a/src/services/ServicesContext/ServicesContext.js b/src/services/ServicesContext/ServicesContext.js
index 563da2807..c428609de 100644
--- a/src/services/ServicesContext/ServicesContext.js
+++ b/src/services/ServicesContext/ServicesContext.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
diff --git a/src/services/ServicesContext/ServicesProvider.js b/src/services/ServicesContext/ServicesProvider.js
index 05203500c..063580948 100644
--- a/src/services/ServicesContext/ServicesProvider.js
+++ b/src/services/ServicesContext/ServicesProvider.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const PropTypes = require('prop-types');
diff --git a/src/services/ServicesContext/index.js b/src/services/ServicesContext/index.js
index e83753ace..8ade6b323 100644
--- a/src/services/ServicesContext/index.js
+++ b/src/services/ServicesContext/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const ServicesProvider = require('./ServicesProvider');
const useServices = require('./useServices');
diff --git a/src/services/ServicesContext/useServices.js b/src/services/ServicesContext/useServices.js
index 1fcc85191..003702cbe 100644
--- a/src/services/ServicesContext/useServices.js
+++ b/src/services/ServicesContext/useServices.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const React = require('react');
const ServicesContext = require('./ServicesContext');
diff --git a/src/services/Shell/Shell.js b/src/services/Shell/Shell.js
index e5c5412e8..bb4d9051f 100644
--- a/src/services/Shell/Shell.js
+++ b/src/services/Shell/Shell.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const EventEmitter = require('eventemitter3');
diff --git a/src/services/Shell/index.js b/src/services/Shell/index.js
index 77cad4b10..059c9d985 100644
--- a/src/services/Shell/index.js
+++ b/src/services/Shell/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Shell = require('./Shell');
diff --git a/src/services/index.js b/src/services/index.js
index 93e87c471..fb944e199 100644
--- a/src/services/index.js
+++ b/src/services/index.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const Chromecast = require('./Chromecast');
const Core = require('./Core');
diff --git a/tests/copyright.spec.js b/tests/copyright.spec.js
index 2dcf82025..589f9bf51 100644
--- a/tests/copyright.spec.js
+++ b/tests/copyright.spec.js
@@ -1,9 +1,9 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const fs = require('fs');
const readdirp = require('readdirp');
-const COPYRIGHT_HEADER = /^\/\/ Copyright \(C\) 2017-2020 Smart code 203358507.*/;
+const COPYRIGHT_HEADER = /^\/\/ Copyright \(C\) 2017-2022 Smart code 203358507.*/;
describe('copyright', () => {
test('js', async () => {
diff --git a/tests/routesRegexp.spec.js b/tests/routesRegexp.spec.js
index 001b83f6b..774db2d7f 100644
--- a/tests/routesRegexp.spec.js
+++ b/tests/routesRegexp.spec.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const routesRegexp = require('../src/common/routesRegexp');
diff --git a/webpack.config.js b/webpack.config.js
index ccf124e09..7fd65fcfa 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2020 Smart code 203358507
+// Copyright (C) 2017-2022 Smart code 203358507
const path = require('path');
const { execSync } = require('child_process');