@npo/player 1.11.4 → 1.13.0

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/handlers/resolvekeypress.js

@@ -42,6 +42,12 @@ export function resolveKeyPress(player, npoplayer, e) {
             npoplayer.goForward(10);
             break;
         }
+        case 'Escape': {
+            if (npoplayer.uiComponents.settingsPanel && npoplayer.uiComponents.settingsPanel.isShown()) {
+                npoplayer.uiComponents.settingsPanel?.hide();
+            }
+            break;
+        }
     }
 }
 //# sourceMappingURL=resolvekeypress.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"resolvekeypress.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/resolvekeypress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAY3D,MAAM,UAAU,eAAe,CAAC,MAAiB,EAAE,SAAoB,EAAE,CAAgB;IACrF,QAAO,CAAC,CAAC,IAAI,EAAE;QACX,KAAK,MAAM,CAAC,CAAC;YACT,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC;YAC1C,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC1C,MAAM;SACT;QACD,KAAK,MAAM,CAAC,CAAC;YACT,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,UAAU,EAAE;gBAC9C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;aAC3C;iBAAM;gBACH,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aACvC;YACD,MAAM;SACT;QACD,KAAK,OAAO,CAAC,CAAC;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC;YAC5C,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1C,MAAM;SACT;QACD,KAAK,SAAS,CAAC,CAAC;YACZ,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC;YAC1C,IAAI,OAAO;gBAAE,MAAM,CAAC,MAAM,EAAE,CAAC;YAC7B,SAAS,CAAC,cAAc,EAAE,CAAC;YAC3B,MAAM;SACT;QACD,KAAK,WAAW,CAAC,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC;YAC1C,IAAI,OAAO;gBAAE,MAAM,CAAC,MAAM,EAAE,CAAC;YAC7B,SAAS,CAAC,cAAc,EAAE,CAAC;YAC3B,MAAM;SACT;QACD,KAAK,WAAW,CAAC,CAAC;YACd,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAC1B,MAAM;SACT;QACD,KAAK,YAAY,CAAC,CAAC;YACf,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACxB,MAAM;SACT;KACJ;AACL,CAAC"}
