Merge branch 'master' of https://github.com/Stremio/stremio-video into feat/local-subtitles

Author: tymmesyde

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.48",
+    "version": "0.0.50",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",

src/HTMLVideo/HTMLVideo.js

@@ -189,7 +189,7 @@ function HTMLVideo(options) {
                         return Object.freeze({
                             id: 'EMBEDDED_' + String(index),
                             lang: track.language,
-                            label: track.label,
+                            label: track.label || null,
                             origin: 'EMBEDDED',
                             embedded: true
                         });

src/StremioVideo/StremioVideo.js

@@ -2,6 +2,7 @@ var EventEmitter = require('eventemitter3');
 var cloneDeep = require('lodash.clonedeep');
 var deepFreeze = require('deep-freeze');
 var selectVideoImplementation = require('./selectVideoImplementation');
+var platform = require('../platform');
 var ERROR = require('../error');
 
 function StremioVideo() {
@@ -25,6 +26,9 @@ function StremioVideo() {
             action = deepFreeze(cloneDeep(action));
             options = options || {};
             if (action.type === 'command' && action.commandName === 'load' && action.commandArgs) {
+                if (action.commandArgs.platform) {
+                    platform.set(action.commandArgs.platform);
+                }
                 var Video = selectVideoImplementation(action.commandArgs, options);
                 if (video !== null && video.constructor !== Video) {
                     video.dispatch({ type: 'command', commandName: 'destroy' });

src/StremioVideo/selectVideoImplementation.js

@@ -2,6 +2,7 @@ var ChromecastSenderVideo = require('../ChromecastSenderVideo');
 var ShellVideo = require('../ShellVideo');
 var HTMLVideo = require('../HTMLVideo');
 var TizenVideo = require('../TizenVideo');
+var TitanVideo = require('../TitanVideo');
 var WebOsVideo = require('../WebOsVideo');
 var IFrameVideo = require('../IFrameVideo');
 var YouTubeVideo = require('../YouTubeVideo');
@@ -37,6 +38,9 @@ function selectVideoImplementation(commandArgs, options) {
         if (commandArgs.platform === 'webOS') {
             return withStreamingServer(withHTMLSubtitles(WebOsVideo));
         }
+        if (commandArgs.platform === 'Titan' || commandArgs.platform === 'NetTV') {
+            return withStreamingServer(withHTMLSubtitles(TitanVideo));
+        }
         return withStreamingServer(withHTMLSubtitles(HTMLVideo));
     }
 
@@ -47,6 +51,9 @@ function selectVideoImplementation(commandArgs, options) {
         if (commandArgs.platform === 'webOS') {
             return withVideoParams(withHTMLSubtitles(WebOsVideo));
         }
+        if (commandArgs.platform === 'Titan' || commandArgs.platform === 'NetTV') {
+            return withVideoParams(withHTMLSubtitles(TitanVideo));
+        }
         return withVideoParams(withHTMLSubtitles(HTMLVideo));
     }