@npo/player 1.13.2 → 1.15.0

package/lib/js/playeractions/handlers/processsourceconfig.d.ts

@@ -0,0 +1,3 @@
+import { StreamObject } from 'types/interfaces';
+import { SourceConfig } from 'bitmovin-player';
+export declare function processSourceConfig(_sourceConfig: SourceConfig | undefined, _streamObject: StreamObject, drm?: string | null): SourceConfig;

package/lib/js/playeractions/handlers/processsourceconfig.js

@@ -0,0 +1,158 @@
+import { HttpResponseType } from 'bitmovin-player';
+import { npoCdnProviders } from '../../cdnproviders';
+function setDrm(sourceConfig, drm, _streamObject) {
+    const npoDrmGateway = 'https://npo-drm-gateway.samgcloud.nepworldwide.nl/authentication?custom_data=';
+    switch (drm) {
+        case 'fairplay':
+            sourceConfig.drm = {
+                fairplay: {
+                    certificateURL: 'https://fairplay.npo.nl/certificate/fairplay.cer',
+                    LA_URL: npoDrmGateway + _streamObject.stream.drmToken,
+                    prepareMessage: event => {
+                        return new Uint8Array(event.message);
+                    },
+                    prepareContentId: url => {
+                        const link = document.createElement('a');
+                        const trimmedUrl = url
+                            .split('')
+                            .filter(char => !(char.codePointAt(0) == null))
+                            .join('');
+                        link.href = trimmedUrl.replace('T', '');
+                        return link.hostname;
+                    },
+                    prepareLicense: license => {
+                        let binary = '';
+                        const bytes = new Uint8Array(license);
+                        const len = bytes.byteLength;
+                        for (let i = 0; i < len; i++) {
+                            binary += String.fromCharCode(bytes[i]);
+                        }
+                        return window.btoa(binary);
+                    },
+                    licenseResponseType: HttpResponseType.ARRAYBUFFER,
+                    useUint16InitData: true
+                }
+            };
+            break;
+        case 'widevine':
+            sourceConfig.drm = {
+                widevine: {
+                    LA_URL: npoDrmGateway + _streamObject.stream.drmToken,
+                    audioRobustness: 'SW_SECURE_CRYPTO',
+                    videoRobustness: 'SW_SECURE_CRYPTO'
+                }
+            };
+            break;
+        case 'playready':
+            sourceConfig.drm = {
+                playready: {
+                    LA_URL: npoDrmGateway + _streamObject.stream.drmToken
+                }
+            };
+            break;
+    }
+    return sourceConfig;
+}
+function setStreamProfile(sourceConfig, _sourceConfig, _streamObject) {
+    const streamProfile = _streamObject.stream.streamProfile;
+    const streamURL = _streamObject.stream.streamURL;
+    const configMapping = {
+        'hls': _sourceConfig.hls,
+        'dash': _sourceConfig.dash,
+        'progressive': _sourceConfig.progressive
+    };
+    if (configMapping.hasOwnProperty(streamProfile)) {
+        const value = configMapping[streamProfile];
+        if (typeof value === 'string' || value === undefined) {
+            sourceConfig[streamProfile] = value === '' ? undefined : value ?? streamURL ?? '';
+        }
+        else if (Array.isArray(value) && streamProfile === 'progressive') {
+            sourceConfig.progressive = value;
+        }
+        Object.keys(configMapping)
+            .filter(profile => profile !== streamProfile)
+            .forEach(profile => {
+            if (profile === 'progressive') {
+                sourceConfig[profile] = undefined;
+            }
+            else {
+                sourceConfig[profile] = '';
+            }
+        });
+    }
+    return sourceConfig;
+}
+export function processSourceConfig(_sourceConfig = {}, _streamObject, drm = null) {
+    let sourceConfig = {};
+    sourceConfig.title =
+        _sourceConfig.title ?? _streamObject.metadata.title ?? '';
+    sourceConfig.description =
+        _sourceConfig.description ??
+            _streamObject.metadata.description ??
+            '';
+    sourceConfig.poster =
+        _sourceConfig.poster ?? _streamObject.metadata.poster ?? '';
+    sourceConfig.metadata = {
+        title: sourceConfig.title,
+        description: sourceConfig.description,
+        poster: sourceConfig.poster
+    };
+    sourceConfig.subtitleTracks =
+        _sourceConfig.subtitleTracks ??
+            (_streamObject.assets.subtitles
+                ? _streamObject.assets.subtitles.map((subtitle, i) => ({
+                    url: subtitle.location,
+                    lang: subtitle.iso,
+                    label: subtitle.name,
+                    kind: 'subtitle',
+                    id: 'sub' + i
+                }))
+                : undefined);
+    sourceConfig.thumbnailTrack =
+        _sourceConfig.thumbnailTrack ??
+            _streamObject.assets.scrubbingThumbnail
+            ? { url: _streamObject.assets.scrubbingThumbnail }
+            : undefined;
+    sourceConfig.options = _sourceConfig.options;
+    sourceConfig = setStreamProfile(sourceConfig, _sourceConfig, _streamObject);
+    sourceConfig = setDrm(sourceConfig, drm, _streamObject);
+    const streamSource = _streamObject.stream.streamURL;
+    let cdnString = streamSource;
+    npoCdnProviders.forEach(function (value, key) {
+        if (streamSource.includes(key)) {
+            cdnString = value;
+        }
+    });
+    if (sourceConfig.analytics == null)
+        sourceConfig.analytics = {};
+    sourceConfig.analytics.cdnProvider = cdnString;
+    sourceConfig.analytics.videoId = _streamObject.metadata.prid;
+    sourceConfig.analytics.title = _streamObject.metadata.title;
+    sourceConfig.analytics = {
+        ...sourceConfig.analytics,
+        ..._sourceConfig.analytics
+    };
+    const getSubtitleLabels = function (data) {
+        if (data.label === 'nl') {
+            return 'Nederlands';
+        }
+        return data.label;
+    };
+    const getQualityLabels = function (data) {
+        return data.height + 'p';
+    };
+    if (sourceConfig.progressive !== '') {
+        sourceConfig.labeling = {
+            dash: {
+                qualities: getQualityLabels,
+                subtitles: getSubtitleLabels
+            },
+            hls: {
+                qualities: getQualityLabels,
+                subtitles: getSubtitleLabels
+            }
+        };
+    }
+    return sourceConfig;
+}
+//# sourceMappingURL=processsourceconfig.js.map

