@eluvio/elv-player-js 2.0.23 → 2.0.24

package/lib/player/Cast.js

@@ -7,17 +7,23 @@ class Cast {
     this.onReady = onReady;
     this.connected = false;
     this.playbackRate = 1;
-
-    window["__onGCastApiAvailable"] = isAvailable =>
-      isAvailable && this.Initialize();
-
-    window.CastController = this;
-
     this.__listeners = [];
-
     this.onUpdate = onUpdate;
 
-    this.LoadScript();
+    if(window.__chromecastAvailable || (window.chrome && window.chrome.cast)) {
+      // Chromecast already initialized
+      this.Initialize();
+    } else {
+      // Initialize chromecast script
+      window["__onGCastApiAvailable"] = isAvailable => {
+        if(isAvailable) {
+          window.__chromecastAvailable = true;
+          this.Initialize();
+        }
+      };
+
+      this.LoadScript();
+    }
   }
 
   LoadScript() {
@@ -68,7 +74,7 @@ class Cast {
   async SetMedia({playoutOptions, playoutParameters}) {
     // Get dash options
     let dashOptions = ((playoutOptions || {}).dash || {}).playoutMethods || {};
-    let options = dashOptions.clear || dashOptions.widevine;
+    let options = dashOptions.clear;
 
     if(!options) {
       // Dash options might be available under the default_dash offering
@@ -79,7 +85,7 @@ class Cast {
         });
 
         dashOptions = ((playoutOptions || {}).dash || {}).playoutMethods || {};
-        options = dashOptions.clear || dashOptions.widevine || {};
+        options = dashOptions.clear || {};
       } catch(error) {
         this.player.Log("Unable to find dash playout options for chromecast");
       }

package/lib/player/Player.js

@@ -7,6 +7,8 @@ import {MergeDefaultParameters} from "../ui/Common";
 
 const isIOS = /iPhone|iPad|iPod/i.test(navigator.userAgent);
 
+const chromecastAvailable = window.__chromecastAvailable || !!(window.chrome && window.chrome.cast);
+
 const PlayerProfiles = {
   default: {
     label: "Default",
@@ -60,8 +62,12 @@ export class EluvioPlayer {
     this.behindLiveEdge = false;
     this.publicMetadataUrl = undefined;
     this.airplayAvailable = false;
-    this.chromecastAvailable = false;
+    this.chromecastAvailable = chromecastAvailable;
     this.casting = false;
+    this.usePlayerControls = [
+      EluvioPlayerParameters.controls.ON,
+      EluvioPlayerParameters.controls.AUTO_HIDE
+    ].includes(parameters.playerOptions.controls);
 
     try {
       // If custom HLS parameters are specified, set profile to custom
@@ -342,17 +348,19 @@ export class EluvioPlayer {
         }
       }
 
-      // Handle Chromecast
-      this.castHandler = new Cast({
-        player: this,
-        onReady: () => {
-          this.chromecastAvailable = true;
-          this.__SettingsUpdate();
-        },
-        onUpdate: () => {
-          this.__SettingsUpdate();
-        }
-      });
+      // Handle Chromecast (Only if player controls will be visible)
+      if(this.usePlayerControls) {
+        this.castHandler = new Cast({
+          player: this,
+          onReady: () => {
+            this.chromecastAvailable = true;
+            this.__SettingsUpdate();
+          },
+          onUpdate: () => {
+            this.__SettingsUpdate();
+          }
+        });
+      }
 
       // Detect Airplay availability
       this.__RegisterVideoEventListener("webkitplaybacktargetavailabilitychanged", event => {
@@ -407,10 +415,12 @@ export class EluvioPlayer {
 
       this.playoutUrl = playoutUrl.toString();
 
-      this.castHandler.SetMedia({
-        playoutOptions: this.sourceOptions.playoutOptions,
-        playoutParameters
-      });
+      if(this.castHandler) {
+        this.castHandler.SetMedia({
+          playoutOptions: this.sourceOptions.playoutOptions,
+          playoutParameters
+        });
+      }
 
       if(this.__destroyed) { return; }
 
@@ -1026,7 +1036,7 @@ export class EluvioPlayer {
   }
 
   __DestroyPlayer() {
-    this.castHandler.Disconnect();
+    this.castHandler && this.castHandler.Disconnect();
     this.__destroyed = true;
     this.__Reset();
   }
@@ -1086,7 +1096,7 @@ export class EluvioPlayer {
     this.dvrEnabled = false;
     this.publicMetadataUrl = undefined;
     this.airplayAvailable = false;
-    this.chromecastAvailable = false;
+    this.chromecastAvailable = chromecastAvailable;
     this.casting = false;
   }
 

package/lib/ui/Observers.js

@@ -85,7 +85,7 @@ export const ObserveVideo = ({player, setVideoState}) => {
   events.map(event => player.video.addEventListener(event, UpdateVideoState));
   player.target.addEventListener("fullscreenchange", UpdateVideoState);
 
-  const castListenerDisposer = player.castHandler.RegisterListener(UpdateVideoState);
+  const castListenerDisposer = player.castHandler && player.castHandler.RegisterListener(UpdateVideoState);
 
   return () => {
     events.map(event => player.video.removeEventListener(event, UpdateVideoState));

package/lib/ui/WebControls.jsx

@@ -45,7 +45,7 @@ const TimeIndicator = ({player, videoState}) => {
           `${Time(currentTime, videoState.duration)} / `
       }
       {
-        !player.dvrEnabled ? null :
+        (player.isLive && !player.dvrEnabled) ? null :
           Time(videoState.duration, videoState.duration)
       }
     </div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-player-js",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "![Eluvio Logo](lib/static/images/Logo.png \"Eluvio Logo\")",
   "main": "dist/elv-player-js.es.js",
   "license": "MIT",