+{"version":3,"file":"resolvekeypress.js","sourceRoot":"","sources":["../../../../../src/js/playeractions/handlers/resolvekeypress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAY1D,MAAM,UAAU,eAAe,CAAC,MAAiB,EAAE,SAAoB,EAAE,CAAgB;IACrF,QAAQ,CAAC,CAAC,IAAI,EAAE;QACZ,KAAK,MAAM,CAAC,CAAC;YACT,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAA;YACzC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YACzC,MAAK;SACR;QACD,KAAK,MAAM,CAAC,CAAC;YACT,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,UAAU,EAAE;gBAC9C,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;aAC1C;iBAAM;gBACH,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;aACtC;YACD,MAAK;SACR;QACD,KAAK,OAAO,CAAC,CAAC;YACV,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAA;YAC3C,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;YACzC,MAAK;SACR;QACD,KAAK,SAAS,CAAC,CAAC;YACZ,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAA;YACzC,IAAI,OAAO;gBAAE,MAAM,CAAC,MAAM,EAAE,CAAA;YAC5B,SAAS,CAAC,cAAc,EAAE,CAAA;YAC1B,MAAK;SACR;QACD,KAAK,WAAW,CAAC,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAA;YACzC,IAAI,OAAO;gBAAE,MAAM,CAAC,MAAM,EAAE,CAAA;YAC5B,SAAS,CAAC,cAAc,EAAE,CAAA;YAC1B,MAAK;SACR;QACD,KAAK,WAAW,CAAC,CAAC;YACd,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACzB,MAAK;SACR;QACD,KAAK,YAAY,CAAC,CAAC;YACf,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;YACvB,MAAK;SACR;QACD,KAAK,QAAQ,CAAC,CAAC;YACX,IAAI,SAAS,CAAC,YAAY,CAAC,aAAa,IAAI,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE;gBACxF,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,IAAI,EAAE,CAAA;aAC/C;YACD,MAAK;SACR;KACJ;AACL,CAAC"}

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,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC"}
+{"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

@@ -12,59 +12,82 @@ export function bindPlayerEvents(npoplayer, player) {
         { event: PlayerEvent.StallEnded, name: 'buffering_complete' },
         { event: PlayerEvent.PlaybackFinished, name: 'complete' },
         { event: PlayerEvent.TimeChanged, name: 'time' },
-        {
-            event: PlayerEvent.ViewModeChanged,
-            name: player.getViewMode() === ViewMode.Fullscreen
-                ? 'fullscreen'
-                : 'windowed'
-        },
         { event: PlayerEvent.SourceUnloaded, name: 'stop' },
         { event: PlayerEvent.Destroy, name: 'stop' },
     ];
-    const logEventHandler = (npoplayer, eventName) => {
+    const logEventHandler = (npoplayer, eventName, event) => {
         return () => {
-            logEvent(npoplayer, eventName);
+            const timeDifference = npoplayer.streamObject.stream.isLiveStream
+                ? event.position - Date.now() / 1000
+                : event.position;
+            logEvent(npoplayer, eventName, timeDifference);
         };
     };
     const seekHandler = (e) => {
-        const data = {
-            seek_from: e.position,
-            stream_position: e.seekTarget
-        };
-        logEvent(npoplayer, 'seek', data);
+        let data = {};
+        if (e.type === 'timeshift') {
+            const timeDifferencePosition = -1 * (Date.now() / 1000 - e.position);
+            const timeDifferenceTarget = -1 * (Date.now() / 1000 - e.target);
+            data = {
+                seek_from: parseFloat(timeDifferencePosition.toFixed(3)),
+                stream_position: parseFloat(timeDifferenceTarget.toFixed(3)),
+            };
+        }
+        else if (e.type === 'seek') {
+            data = {
+                seek_from: e.position,
+                stream_position: e.seekTarget,
+            };
+        }
+        logEvent(npoplayer, e.type, data);
     };
-    const handleSourceLoaded = () => {
+    const handleSourceLoaded = (e) => {
         isNewSource = true;
+        if (npoplayer.streamObject.stream.isLiveStream) {
+            logEvent(npoplayer, 'stop', e.position);
+        }
     };
-    const handlePlay = () => {
+    const handlePlay = (e) => {
         if (!isNewSource) {
-            logEvent(npoplayer, 'resume');
+            logEvent(npoplayer, 'resume', e.position);
         }
     };
-    const handlePlaying = () => {
+    const handlePlaying = (e) => {
         if (isNewSource) {
-            logEvent(npoplayer, 'start');
+            logEvent(npoplayer, 'start', e.position);
             isNewSource = false;
         }
     };
-    function stopBeforeUnload() {
-        logEvent(npoplayer, 'stop');
+    const handleViewModeChange = (e) => {
+        const newViewMode = player.getViewMode();
+        if (newViewMode === ViewMode.Fullscreen) {
+            logEvent(npoplayer, 'fullscreen', e.position);
+        }
+        else {
+            logEvent(npoplayer, 'windowed', e.position);
+        }
+    };
+    function stopBeforeUnload(e) {
+        logEvent(npoplayer, 'stop', e.position);
     }
     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);
+        const handler = logEventHandler(npoplayer, name, event);
         player.off(event, handler);
     });
     window.removeEventListener('beforeunload', stopBeforeUnload);
     player.on(PlayerEvent.SourceLoaded, handleSourceLoaded);
     player.on(PlayerEvent.Seek, seekHandler);
+    player.on(PlayerEvent.TimeShift, seekHandler);
     player.on(PlayerEvent.Play, handlePlay);
     player.on(PlayerEvent.Playing, handlePlaying);
+    player.on(PlayerEvent.ViewModeChanged, handleViewModeChange);
     playerEvents.forEach(({ event, name }) => {
-        const handler = logEventHandler(npoplayer, name);
+        const handler = logEventHandler(npoplayer, name, event);
         player.on(event, handler);
     });
     window.addEventListener('beforeunload', stopBeforeUnload);

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,OAAO;IAE1D,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/tracking/handlers/playertrackerinit.js

@@ -4,11 +4,13 @@ const npoTagPlugins = [
     newATInternetPlugin()
 ];
 export function initPlayerTracker(npoplayer, _npotag, _npotaginstance) {
-    npoplayer.npoTag = {
-        npoTagInstance: undefined,
-        pageTracker: null,
-        heartbeatInterval: undefined
-    };
+    if (!npoplayer.npoTag) {
+        npoplayer.npoTag = {
+            npoTagInstance: undefined,
+            pageTracker: null,
+            heartbeatInterval: undefined
+        };
+    }
     npoplayer.npoTag.npoTagInstance =
         _npotag != null
             ? newTag(_npotag, npoTagPlugins)

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

@@ -1 +1 @@
-{"version":3,"file":"playertrackerinit.js","sourceRoot":"","sources":["../../../../../src/js/tracking/handlers/playertrackerinit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAe,MAAM,EAAE,MAAM,aAAa,CAAA;AAIxG,MAAM,aAAa,GAAG;IAClB,gBAAgB,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC;IACrE,mBAAmB,EAAE;CACxB,CAAA;AAWD,MAAM,UAAU,iBAAiB,CAAE,SAAoB,EAAE,OAAoC,EAAE,eAAwB;IACnH,SAAS,CAAC,MAAM,GAAG;QACf,cAAc,EAAE,SAAS;QACzB,WAAW,EAAE,IAAI;QACjB,iBAAiB,EAAE,SAAS;KAC/B,CAAA;IACD,SAAS,CAAC,MAAM,CAAC,cAAc;QACvB,OAAO,IAAI,IAAI;YACX,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC;YAChC,CAAC,CAAC,eAAe,CAAA;IAC7B,IAAI,SAAS,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,EAAE;QACzC,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG,cAAc,CACzC,SAAS,CAAC,MAAM,CAAC,cAAc,CAClC,CAAA;KACJ;AACL,CAAC"}
+{"version":3,"file":"playertrackerinit.js","sourceRoot":"","sources":["../../../../../src/js/tracking/handlers/playertrackerinit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAe,MAAM,EAAE,MAAM,aAAa,CAAA;AAIxG,MAAM,aAAa,GAAG;IAClB,gBAAgB,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC;IACrE,mBAAmB,EAAE;CACxB,CAAA;AAWD,MAAM,UAAU,iBAAiB,CAAE,SAAoB,EAAE,OAAoC,EAAE,eAAwB;IACnH,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;QACnB,SAAS,CAAC,MAAM,GAAG;YACf,cAAc,EAAE,SAAS;YACzB,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,SAAS;SAC/B,CAAA;KACJ;IACD,SAAS,CAAC,MAAM,CAAC,cAAc;QACvB,OAAO,IAAI,IAAI;YACX,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC;YAChC,CAAC,CAAC,eAAe,CAAA;IAC7B,IAAI,SAAS,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,EAAE;QACzC,SAAS,CAAC,MAAM,CAAC,WAAW,GAAG,cAAc,CACzC,SAAS,CAAC,MAAM,CAAC,cAAc,CAClC,CAAA;KACJ;AACL,CAAC"}

package/lib/js/tracking/handlers/playertrackerstart.d.ts

@@ -1 +1 @@
-export declare function startPlayerTracker(playerInstance: any, duration: number, version: string): void;
+export declare function startPlayerTracker(playerInstance: any, duration: number, version: string, source: string | null): void;

package/lib/js/tracking/handlers/playertrackerstart.js

@@ -1,19 +1,21 @@
 import { newStreamTracker } from '@npotag/tag';
 import { bindPlayerEvents } from './eventbinding';
 import { validatePrid } from '../../utilities/utilities';
-export function startPlayerTracker(playerInstance, duration, version) {
+export function startPlayerTracker(playerInstance, duration, version, source) {
+    playerInstance.streamTracker = null;
+    let streamTrackerConfig = null;
     if (playerInstance.npoTag?.pageTracker == null) {
         console.error('No pageTracker available');
     }
-    else if (playerInstance.streamTracker == null) {
+    else {
         const avTypeMapping = {
             'vod': 'video',
             'aod': 'audio'
         };
         const avType = avTypeMapping[playerInstance.streamObject.stream.avType];
-        const streamTrackerConfig = {
+        streamTrackerConfig = {
             stream_length: duration,
-            stream_id: validatePrid(playerInstance.streamObject.metadata.prid),
+            stream_id: validatePrid(source),
             player_id: 'npoplayer-web',
             av_type: avType,
             player_version: version,

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

@@ -1 +1 @@
-{"version":3,"file":"playertrackerstart.js","sourceRoot":"","sources":["../../../../../src/js/tracking/handlers/playertrackerstart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAWxD,MAAM,UAAU,kBAAkB,CAAE,cAAmB,EAAE,QAAgB,EAAE,OAAe;IACtF,IAAI,cAAc,CAAC,MAAM,EAAE,WAAW,IAAI,IAAI,EAAE;QAC5C,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;KAC5C;SAAM,IAAI,cAAc,CAAC,aAAa,IAAI,IAAI,EAAE;QAE7C,MAAM,aAAa,GAA2B;YAC1C,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,OAAO;SACjB,CAAC;QAEF,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAExE,MAAM,mBAAmB,GAAG;YACxB,aAAa,EAAE,QAAQ;YACvB,SAAS,EAAE,YAAY,CAAC,cAAc,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;YAClE,SAAS,EAAE,eAAe;YAC1B,OAAO,EAAE,MAAM;YACf,cAAc,EAAE,OAAO;YACvB,kBAAkB,EAAE,OAAO;SAC9B,CAAC;QACF,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAE7F,cAAc,CAAC,aAAa,GAAG,gBAAgB,CAC3C,cAAc,CAAC,MAAM,CAAC,WAAW,EACjC,mBAAmB,EACnB,YAAY,CACf,CAAC;QAEF,gBAAgB,CAAC,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;KAC1D;AACL,CAAC"}
+{"version":3,"file":"playertrackerstart.js","sourceRoot":"","sources":["../../../../../src/js/tracking/handlers/playertrackerstart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAWxD,MAAM,UAAU,kBAAkB,CAAE,cAAmB,EAAE,QAAgB,EAAE,OAAe,EAAE,MAAqB;IAC7G,cAAc,CAAC,aAAa,GAAG,IAAI,CAAA;IACnC,IAAI,mBAAmB,GAAG,IAAI,CAAA;IAE9B,IAAI,cAAc,CAAC,MAAM,EAAE,WAAW,IAAI,IAAI,EAAE;QAC5C,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;KAC5C;SAAM;QAEH,MAAM,aAAa,GAA2B;YAC1C,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,OAAO;SACjB,CAAA;QAED,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAEvE,mBAAmB,GAAG;YAClB,aAAa,EAAE,QAAQ;YACvB,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC;YAC/B,SAAS,EAAE,eAAe;YAC1B,OAAO,EAAE,MAAM;YACf,cAAc,EAAE,OAAO;YACvB,kBAAkB,EAAE,OAAO;SAC9B,CAAA;QACD,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAE5F,cAAc,CAAC,aAAa,GAAG,gBAAgB,CAC3C,cAAc,CAAC,MAAM,CAAC,WAAW,EACjC,mBAAmB,EACnB,YAAY,CACf,CAAA;QAED,gBAAgB,CAAC,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;KAC1D;AACL,CAAC"}

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

@@ -4,27 +4,33 @@ import type NpoPlayer from '../../../npoplayer';
 export declare function createMiddleButtons(player: PlayerAPI): ControlBar;
 export declare function createRewindButton(player: PlayerAPI | null): Button<{
     cssClass: string;
+    ariaLabel: string;
 }>;
 export declare function createForwardButton(player: PlayerAPI | null): Button<{
     cssClass: string;
+    ariaLabel: string;
 }>;
 export declare function createPlayNextButton(player: PlayerAPI, npoplayer: NpoPlayer): Button<{
     cssClass: string;
     text: string;
+    ariaLabel: string;
     hidden: false;
 }>;
 export declare function createskipIntroButton(player: PlayerAPI): Button<{
     cssClass: string;
     text: string;
+    ariaLabel: string;
     hidden: true;
 }>;
 export declare function createGoBackLiveButton(player: PlayerAPI): Button<{
     cssClass: string;
     text: string;
+    ariaLabel: string;
     hidden: true;
 }>;
 export declare function createWatchFromStartButton(player: PlayerAPI, npoplayer: NpoPlayer): Button<{
     cssClass: string;
     text: string;
+    ariaLabel: string;
     hidden: true;
 }>;

package/lib/js/ui/components/buttons.js

@@ -13,7 +13,8 @@ export function createMiddleButtons(player) {
 }
 export function createRewindButton(player) {
     const rewindButton = new Button({
-        cssClass: 'ui-rewindbutton bmpui-ui-button'
+        cssClass: 'ui-rewindbutton bmpui-ui-button',
+        ariaLabel: 'Spoel 10 seconde terug',
     });
     if (player) {
         rewindButton.onClick.subscribe(() => {
@@ -24,7 +25,8 @@ export function createRewindButton(player) {
 }
 export function createForwardButton(player) {
     const forwardButton = new Button({
-        cssClass: 'ui-forwardbutton bmpui-ui-button'
+        cssClass: 'ui-forwardbutton bmpui-ui-button',
+        ariaLabel: 'Spoel 10 seconde vooruit',
     });
     if (player) {
         forwardButton.onClick.subscribe(() => {
@@ -37,6 +39,7 @@ export function createPlayNextButton(player, npoplayer) {
     const playNextButton = new Button({
         cssClass: 'ui-hugeplaynextbacktogglebutton ui-playNextButton bmpui-ui-button',
         text: 'De volgende aflevering wordt zo afgespeeld...',
+        ariaLabel: 'Speel volgende aflevering af',
         hidden: false
     });
     playNextButton.onClick.subscribe(() => {
@@ -50,6 +53,7 @@ export function createskipIntroButton(player) {
     const skipIntroButton = new Button({
         cssClass: 'ui-textbutton ui-skipintrobutton bmpui-ui-button bmpui-hidden',
         text: 'Intro overslaan',
+        ariaLabel: 'Intro overslaan',
         hidden: true
     });
     skipIntroButton.onClick.subscribe(() => {
@@ -63,6 +67,7 @@ export function createGoBackLiveButton(player) {
     const goBackLiveButton = new Button({
         cssClass: 'ui-textbutton ui-backtolivebutton bmpui-ui-button',
         text: 'Terug naar live',
+        ariaLabel: 'Terug naar live',
         hidden: true
     });
     goBackLiveButton.onClick.subscribe(() => {
@@ -76,6 +81,7 @@ export function createWatchFromStartButton(player, npoplayer) {
     const watchFromStartButton = new Button({
         cssClass: 'ui-textbutton ui-watchfromstartbutton bmpui-ui-button',
         text: 'Kijk vanaf het begin',
+        ariaLabel: 'Kijk vanaf het begin',
         hidden: true
     });
     watchFromStartButton.onClick.subscribe(() => {

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

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

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

@@ -17,7 +17,6 @@ export function createControlBar(npoplayer, settingsPanel) {
     });
     const controlbar = new ControlBar({
         components: [
-            settingsPanel,
             new Container({
                 components: [
                     new PlaybackTimeLabel({

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,aAAa;YACb,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,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"}

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

@@ -3,16 +3,19 @@ import { PlayerAPI } from 'bitmovin-player';
 export declare function createPlayNextButton(): Button<{
     cssClass: string;
     text: string;
+    ariaLabel: string;
     hidden: false;
 }>;
 export declare function createWatchFromStartButton(): Button<{
     cssClass: string;
     text: string;
+    ariaLabel: string;
     hidden: true;
 }>;
 export declare function createGoBackLiveButton(player: PlayerAPI): Button<{
     cssClass: string;
     text: string;
+    ariaLabel: string;
     hidden: true;
 }>;
 export declare function createSettingsButton(settingsPanel: SettingsPanel): SettingsToggleButton;
@@ -21,4 +24,4 @@ export declare function createVolumeToggleButton(): VolumeToggleButton;
 export declare function createPictureInPictureToggleButton(): PictureInPictureToggleButton;
 export declare function createAirPlayToggleButton(): AirPlayToggleButton;
 export declare function createCastToggleButton(): CastToggleButton;
-export declare function createFullscreenToggleButton(): FullscreenToggleButton;
+export declare function createFullscreenToggleButton(player: PlayerAPI): FullscreenToggleButton;