package/lib/js/playeractions/handlers/processsourceconfig.js.map

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

package/lib/js/playeractions/playeractions.d.ts

@@ -2,3 +2,4 @@ export { resolveKeyPress } from "./handlers/resolvekeypress";
 export { handleStartOffset, handleLiveOffsetLogic, shiftToProgramStart } from "./handlers/handleoffsets";
 export { handlePlayerError } from "./handlers/error";
 export { processPlayerConfig } from "./handlers/processplayerconfig";
+export { processSourceConfig } from "./handlers/processsourceconfig";

package/lib/js/playeractions/playeractions.js

@@ -2,4 +2,5 @@ export { resolveKeyPress } from "./handlers/resolvekeypress";
 export { handleStartOffset, handleLiveOffsetLogic, shiftToProgramStart } from "./handlers/handleoffsets";
 export { handlePlayerError } from "./handlers/error";
 export { processPlayerConfig } from "./handlers/processplayerconfig";
+export { processSourceConfig } from "./handlers/processsourceconfig";
 //# sourceMappingURL=playeractions.js.map

package/lib/js/playeractions/playeractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"playeractions.js","sourceRoot":"","sources":["../../../../src/js/playeractions/playeractions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA"}
+{"version":3,"file":"playeractions.js","sourceRoot":"","sources":["../../../../src/js/playeractions/playeractions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA"}

package/lib/js/tracking/handlers/eventbinding.js

@@ -1,22 +1,13 @@
 import { PlayerEvent, ViewMode } from 'bitmovin-player';
 import { logEvent } from './eventlogging';
+const logEventHandlers = new Map();
 export function bindPlayerEvents(npoplayer, player) {
     if (player == null)
         return;
     let isNewSource = false;
-    const playerEvents = [
-        { event: PlayerEvent.Paused, name: 'pause' },
-        { event: PlayerEvent.SourceLoaded, name: 'load_complete' },
-        { event: PlayerEvent.Ready, name: 'load_complete' },
-        { event: PlayerEvent.StallStarted, name: 'buffering' },
-        { event: PlayerEvent.StallEnded, name: 'buffering_complete' },
-        { event: PlayerEvent.PlaybackFinished, name: 'complete' },
-        { event: PlayerEvent.TimeChanged, name: 'time' },
-        { event: PlayerEvent.SourceUnloaded, name: 'stop' },
-        { event: PlayerEvent.Destroy, name: 'stop' },
-    ];
-    const logEventHandler = (npoplayer, eventName, event) => {
-        return () => {
+    let isSeeking = false;
+    const logEventHandler = (eventName) => {
+        return (event) => {
             const timeDifference = npoplayer.streamObject.stream.isLiveStream
                 ? event.position - Date.now() / 1000
                 : event.position;
@@ -24,6 +15,7 @@ export function bindPlayerEvents(npoplayer, player) {
         };
     };
     const seekHandler = (e) => {
+        isSeeking = true;
         let data = {};
         if (e.type === 'timeshift') {
             const timeDifferencePosition = -1 * (Date.now() / 1000 - e.position);
@@ -48,11 +40,14 @@ export function bindPlayerEvents(npoplayer, player) {
         }
     };
     const handlePlay = (e) => {
-        if (!isNewSource) {
+        if (!isNewSource && !isSeeking) {
             logEvent(npoplayer, 'resume', e.position);
         }
     };
     const handlePlaying = (e) => {
+        if (isSeeking) {
+            isSeeking = false;
+        }
         if (isNewSource) {
             logEvent(npoplayer, 'start', e.position);
             isNewSource = false;
@@ -67,29 +62,41 @@ export function bindPlayerEvents(npoplayer, player) {
             logEvent(npoplayer, 'windowed', e.position);
         }
     };
-    function stopBeforeUnload(e) {
-        logEvent(npoplayer, 'stop', e.position);
+    const stopBeforeUnload = () => {
+        logEvent(npoplayer, 'stop', {});
+    };
+    for (const [key, value] of logEventHandlers) {
+        player.off(key, value);
     }
-    player.off(PlayerEvent.SourceLoaded, handleSourceLoaded);
-    player.off(PlayerEvent.Seek, seekHandler);
-    player.off(PlayerEvent.Play, handlePlay);
-    player.off(PlayerEvent.Playing, handlePlaying);
-    player.off(PlayerEvent.ViewModeChanged, handleViewModeChange);
-    playerEvents.forEach(({ event, name }) => {
-        const handler = logEventHandler(npoplayer, name, event);
-        player.off(event, handler);
+    window.removeEventListener('beforeunload', logEventHandlers.get('stopBeforeUnload'));
+    logEventHandlers.clear();
+    const playerEvents = [
+        { event: PlayerEvent.Paused, name: 'pause' },
+        { event: PlayerEvent.SourceLoaded, handler: handleSourceLoaded },
+        { event: PlayerEvent.Ready, name: 'load_complete' },
+        { event: PlayerEvent.StallStarted, name: 'buffering' },
+        { event: PlayerEvent.StallEnded, name: 'buffering_complete' },
+        { event: PlayerEvent.PlaybackFinished, name: 'complete' },
+        { event: PlayerEvent.TimeChanged, name: 'time' },
+        { event: PlayerEvent.SourceUnloaded, name: 'stop' },
+        { event: PlayerEvent.Destroy, name: 'stop' },
+    ];
+    playerEvents.forEach(({ event, name, handler }) => {
+        handler = handler || logEventHandler(name);
+        logEventHandlers.set(event, handler);
+        player.on(event, handler);
     });
-    window.removeEventListener('beforeunload', stopBeforeUnload);
-    player.on(PlayerEvent.SourceLoaded, handleSourceLoaded);
+    logEventHandlers.set(PlayerEvent.Seek, seekHandler);
     player.on(PlayerEvent.Seek, seekHandler);
+    logEventHandlers.set(PlayerEvent.TimeShift, seekHandler);
     player.on(PlayerEvent.TimeShift, seekHandler);
+    logEventHandlers.set(PlayerEvent.Play, handlePlay);
     player.on(PlayerEvent.Play, handlePlay);
+    logEventHandlers.set(PlayerEvent.Playing, handlePlaying);
     player.on(PlayerEvent.Playing, handlePlaying);
+    logEventHandlers.set(PlayerEvent.ViewModeChanged, handleViewModeChange);
     player.on(PlayerEvent.ViewModeChanged, handleViewModeChange);
-    playerEvents.forEach(({ event, name }) => {
-        const handler = logEventHandler(npoplayer, name, event);
-        player.on(event, handler);
-    });
+    logEventHandlers.set('beforeunload', stopBeforeUnload);
     window.addEventListener('beforeunload', stopBeforeUnload);
 }
 //# sourceMappingURL=eventbinding.js.map

package/lib/js/tracking/handlers/eventbinding.js.map

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

package/lib/js/tracking/handlers/eventlogging.js

@@ -5,7 +5,7 @@ export function logEvent(npoplayer, event, data) {
         npoplayer.player.getCurrentTime();
     }
     catch (e) {
-        console.log('Er gaat iets mis met de player API', e);
+        console.warn('Er gaat iets mis met de player API', e);
     }
     const streamOptions = { stream_position: npoplayer.player.getCurrentTime() };
     const eventHandlers = {

package/lib/js/tracking/handlers/eventlogging.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventlogging.js","sourceRoot":"","sources":["../../../../../src/js/tracking/handlers/eventlogging.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,QAAQ,CAAE,SAAoB,EAAE,KAAa,EAAE,IAAU;IACrE,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa;QAAE,OAAM;IAEzD,IAAI;QACA,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,CAAA;KACpC;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAAE,CAAC,CAAC,CAAA;KACvD;IACD,MAAM,aAAa,GAAG,EAAE,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAA;IAE5E,MAAM,aAAa,GAAiD;QAChE,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,KAAK;QACpC,SAAS,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS;QAC5C,kBAAkB,EAAE,SAAS,CAAC,aAAa,CAAC,kBAAkB;QAC9D,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ;QAC1C,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,UAAU;QAC9C,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,IAAI;QAClC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,aAAa;QACpD,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,KAAK;QACpC,MAAM,EAAE,SAAS,CAAC,aAAa,CAAC,MAAM;QACtC,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,IAAI;QAClC,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ;QAC1C,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,IAAI;QAElC,IAAI,EAAE,GAAG,EAAE;YACP,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACvC,CAAC;KACJ,CAAA;IAED,MAAM,oBAAoB,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IACjD,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IAC5C,oBAAoB,CAAC,aAAa,CAAC,CAAA;AACvC,CAAC"}
+{"version":3,"file":"eventlogging.js","sourceRoot":"","sources":["../../../../../src/js/tracking/handlers/eventlogging.ts"],"names":[],"mappings":"AAYA,MAAM,UAAU,QAAQ,CAAE,SAAoB,EAAE,KAAa,EAAE,IAAU;IACrE,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa;QAAE,OAAM;IAEzD,IAAI;QACA,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,CAAA;KACpC;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,CAAC,IAAI,CAAC,oCAAoC,EAAE,CAAC,CAAC,CAAA;KACxD;IACD,MAAM,aAAa,GAAG,EAAE,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAA;IAE5E,MAAM,aAAa,GAAiD;QAChE,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,KAAK;QACpC,SAAS,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS;QAC5C,kBAAkB,EAAE,SAAS,CAAC,aAAa,CAAC,kBAAkB;QAC9D,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ;QAC1C,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,UAAU;QAC9C,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,IAAI;QAClC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,aAAa;QACpD,KAAK,EAAE,SAAS,CAAC,aAAa,CAAC,KAAK;QACpC,MAAM,EAAE,SAAS,CAAC,aAAa,CAAC,MAAM;QACtC,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,IAAI;QAClC,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,QAAQ;QAC1C,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,IAAI;QAElC,IAAI,EAAE,GAAG,EAAE;YACP,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QACvC,CAAC;KACJ,CAAA;IAED,MAAM,oBAAoB,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IACjD,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IAC5C,oBAAoB,CAAC,aAAa,CAAC,CAAA;AACvC,CAAC"}

package/lib/js/ui/components/audio/controlbar.d.ts

@@ -0,0 +1,3 @@
+import { ControlBar } from 'bitmovin-player-ui';
+import type NpoPlayer from '../../../../npoplayer';
+export declare function createAudioControlBar(npoplayer: NpoPlayer): ControlBar;

package/lib/js/ui/components/audio/controlbar.js

@@ -0,0 +1,23 @@
+import { ControlBar, Container, SeekBar, SeekBarLabel, VolumeControlButton } from 'bitmovin-player-ui';
+import { createSeekBar } from '../seekbar';
+export function createAudioControlBar(npoplayer) {
+    const seekBar = new SeekBar({ label: new SeekBarLabel() });
+    npoplayer.uiComponents.seekBar = seekBar;
+    const controlbar = new ControlBar({
+        components: [
+            createSeekBar(npoplayer),
+            new Container({
+                components: [
+                    new VolumeControlButton({
+                        vertical: true,
+                    }),
+                ],
+                cssClasses: ['controlbar-bottom']
+            })
+        ],
+        cssClasses: ['ui-controlbar-bottom']
+    });
+    npoplayer.uiComponents.controlbar = controlbar;
+    return controlbar;
+}
+//# sourceMappingURL=controlbar.js.map

package/lib/js/ui/components/audio/controlbar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"controlbar.js","sourceRoot":"","sources":["../../../../../../src/js/ui/components/audio/controlbar.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,SAAS,EACT,OAAO,EACP,YAAY,EACZ,mBAAmB,EACtB,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,MAAM,UAAU,qBAAqB,CACjC,SAAoB;IAEpB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,YAAY,EAAE,EAAE,CAAC,CAAA;IAC1D,SAAS,CAAC,YAAY,CAAC,OAAO,GAAG,OAAO,CAAA;IAExC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;QAC9B,UAAU,EAAE;YACR,aAAa,CAAC,SAAS,CAAC;YACxB,IAAI,SAAS,CAAC;gBACV,UAAU,EAAE;oBACR,IAAI,mBAAmB,CAAC;wBACpB,QAAQ,EAAE,IAAI;qBACjB,CAAC;iBACL;gBACD,UAAU,EAAE,CAAC,mBAAmB,CAAC;aACpC,CAAC;SACL;QACD,UAAU,EAAE,CAAC,sBAAsB,CAAC;KACvC,CAAC,CAAA;IAGF,SAAS,CAAC,YAAY,CAAC,UAAU,GAAG,UAAU,CAAA;IAE9C,OAAO,UAAU,CAAA;AACrB,CAAC"}

package/lib/js/ui/components/controlbar.js

@@ -1,7 +1,8 @@
-import { ControlBar, Container, PlaybackTimeLabel, PlaybackTimeLabelMode, SeekBar, SeekBarLabel, PlaybackToggleButton, VolumeToggleButton, VolumeSlider, Spacer, PictureInPictureToggleButton, AirPlayToggleButton, CastToggleButton, SettingsToggleButton, FullscreenToggleButton } from 'bitmovin-player-ui';
+import { ControlBar, Container, SeekBar, SeekBarLabel, PlaybackToggleButton, VolumeToggleButton, VolumeSlider, Spacer, PictureInPictureToggleButton, AirPlayToggleButton, CastToggleButton, SettingsToggleButton, FullscreenToggleButton } from 'bitmovin-player-ui';
 import { airPlaySupported } from '../../../js/utilities/utilities';
 import { PlayerEvent } from 'bitmovin-player';
 import { createForwardButton, createRewindButton } from './buttons';
+import { createSeekBar } from './seekbar';
 export function createControlBar(npoplayer, settingsPanel) {
     const player = npoplayer.player;
     const rewindButton = createRewindButton(player);
@@ -17,21 +18,7 @@ export function createControlBar(npoplayer, settingsPanel) {
     });
     const controlbar = new ControlBar({
         components: [
-            new Container({
-                components: [
-                    new PlaybackTimeLabel({
-                        timeLabelMode: PlaybackTimeLabelMode.CurrentTime,
-                        hideInLivePlayback: true,
-                        cssClasses: ['current-time']
-                    }),
-                    seekBar,
-                    new PlaybackTimeLabel({
-                        timeLabelMode: PlaybackTimeLabelMode.TotalTime,
-                        cssClasses: ['total-time']
-                    })
-                ],
-                cssClasses: ['controlbar-top']
-            }),
+            createSeekBar(npoplayer),
             new Container({
                 components: [
                     new PlaybackToggleButton(),

package/lib/js/ui/components/controlbar.js.map

@@ -1 +1 @@
-{"version":3,"file":"controlbar.js","sourceRoot":"","sources":["../../../../../src/js/ui/components/controlbar.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,SAAS,EACT,iBAAiB,EACjB,qBAAqB,EACrB,OAAO,EACP,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,EAClB,YAAY,EACZ,MAAM,EACN,4BAA4B,EAC5B,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EAEzB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAEnE,MAAM,UAAU,gBAAgB,CAC5B,SAAoB,EACpB,aAA4B;IAE5B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;IAE/B,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAC/C,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAEjD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,YAAY,EAAE,EAAE,CAAC,CAAA;IAC1D,SAAS,CAAC,YAAY,CAAC,OAAO,GAAG,OAAO,CAAA;IAExC,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC;QAC1C,MAAM,EAAE,IAAI;KACf,CAAC,CAAA;IAEF,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,aAAa,EAAE,GAAG,EAAE;QACvC,IAAG,MAAM,CAAC,eAAe,EAAE;YAAE,gBAAgB,CAAC,IAAI,EAAE,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;QAC9B,UAAU,EAAE;YACR,IAAI,SAAS,CAAC;gBACV,UAAU,EAAE;oBACR,IAAI,iBAAiB,CAAC;wBAClB,aAAa,EAAE,qBAAqB,CAAC,WAAW;wBAChD,kBAAkB,EAAE,IAAI;wBACxB,UAAU,EAAE,CAAC,cAAc,CAAC;qBAC/B,CAAC;oBACF,OAAO;oBACP,IAAI,iBAAiB,CAAC;wBAClB,aAAa,EAAE,qBAAqB,CAAC,SAAS;wBAC9C,UAAU,EAAE,CAAC,YAAY,CAAC;qBAC7B,CAAC;iBACL;gBACD,UAAU,EAAE,CAAC,gBAAgB,CAAC;aACjC,CAAC;YACF,IAAI,SAAS,CAAC;gBACV,UAAU,EAAE;oBACR,IAAI,oBAAoB,EAAE;oBAC1B,IAAI,kBAAkB,EAAE;oBACxB,IAAI,YAAY,EAAE;oBAClB,YAAY;oBACZ,aAAa;oBACb,IAAI,MAAM,EAAE;oBACZ,GAAG,CAAC,QAAQ,CAAC,uBAAuB,IAAI,gCAAgC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/I,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1D,gBAAgB;oBAChB,IAAI,oBAAoB,CAAC,EAAE,aAAa,EAAE,CAAC;oBAC3C,IAAI,sBAAsB,EAAE;iBAC/B;gBACD,UAAU,EAAE,CAAC,mBAAmB,CAAC;aACpC,CAAC;SACL;QACD,UAAU,EAAE,CAAC,sBAAsB,CAAC;KACvC,CAAC,CAAA;IAGF,SAAS,CAAC,YAAY,CAAC,UAAU,GAAG,UAAU,CAAA;IAE9C,OAAO,UAAU,CAAA;AACrB,CAAC"}
+{"version":3,"file":"controlbar.js","sourceRoot":"","sources":["../../../../../src/js/ui/components/controlbar.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,UAAU,EACV,SAAS,EACT,OAAO,EACP,YAAY,EACZ,oBAAoB,EACpB,kBAAkB,EAClB,YAAY,EACZ,MAAM,EACN,4BAA4B,EAC5B,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EAEzB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,UAAU,gBAAgB,CAC5B,SAAoB,EACpB,aAA4B;IAE5B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;IAE/B,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAA;IAC/C,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAEjD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,YAAY,EAAE,EAAE,CAAC,CAAA;IAC1D,SAAS,CAAC,YAAY,CAAC,OAAO,GAAG,OAAO,CAAA;IAExC,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC;QAC1C,MAAM,EAAE,IAAI;KACf,CAAC,CAAA;IAEF,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,aAAa,EAAE,GAAG,EAAE;QACvC,IAAG,MAAM,CAAC,eAAe,EAAE;YAAE,gBAAgB,CAAC,IAAI,EAAE,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC;QAC9B,UAAU,EAAE;YACR,aAAa,CAAC,SAAS,CAAC;YACxB,IAAI,SAAS,CAAC;gBACV,UAAU,EAAE;oBACR,IAAI,oBAAoB,EAAE;oBAC1B,IAAI,kBAAkB,EAAE;oBACxB,IAAI,YAAY,EAAE;oBAClB,YAAY;oBACZ,aAAa;oBACb,IAAI,MAAM,EAAE;oBACZ,GAAG,CAAC,QAAQ,CAAC,uBAAuB,IAAI,gCAAgC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/I,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1D,gBAAgB;oBAChB,IAAI,oBAAoB,CAAC,EAAE,aAAa,EAAE,CAAC;oBAC3C,IAAI,sBAAsB,EAAE;iBAC/B;gBACD,UAAU,EAAE,CAAC,mBAAmB,CAAC;aACpC,CAAC;SACL;QACD,UAAU,EAAE,CAAC,sBAAsB,CAAC;KACvC,CAAC,CAAA;IAGF,SAAS,CAAC,YAAY,CAAC,UAAU,GAAG,UAAU,CAAA;IAE9C,OAAO,UAAU,CAAA;AACrB,CAAC"}

package/lib/js/ui/components/nativemobile/buttons.d.ts

@@ -20,8 +20,8 @@ export declare function createGoBackLiveButton(player: PlayerAPI): Button<{
 }>;
 export declare function createSettingsButton(settingsPanel: SettingsPanel): SettingsToggleButton;
 export declare function createPlaybackToggleButton(): PlaybackToggleButton;
-export declare function createVolumeToggleButton(): VolumeToggleButton;
-export declare function createPictureInPictureToggleButton(): PictureInPictureToggleButton;
+export declare function createVolumeToggleButton(player: PlayerAPI): VolumeToggleButton;
+export declare function createPictureInPictureToggleButton(player: PlayerAPI): PictureInPictureToggleButton;
 export declare function createAirPlayToggleButton(): AirPlayToggleButton;
 export declare function createCastToggleButton(): CastToggleButton;
-export declare function createFullscreenToggleButton(): FullscreenToggleButton;
+export declare function createFullscreenToggleButton(player: PlayerAPI): FullscreenToggleButton;