@gcorevideo/player 2.19.9 → 2.19.11

package/dist/plugins/index.js

@@ -37219,7 +37219,7 @@ class MediaControl extends UICorePlugin {
     $volumeBarScrubber = null;
     $volumeContainer = null;
     $volumeIcon = null;
-    template = tmpl(mediaControlHTML);
+    static template = tmpl(mediaControlHTML);
     get name() {
         return 'media_control';
     }
@@ -38004,9 +38004,6 @@ class MediaControl extends UICorePlugin {
     parseColors() {
         const design = this.options.design || {};
         let variables = [];
-        if (!tmpl) {
-            return;
-        }
         // TODO camel case
         if (design.background_color) {
             variables = variables.concat([
@@ -38049,7 +38046,7 @@ class MediaControl extends UICorePlugin {
     }
     render() {
         const timeout = this.options.hideMediaControlDelay || 2000;
-        const html = this.template({ settings: this.settings ?? {} });
+        const html = MediaControl.template({ settings: this.settings ?? {} });
         this.$el.html(html);
         // const style = Styler.getStyleFor(mediaControlStyle, { baseUrl: this.options.baseUrl });
         // this.$el.append(style[0]);
@@ -40588,7 +40585,7 @@ class SourceController extends CorePlugin {
      */
     bindEvents() {
         super.bindEvents();
-        this.listenTo(this.core, Events$1.CORE_READY, () => this.onReady());
+        this.listenTo(this.core, Events$1.CORE_ACTIVE_CONTAINER_CHANGED, () => this.onReady());
     }
     onReady() {
         trace(`${T} onReady`, {

package/lib/Player.d.ts

@@ -33,8 +33,6 @@ export declare class Player {
     private player;
     private ready;
     private rootNode;
-    private tuneInTimerId;
-    private tunedIn;
     constructor(config: PlayerConfig);
     /**
      * Adds a listener to a player event
@@ -203,6 +201,6 @@ export declare class Player {
     private configurePlaybacks;
     private buildMediaSourcesList;
     private bindContainerEventListeners;
-    private bindSizeManagementListeners;
+    private bindCoreListeners;
 }
 //# sourceMappingURL=Player.d.ts.map

package/lib/Player.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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"}

package/lib/Player.js

@@ -30,8 +30,6 @@ export class Player {
     player = null;
     ready = false;
     rootNode = null;
-    tuneInTimerId = null;
-    tunedIn = false;
     constructor(config) {
         this.setConfig(config);
         // TODO decide whether the order of playback modules might vary,
@@ -124,11 +122,6 @@ export class Player {
             this.player = null;
         }
         this.ready = false;
-        this.tunedIn = false;
-        if (this.tuneInTimerId) {
-            clearTimeout(this.tuneInTimerId);
-            this.tuneInTimerId = null;
-        }
     }
     /**
      * Current playback (time since the beginning of the stream), if appropriate.
@@ -287,36 +280,16 @@ export class Player {
         assert.ok(!this.player, 'Player already initialized');
         const player = new PlayerClappr(coreOptions);
         this.player = player;
-        // TODO checks if the whole thing is necessary
-        this.tuneInTimerId = globalThis.setTimeout(() => {
-            trace(`${T} tuneInTimer`, {
-                ready: this.ready,
-                tunedIn: this.tunedIn,
-            });
-            this.tuneInTimerId = null;
-            this.tuneIn();
-        }, 4000);
+        this.bindCoreListeners();
     }
     async tuneIn() {
         assert.ok(this.player);
-        trace(`${T} tuneIn`, {
-            ready: this.ready,
-            tunedIn: this.tunedIn,
-        });
-        if (this.tunedIn) {
-            return;
-        }
-        this.tunedIn = true;
-        const player = this.player;
-        this.bindContainerEventListeners(player);
-        player.core.on(ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED, () => this.bindContainerEventListeners(player), null);
-        this.bindSizeManagementListeners(player);
+        this.bindContainerEventListeners();
+        this.player.core.on(ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED, () => this.bindContainerEventListeners(), null);
         if (this.config.autoPlay) {
+            trace(`${T} autoPlay`);
             setTimeout(() => {
-                trace(`${T} autoPlay`, {
-                    playback: this.player?.core.activePlayback.name,
-                });
-                player.play({
+                this.player?.play({
                     autoPlay: true,
                 });
             }, 0);
@@ -346,11 +319,6 @@ export class Player {
                 return;
             }
             this.ready = true;
-            if (this.tuneInTimerId) {
-                clearTimeout(this.tuneInTimerId);
-                this.tuneInTimerId = null;
-            }
-            // TODO ensure that CORE_ACTIVE_CONTAINER_CHANGED does not get caught before onReady
             setTimeout(() => this.tuneIn(), 0);
         },
         onPlay: () => {
@@ -383,15 +351,12 @@ export class Player {
             sources,
         });
         this.rootNode = rootNode;
-        const coreOptions = $.extend(true, this.config, {
+        const coreOptions = $.extend(true, {
             allowUserInteraction: true,
             autoPlay: false,
-            dash: this.config.dash,
-            debug: this.config.debug || 'none',
+            debug: 'none',
             events: this.events,
             height: rootNode.clientHeight,
-            loop: this.config.loop,
-            mute: this.config.mute,
             playback: {
                 controls: false,
                 playInline: true,
@@ -403,12 +368,11 @@ export class Player {
                 },
             },
             parent: rootNode,
-            playbackType: this.config.playbackType,
             width: rootNode.clientWidth,
             source: source ? source.source : undefined,
             mimeType: source ? source.mimeType : undefined,
+        }, this.config, {
             sources,
-            strings: this.config.strings,
         });
         return coreOptions;
     }
@@ -420,23 +384,27 @@ export class Player {
         // TODO ensure unsupported sources are filtered out
         this.config.sources.map((s) => wrapSource(s)), this.config.priorityTransport);
     }
-    bindContainerEventListeners(player) {
-        if (Browser.isiOS && player.core.activePlayback) {
-            player.core.activePlayback.$el.on('webkitendfullscreen', () => {
+    bindContainerEventListeners() {
+        const activePlayback = this.player?.core.activePlayback;
+        const activeContainer = this.player?.core.activeContainer;
+        if (Browser.isiOS && activePlayback) {
+            // TODO check out
+            activePlayback.$el.on('webkitendfullscreen', () => {
                 try {
-                    player.core.handleFullscreenChange();
+                    activeContainer?.handleFullscreenChange();
                 }
                 catch (e) {
                     reportError(e);
                 }
             });
         }
-        player.core.activeContainer.on(ClapprEvents.CONTAINER_VOLUME, (volume) => {
+        activeContainer?.on(ClapprEvents.CONTAINER_VOLUME, (volume) => {
             this.safeTriggerEvent(PlayerEvent.VolumeUpdate, volume);
         }, null);
     }
-    bindSizeManagementListeners(player) {
-        player.core.on(ClapprEvents.CORE_SCREEN_ORIENTATION_CHANGED, ({ orientation }) => {
+    bindCoreListeners() {
+        const core = this.player?.core;
+        core?.on(ClapprEvents.CORE_SCREEN_ORIENTATION_CHANGED, ({ orientation }) => {
             trace(`${T} on CORE_SCREEN_ORIENTATION_CHANGED`, {
                 orientation,
                 rootNode: {
@@ -445,20 +413,20 @@ export class Player {
                 },
             });
             if (Browser.isiOS && this.rootNode) {
-                player.core.resize({
+                core?.resize({
                     width: this.rootNode.clientWidth,
                     height: this.rootNode.clientHeight,
                 });
             }
         }, null);
-        player.core.on(ClapprEvents.CORE_RESIZE, ({ width, height }) => {
+        core?.on(ClapprEvents.CORE_RESIZE, ({ width, height }) => {
             trace(`${T} on CORE_RESIZE`, {
                 width,
                 height,
             });
             this.safeTriggerEvent(PlayerEvent.Resize, { width, height });
         }, null);
-        player.core.on(ClapprEvents.CORE_FULLSCREEN, (isFullscreen) => {
+        core?.on(ClapprEvents.CORE_FULLSCREEN, (isFullscreen) => {
             trace(`${T} CORE_FULLSCREEN`, {
                 isFullscreen,
             });

package/lib/playback/dash-playback/DashPlayback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,UAAU,EAEV,QAAQ,EAIT,MAAM,cAAc,CAAA;AAGrB,OAAO,MAAM,EAAE,EAIb,KAAK,WAAW,IAAI,eAAe,EAEnC,aAAa,EACd,MAAM,QAAQ,CAAA;AAEf,OAAO,EAIL,YAAY,EACZ,YAAY,EAEZ,SAAS,EACV,MAAM,yBAAyB,CAAA;AAOhC,KAAK,YAAY,GACb,OAAO,QAAQ,CAAC,GAAG,GACnB,OAAO,QAAQ,CAAC,IAAI,GACpB,OAAO,QAAQ,CAAC,GAAG,GACnB,OAAO,QAAQ,CAAC,KAAK,CAAA;AAEzB,KAAK,YAAY,GAAG,MAAM,CAAA;AAE1B,KAAK,oBAAoB,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAKD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IAClD,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAO;IAErC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAO;IAKnC,mCAAmC,EAAE,OAAO,CAAQ;IAEpD,aAAa,EAAE,OAAO,CAAQ;IAI9B,uBAAuB,EAAE,MAAM,CAAI;IASnC,wBAAwB,EAAE,MAAM,CAAI;IAEpC,aAAa,EAAE,YAAY,CAAe;IAG1C,aAAa,EAAE,YAAY,GAAG,IAAI,CAAO;IAGzC,gBAAgB,EAAE,SAAS,CAAI;IAE/B,KAAK,EAAE,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAO;IAE5C,2BAA2B,EAAE,MAAM,CAAI;IAEvC,aAAa,EAAE,SAAS,GAAG,IAAI,CAAO;IAEtC,eAAe,EAAE,YAAY,CAA2B;IAIxD,0BAA0B,EAAE,oBAAoB,GAAG,IAAI,CAAO;IAI9D,wBAAwB,EAAE,oBAAoB,GAAG,IAAI,CAAO;IAE5D,kBAAkB,UAAQ;IAE1B,YAAY,EAAE,aAAa,GAAG,IAAI,CAAO;IAEzC,gBAAgB,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,IAAI,CAAO;IAE9D,IAAI,IAAI,WAEP;IAED,IAAI,MAAM,IAAI,YAAY,EAAE,CAE3B;IAED,IAAI,YAAY,IAAI,MAAM,CAMzB;IAED,IAAI,OAAO,YAEV;IAED,IAAI,YAAY,CAAC,EAAE,EAAE,MAAM,EAoC1B;IAED,IAAI,UAAU,WASb;IAED,IAAI,IAAI,WAEP;IAID,IAAI,sBAAsB,WAczB;IAID,IAAI,oBAAoB,WAgBvB;IAED,IAAI,SAAS,WAKZ;gBAEW,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,GAAG;IAOzD,MAAM;IAyEN,MAAM;IAMN,MAAM;YAMW,SAAS;IAI1B,qBAAqB;IAQrB,oBAAoB;IAMpB,kBAAkB;IAOlB,WAAW,IAAI,SAAS;IAQxB,cAAc,IAAI,SAAS;IAO3B,kBAAkB,IAAI,SAAS;IAI/B,cAAc,CAAC,UAAU,EAAE,MAAM;IAejC,IAAI,CAAC,IAAI,EAAE,SAAS;IAgBpB,eAAe;IAIf,UAAU,CAAC,MAAM,EAAE,OAAO;IAKjB,eAAe;IAgBxB,OAAO,CAAC,gBAAgB,CAGvB;IAED,OAAO,CAAC,eAAe,CAmCtB;IAED,OAAO,CAAC,YAAY;IAgBpB,aAAa;IAqBb,iBAAiB;IAWjB,IAAI,UAAU,YASb;IAED,WAAW;IAmBX,IAAI;IAUJ,KAAK;IAWL,IAAI;IASJ,OAAO;IAkBP,mBAAmB;IAYnB,WAAW,CAAC,MAAM,EAAE,eAAe,EAAE;IAarC,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,gBAAgB;IAQxB,eAAe;IAIf,aAAa;IAIb,OAAO,CAAC,QAAQ;CAKjB"}
+{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,UAAU,EAEV,QAAQ,EAIT,MAAM,cAAc,CAAA;AAGrB,OAAO,MAAM,EAAE,EAIb,KAAK,WAAW,IAAI,eAAe,EAEnC,aAAa,EACd,MAAM,QAAQ,CAAA;AAEf,OAAO,EAIL,YAAY,EACZ,YAAY,EAEZ,SAAS,EACV,MAAM,yBAAyB,CAAA;AAOhC,KAAK,YAAY,GACb,OAAO,QAAQ,CAAC,GAAG,GACnB,OAAO,QAAQ,CAAC,IAAI,GACpB,OAAO,QAAQ,CAAC,GAAG,GACnB,OAAO,QAAQ,CAAC,KAAK,CAAA;AAEzB,KAAK,YAAY,GAAG,MAAM,CAAA;AAE1B,KAAK,oBAAoB,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAKD,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IAClD,OAAO,EAAE,YAAY,EAAE,GAAG,IAAI,CAAO;IAErC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAO;IAKnC,mCAAmC,EAAE,OAAO,CAAQ;IAEpD,aAAa,EAAE,OAAO,CAAQ;IAI9B,uBAAuB,EAAE,MAAM,CAAI;IASnC,wBAAwB,EAAE,MAAM,CAAI;IAEpC,aAAa,EAAE,YAAY,CAAe;IAG1C,aAAa,EAAE,YAAY,GAAG,IAAI,CAAO;IAGzC,gBAAgB,EAAE,SAAS,CAAI;IAE/B,KAAK,EAAE,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAO;IAE5C,2BAA2B,EAAE,MAAM,CAAI;IAEvC,aAAa,EAAE,SAAS,GAAG,IAAI,CAAO;IAEtC,eAAe,EAAE,YAAY,CAA2B;IAIxD,0BAA0B,EAAE,oBAAoB,GAAG,IAAI,CAAO;IAI9D,wBAAwB,EAAE,oBAAoB,GAAG,IAAI,CAAO;IAE5D,kBAAkB,UAAQ;IAE1B,YAAY,EAAE,aAAa,GAAG,IAAI,CAAO;IAEzC,gBAAgB,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,IAAI,CAAO;IAE9D,IAAI,IAAI,WAEP;IAED,IAAI,MAAM,IAAI,YAAY,EAAE,CAE3B;IAED,IAAI,YAAY,IAAI,MAAM,CAMzB;IAED,IAAI,OAAO,YAEV;IAED,IAAI,YAAY,CAAC,EAAE,EAAE,MAAM,EAoC1B;IAED,IAAI,UAAU,WASb;IAED,IAAI,IAAI,WAEP;IAID,IAAI,sBAAsB,WAczB;IAID,IAAI,oBAAoB,WAgBvB;IAED,IAAI,SAAS,WAKZ;gBAEW,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,GAAG;IAOzD,MAAM;IA+EN,MAAM;IAMN,MAAM;YAMW,SAAS;IAI1B,qBAAqB;IAQrB,oBAAoB;IAMpB,kBAAkB;IAOlB,WAAW,IAAI,SAAS;IAQxB,cAAc,IAAI,SAAS;IAO3B,kBAAkB,IAAI,SAAS;IAI/B,cAAc,CAAC,UAAU,EAAE,MAAM;IAejC,IAAI,CAAC,IAAI,EAAE,SAAS;IAgBpB,eAAe;IAIf,UAAU,CAAC,MAAM,EAAE,OAAO;IAKjB,eAAe;IAgBxB,OAAO,CAAC,gBAAgB,CAGvB;IAED,OAAO,CAAC,eAAe,CAmCtB;IAED,OAAO,CAAC,YAAY;IAgBpB,aAAa;IAqBb,iBAAiB;IAWjB,IAAI,UAAU,YASb;IAED,WAAW;IAmBX,IAAI;IAUJ,KAAK;IAWL,IAAI;IASJ,OAAO;IAkBP,mBAAmB;IAYnB,WAAW,CAAC,MAAM,EAAE,eAAe,EAAE;IAarC,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,gBAAgB;IAQxB,eAAe;IAIf,aAAa;IAIb,OAAO,CAAC,QAAQ;CAKjB"}

package/lib/playback/dash-playback/DashPlayback.js

@@ -144,14 +144,13 @@ export default class DashPlayback extends HTML5Video {
         this._dash = dash;
         this._dash.initialize();
         if (this.options.dash) {
-            // TODO use $.extend
-            const settings = $.extend({}, this.options.dash, {
+            const settings = $.extend(true, {
                 streaming: {
                     text: {
                         defaultEnabled: false,
                     },
                 },
-            });
+            }, this.options.dash);
             this._dash.updateSettings(settings);
         }
         this._dash.attachView(this.el);

package/lib/plugins/media-control/MediaControl.d.ts

@@ -65,7 +65,7 @@ export declare class MediaControl extends UICorePlugin {
     private $volumeBarScrubber;
     private $volumeContainer;
     private $volumeIcon;
-    private readonly template;
+    private static readonly template;
     get name(): string;
     get supportedVersion(): {
         min: string;

package/lib/plugins/media-control/MediaControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,YAAY,EAMZ,IAAI,EACL,MAAM,cAAc,CAAA;AAOrB,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,kDAAkD,CAAA;AACzD,OAAO,4CAA4C,CAAA;AAWnD;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,KAAK,GAAG,kBAAkB,CAAA;AA6BzE;;;;;;GAMG;AACH,qBAAa,YAAa,SAAQ,YAAY;IAC5C,OAAO,CAAC,oBAAoB,CAAQ;IAEpC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,oBAAoB,CAAY;IACxC,OAAO,CAAC,wBAAwB,CAAsB;IAEtD,OAAO,CAAC,qBAAqB,CAA0B;IACvD,OAAO,CAAC,iBAAiB,CAAsB;IAC/C,OAAO,CAAC,iBAAiB,CAAsB;IAC/C,OAAO,CAAC,0BAA0B,CAAsB;IAExD,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,iBAAiB,CAAQ;IAEjC,OAAO,CAAC,6BAA6B,CAAuB;IAE5D,OAAO,CAAC,MAAM,CAA6C;IAC3D,OAAO,CAAC,YAAY,CAA6C;IAEjE,OAAO,CAAC,cAAc,CAAM;IAE5B,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,WAAW,CAAQ;IAE3B,OAAO,CAAC,IAAI,CAAM;IAElB,OAAO,CAAC,UAAU,CAAI;IACtB,OAAO,CAAC,UAAU,CAAI;IAEtB,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,QAAQ,CAAQ;IAExB,OAAO,CAAC,QAAQ,CAA8B;IAE9C,OAAO,CAAC,OAAO,CAA2B;IAE1C,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,cAAc,CAAQ;IAE9B,OAAO,CAAC,oBAAoB,CAA2B;IAEvD,OAAO,CAAC,WAAW,CAA2B;IAE9C,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,iBAAiB,CAA2B;IAEpD,OAAO,CAAC,oBAAoB,CAA2B;IAEvD,OAAO,CAAC,IAAI,CAA2B;IAEvC,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,eAAe,CAA2B;IAElD,OAAO,CAAC,aAAa,CAA2B;IAEhD,OAAO,CAAC,SAAS,CAA2B;IAE5C,OAAO,CAAC,iBAAiB,CAA2B;IAEpD,OAAO,CAAC,aAAa,CAA2B;IAEhD,OAAO,CAAC,cAAc,CAA2B;IAEjD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,mBAAmB,CAA2B;IAEtD,OAAO,CAAC,oBAAoB,CAA2B;IAEvD,OAAO,CAAC,cAAc,CAA2B;IAEjD,OAAO,CAAC,kBAAkB,CAA2B;IAErD,OAAO,CAAC,gBAAgB,CAA2B;IAEnD,OAAO,CAAC,WAAW,CAA2B;IAE9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;IAEtD,IAAI,IAAI,WAEP;IAED,IAAI,gBAAgB;;MAEnB;IAED,IAAI,QAAQ,QAKX;IAED,IAAI,SAAS,QAEZ;IAED,IAAI,QAAQ,QAEX;IAED,IAAa,UAAU;;;MAKtB;IAED,IAAa,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;MA4BlB;IAED;;OAEG;IACH,IAAI,MAAM,QAIT;IAED;;OAEG;IACH,IAAI,KAAK,YAER;gBAEW,IAAI,EAAE,IAAI;IAuBb,oBAAoB;2BAkZZ,MAAM;;;IA3Yd,UAAU;IA0CnB,mBAAmB;IAgEV,OAAO;IAOP,MAAM;IASf;;OAEG;IACH,IAAI;IAIJ;;OAEG;IACH,KAAK;IAIL;;OAEG;IACH,IAAI;IAIJ;;OAEG;IACH,gBAAgB;IAOhB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,0BAA0B;IAWlC,OAAO,CAAC,cAAc;IA0DtB,OAAO,CAAC,gBAAgB;IAsBxB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,mBAAmB;IAI3B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,YAAY;IA6BpB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,QAAQ,CAQf;IAED,OAAO,CAAC,UAAU,CAgBjB;IAED,OAAO,CAAC,oBAAoB;IAsB5B,OAAO,CAAC,UAAU;IAIlB;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,UAAQ;IA0BhD,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,wBAAwB;IAkChC,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,aAAa;IAyBrB,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,IAAI;IAkBZ,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,IAAI;IAgCZ,OAAO,CAAC,IAAI;IAmCZ,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,cAAc;IAmDtB,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,oBAAoB;IAgD5B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,mBAAmB,GAAG,WAAW,GAAG,IAAI;IAWzD,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,YAAY;IAapB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,aAAa;IA8CrB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,WAAW;IAqCnB,OAAO,CAAC,gBAAgB;IAMf,OAAO;IAShB,OAAO,CAAC,SAAS;IAKR,MAAM;IAoEf,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,eAAe;IAUvB,QAAQ,CAAC,KAAK,EAAE,OAAO;IAIvB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAIvB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAcvB;;OAEG;IACH,mBAAmB;IAMnB;;OAEG;IACH,qBAAqB;IAMrB,OAAO,CAAC,6BAA6B;CAOtC"}
+{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"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"}

package/lib/plugins/media-control/MediaControl.js

@@ -92,7 +92,7 @@ export class MediaControl extends UICorePlugin {
     $volumeBarScrubber = null;
     $volumeContainer = null;
     $volumeIcon = null;
-    template = template(mediaControlHTML);
+    static template = template(mediaControlHTML);
     get name() {
         return 'media_control';
     }
@@ -878,9 +878,6 @@ export class MediaControl extends UICorePlugin {
     parseColors() {
         const design = this.options.design || {};
         let variables = [];
-        if (!template) {
-            return;
-        }
         // TODO camel case
         if (design.background_color) {
             variables = variables.concat([
@@ -923,7 +920,7 @@ export class MediaControl extends UICorePlugin {
     }
     render() {
         const timeout = this.options.hideMediaControlDelay || 2000;
-        const html = this.template({ settings: this.settings ?? {} });
+        const html = MediaControl.template({ settings: this.settings ?? {} });
         this.$el.html(html);
         // const style = Styler.getStyleFor(mediaControlStyle, { baseUrl: this.options.baseUrl });
         // this.$el.append(style[0]);

package/lib/plugins/source-controller/SourceController.js

@@ -93,7 +93,7 @@ export class SourceController extends CorePlugin {
      */
     bindEvents() {
         super.bindEvents();
-        this.listenTo(this.core, ClapprEvents.CORE_READY, () => this.onReady());
+        this.listenTo(this.core, ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED, () => this.onReady());
     }
     onReady() {
         trace(`${T} onReady`, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.19.9",
+  "version": "2.19.11",
   "description": "Gcore JavaScript video player",
   "main": "dist/index.js",
   "type": "module",

package/src/Player.ts

@@ -83,10 +83,6 @@ export class Player {
 
   private rootNode: HTMLElement | null = null
 
-  private tuneInTimerId: ReturnType<typeof setTimeout> | null = null
-
-  private tunedIn = false
-
   constructor(config: PlayerConfig) {
     this.setConfig(config)
     // TODO decide whether the order of playback modules might vary,
@@ -185,11 +181,6 @@ export class Player {
       this.player = null
     }
     this.ready = false
-    this.tunedIn = false
-    if (this.tuneInTimerId) {
-      clearTimeout(this.tuneInTimerId)
-      this.tuneInTimerId = null
-    }
   }
 
   /**
@@ -369,44 +360,21 @@ export class Player {
 
     const player = new PlayerClappr(coreOptions)
     this.player = player
-
-    // TODO checks if the whole thing is necessary
-    this.tuneInTimerId = globalThis.setTimeout(() => {
-      trace(`${T} tuneInTimer`, {
-        ready: this.ready,
-        tunedIn: this.tunedIn,
-      })
-      this.tuneInTimerId = null
-      this.tuneIn()
-    }, 4000)
+    this.bindCoreListeners()
   }
 
   private async tuneIn() {
     assert.ok(this.player)
-    trace(`${T} tuneIn`, {
-      ready: this.ready,
-      tunedIn: this.tunedIn,
-    })
-    if (this.tunedIn) {
-      return
-    }
-    this.tunedIn = true
-    const player = this.player
-    
-    this.bindContainerEventListeners(player)
-    player.core.on(
+    this.bindContainerEventListeners()
+    this.player.core.on(
       ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED,
-      () => this.bindContainerEventListeners(player),
+      () => this.bindContainerEventListeners(),
       null,
     )
-    this.bindSizeManagementListeners(player)
-
     if (this.config.autoPlay) {
+      trace(`${T} autoPlay`)
       setTimeout(() => {
-        trace(`${T} autoPlay`, {
-          playback: this.player?.core.activePlayback.name,
-        })
-        player.play({
+        this.player?.play({
           autoPlay: true,
         })
       }, 0)
@@ -436,11 +404,6 @@ export class Player {
         return
       }
       this.ready = true
-      if (this.tuneInTimerId) {
-        clearTimeout(this.tuneInTimerId)
-        this.tuneInTimerId = null
-      }
-      // TODO ensure that CORE_ACTIVE_CONTAINER_CHANGED does not get caught before onReady
       setTimeout(() => this.tuneIn(), 0)
     },
     onPlay: () => {
@@ -476,15 +439,12 @@ export class Player {
 
     this.rootNode = rootNode
 
-    const coreOptions: CoreOptions & PluginOptions = $.extend(true, this.config, {
+    const coreOptions: CoreOptions & PluginOptions = $.extend(true, {
       allowUserInteraction: true,
       autoPlay: false,
-      dash: this.config.dash,
-      debug: this.config.debug || 'none',
+      debug: 'none',
       events: this.events,
       height: rootNode.clientHeight,
-      loop: this.config.loop,
-      mute: this.config.mute,
       playback: {
         controls: false,
         playInline: true,
@@ -496,12 +456,11 @@ export class Player {
         },
       },
       parent: rootNode,
-      playbackType: this.config.playbackType,
       width: rootNode.clientWidth,
       source: source ? source.source : undefined,
       mimeType: source ? source.mimeType : undefined,
+    }, this.config, {
       sources,
-      strings: this.config.strings,
     })
     return coreOptions
   }
@@ -518,23 +477,27 @@ export class Player {
     )
   }
 
-  private bindContainerEventListeners(player: PlayerClappr) {
-    if (Browser.isiOS && player.core.activePlayback) {
-      player.core.activePlayback.$el.on('webkitendfullscreen', () => {
+  private bindContainerEventListeners() {
+    const activePlayback = this.player?.core.activePlayback
+    const activeContainer = this.player?.core.activeContainer
+    if (Browser.isiOS && activePlayback) {
+      // TODO check out
+      activePlayback.$el.on('webkitendfullscreen', () => {
         try {
-          player.core.handleFullscreenChange()
+          activeContainer?.handleFullscreenChange()
         } catch (e) {
           reportError(e)
         }
       })
     }
-    player.core.activeContainer.on(ClapprEvents.CONTAINER_VOLUME, (volume: number) => {
+    activeContainer?.on(ClapprEvents.CONTAINER_VOLUME, (volume: number) => {
       this.safeTriggerEvent(PlayerEvent.VolumeUpdate, volume)
     }, null)
   }
 
-  private bindSizeManagementListeners(player: PlayerClappr) {
-    player.core.on(
+  private bindCoreListeners() {
+    const core = this.player?.core
+    core?.on(
       ClapprEvents.CORE_SCREEN_ORIENTATION_CHANGED,
       ({ orientation }: { orientation: 'landscape' | 'portrait' }) => {
         trace(`${T} on CORE_SCREEN_ORIENTATION_CHANGED`, {
@@ -545,7 +508,7 @@ export class Player {
           },
         })
         if (Browser.isiOS && this.rootNode) {
-          player.core.resize({
+          core?.resize({
             width: this.rootNode.clientWidth,
             height: this.rootNode.clientHeight,
           })
@@ -553,7 +516,7 @@ export class Player {
       },
       null,
     )
-    player.core.on(
+    core?.on(
       ClapprEvents.CORE_RESIZE,
       ({ width, height }: { width: number; height: number }) => {
         trace(`${T} on CORE_RESIZE`, {
@@ -564,7 +527,7 @@ export class Player {
       },
       null,
     )
-    player.core.on(
+    core?.on(
       ClapprEvents.CORE_FULLSCREEN,
       (isFullscreen: boolean) => {
         trace(`${T} CORE_FULLSCREEN`, {

package/src/playback/dash-playback/DashPlayback.ts

@@ -239,14 +239,17 @@ export default class DashPlayback extends HTML5Video {
     this._dash.initialize()
 
     if (this.options.dash) {
-      // TODO use $.extend
-      const settings = $.extend({}, this.options.dash, {
-        streaming: {
-          text: {
-            defaultEnabled: false,
+      const settings = $.extend(
+        true,
+        {
+          streaming: {
+            text: {
+              defaultEnabled: false,
+            },
           },
         },
-      })
+        this.options.dash,
+      )
       this._dash.updateSettings(settings)
     }
 
@@ -277,10 +280,13 @@ export default class DashPlayback extends HTML5Video {
       })
     })
 
-    this._dash.on(DASHJS.MediaPlayer.events.QUALITY_CHANGE_RENDERED, (evt: DASHJS.QualityChangeRenderedEvent) => {
-      const currentLevel = this.getLevel(evt.newQuality)
-      this.onLevelSwitchEnd(currentLevel)
-    })
+    this._dash.on(
+      DASHJS.MediaPlayer.events.QUALITY_CHANGE_RENDERED,
+      (evt: DASHJS.QualityChangeRenderedEvent) => {
+        const currentLevel = this.getLevel(evt.newQuality)
+        this.onLevelSwitchEnd(currentLevel)
+      },
+    )
 
     this._dash.on(
       DASHJS.MediaPlayer.events.METRIC_ADDED,

package/src/plugins/media-control/MediaControl.ts

@@ -168,7 +168,7 @@ export class MediaControl extends UICorePlugin {
 
   private $volumeIcon: ZeptoResult | null = null
 
-  private readonly template = template(mediaControlHTML)
+  private static readonly template = template(mediaControlHTML)
 
   get name() {
     return 'media_control'
@@ -1189,10 +1189,6 @@ export class MediaControl extends UICorePlugin {
 
     let variables: string[] = []
 
-    if (!template) {
-      return
-    }
-
     // TODO camel case
     if (design.background_color) {
       variables = variables.concat([
@@ -1244,7 +1240,7 @@ export class MediaControl extends UICorePlugin {
   override render() {
     const timeout = this.options.hideMediaControlDelay || 2000
 
-    const html = this.template({ settings: this.settings ?? {} })
+    const html = MediaControl.template({ settings: this.settings ?? {} })
     this.$el.html(html)
     // const style = Styler.getStyleFor(mediaControlStyle, { baseUrl: this.options.baseUrl });
     // this.$el.append(style[0]);

package/src/plugins/source-controller/SourceController.ts

@@ -121,7 +121,7 @@ export class SourceController extends CorePlugin {
   override bindEvents() {
     super.bindEvents()
 
-    this.listenTo(this.core, ClapprEvents.CORE_READY, () => this.onReady())
+    this.listenTo(this.core, ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED, () => this.onReady())
   }
 
   private onReady() {