@gcorevideo/player 2.19.10 → 2.19.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core.js +25 -58
- package/dist/index.css +592 -592
- package/dist/index.js +27 -63
- package/dist/player.d.ts +1 -1
- package/dist/plugins/index.css +1487 -1487
- package/dist/plugins/index.js +2 -5
- package/lib/Player.d.ts +1 -3
- package/lib/Player.d.ts.map +1 -1
- package/lib/Player.js +22 -54
- package/lib/playback/dash-playback/DashPlayback.d.ts.map +1 -1
- package/lib/playback/dash-playback/DashPlayback.js +2 -3
- package/lib/plugins/media-control/MediaControl.d.ts +1 -1
- package/lib/plugins/media-control/MediaControl.d.ts.map +1 -1
- package/lib/plugins/media-control/MediaControl.js +2 -5
- package/package.json +1 -1
- package/src/Player.ts +23 -60
- package/src/playback/dash-playback/DashPlayback.ts +16 -10
- package/src/plugins/media-control/MediaControl.ts +2 -6
- package/tsconfig.tsbuildinfo +1 -1
package/dist/plugins/index.js
CHANGED
|
@@ -37219,7 +37219,7 @@ class MediaControl extends UICorePlugin {
|
|
|
37219
37219
|
$volumeBarScrubber = null;
|
|
37220
37220
|
$volumeContainer = null;
|
|
37221
37221
|
$volumeIcon = null;
|
|
37222
|
-
template = tmpl(mediaControlHTML);
|
|
37222
|
+
static template = tmpl(mediaControlHTML);
|
|
37223
37223
|
get name() {
|
|
37224
37224
|
return 'media_control';
|
|
37225
37225
|
}
|
|
@@ -38004,9 +38004,6 @@ class MediaControl extends UICorePlugin {
|
|
|
38004
38004
|
parseColors() {
|
|
38005
38005
|
const design = this.options.design || {};
|
|
38006
38006
|
let variables = [];
|
|
38007
|
-
if (!tmpl) {
|
|
38008
|
-
return;
|
|
38009
|
-
}
|
|
38010
38007
|
// TODO camel case
|
|
38011
38008
|
if (design.background_color) {
|
|
38012
38009
|
variables = variables.concat([
|
|
@@ -38049,7 +38046,7 @@ class MediaControl extends UICorePlugin {
|
|
|
38049
38046
|
}
|
|
38050
38047
|
render() {
|
|
38051
38048
|
const timeout = this.options.hideMediaControlDelay || 2000;
|
|
38052
|
-
const html =
|
|
38049
|
+
const html = MediaControl.template({ settings: this.settings ?? {} });
|
|
38053
38050
|
this.$el.html(html);
|
|
38054
38051
|
// const style = Styler.getStyleFor(mediaControlStyle, { baseUrl: this.options.baseUrl });
|
|
38055
38052
|
// this.$el.append(style[0]);
|
package/lib/Player.d.ts
CHANGED
|
@@ -33,8 +33,6 @@ export declare class Player {
|
|
|
33
33
|
private player;
|
|
34
34
|
private ready;
|
|
35
35
|
private rootNode;
|
|
36
|
-
private tuneInTimerId;
|
|
37
|
-
private tunedIn;
|
|
38
36
|
constructor(config: PlayerConfig);
|
|
39
37
|
/**
|
|
40
38
|
* Adds a listener to a player event
|
|
@@ -203,6 +201,6 @@ export declare class Player {
|
|
|
203
201
|
private configurePlaybacks;
|
|
204
202
|
private buildMediaSourcesList;
|
|
205
203
|
private bindContainerEventListeners;
|
|
206
|
-
private
|
|
204
|
+
private bindCoreListeners;
|
|
207
205
|
}
|
|
208
206
|
//# sourceMappingURL=Player.d.ts.map
|
package/lib/Player.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,aAAa,EAAyB,YAAY,EAAE,MAAM,YAAY,CAAA;AACpF,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAMtD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEjE;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,SAAS,WAAW,IACjD,CAAC,SAAS,WAAW,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,GACnC,CAAC,SAAS,WAAW,CAAC,YAAY,GAAG,CAAC,MAAM,CAAC,GAC7C,CAAC,SAAS,WAAW,CAAC,UAAU,GAAG,CAAC,YAAY,CAAC,GACjD,CAAC,SAAS,WAAW,CAAC,MAAM,GAAG,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAClE,CAAC,SAAS,WAAW,CAAC,UAAU,GAAG,CAAC,OAAO,CAAC,GAC5C,CAAC,SAAS,WAAW,CAAC,KAAK,GAAG,CAAC,aAAa,CAAC,GAC7C,EAAE,CAAA;AAEN;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,WAAW,IAAI,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAA;AAe/F;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,GAAG,aAAa,CAAA;AAI3D;;;;;;;GAOG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAgC;IAE9C,OAAO,CAAC,OAAO,CAAkB;IAEjC,OAAO,CAAC,MAAM,CAA4B;IAE1C,OAAO,CAAC,KAAK,CAAQ;IAErB,OAAO,CAAC,QAAQ,CAA2B;
|
|
1
|
+
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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"}
|
package/lib/Player.js
CHANGED
|
@@ -30,8 +30,6 @@ export class Player {
|
|
|
30
30
|
player = null;
|
|
31
31
|
ready = false;
|
|
32
32
|
rootNode = null;
|
|
33
|
-
tuneInTimerId = null;
|
|
34
|
-
tunedIn = false;
|
|
35
33
|
constructor(config) {
|
|
36
34
|
this.setConfig(config);
|
|
37
35
|
// TODO decide whether the order of playback modules might vary,
|
|
@@ -124,11 +122,6 @@ export class Player {
|
|
|
124
122
|
this.player = null;
|
|
125
123
|
}
|
|
126
124
|
this.ready = false;
|
|
127
|
-
this.tunedIn = false;
|
|
128
|
-
if (this.tuneInTimerId) {
|
|
129
|
-
clearTimeout(this.tuneInTimerId);
|
|
130
|
-
this.tuneInTimerId = null;
|
|
131
|
-
}
|
|
132
125
|
}
|
|
133
126
|
/**
|
|
134
127
|
* Current playback (time since the beginning of the stream), if appropriate.
|
|
@@ -287,36 +280,16 @@ export class Player {
|
|
|
287
280
|
assert.ok(!this.player, 'Player already initialized');
|
|
288
281
|
const player = new PlayerClappr(coreOptions);
|
|
289
282
|
this.player = player;
|
|
290
|
-
|
|
291
|
-
this.tuneInTimerId = globalThis.setTimeout(() => {
|
|
292
|
-
trace(`${T} tuneInTimer`, {
|
|
293
|
-
ready: this.ready,
|
|
294
|
-
tunedIn: this.tunedIn,
|
|
295
|
-
});
|
|
296
|
-
this.tuneInTimerId = null;
|
|
297
|
-
this.tuneIn();
|
|
298
|
-
}, 4000);
|
|
283
|
+
this.bindCoreListeners();
|
|
299
284
|
}
|
|
300
285
|
async tuneIn() {
|
|
301
286
|
assert.ok(this.player);
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
tunedIn: this.tunedIn,
|
|
305
|
-
});
|
|
306
|
-
if (this.tunedIn) {
|
|
307
|
-
return;
|
|
308
|
-
}
|
|
309
|
-
this.tunedIn = true;
|
|
310
|
-
const player = this.player;
|
|
311
|
-
this.bindContainerEventListeners(player);
|
|
312
|
-
player.core.on(ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED, () => this.bindContainerEventListeners(player), null);
|
|
313
|
-
this.bindSizeManagementListeners(player);
|
|
287
|
+
this.bindContainerEventListeners();
|
|
288
|
+
this.player.core.on(ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED, () => this.bindContainerEventListeners(), null);
|
|
314
289
|
if (this.config.autoPlay) {
|
|
290
|
+
trace(`${T} autoPlay`);
|
|
315
291
|
setTimeout(() => {
|
|
316
|
-
|
|
317
|
-
playback: this.player?.core.activePlayback.name,
|
|
318
|
-
});
|
|
319
|
-
player.play({
|
|
292
|
+
this.player?.play({
|
|
320
293
|
autoPlay: true,
|
|
321
294
|
});
|
|
322
295
|
}, 0);
|
|
@@ -346,11 +319,6 @@ export class Player {
|
|
|
346
319
|
return;
|
|
347
320
|
}
|
|
348
321
|
this.ready = true;
|
|
349
|
-
if (this.tuneInTimerId) {
|
|
350
|
-
clearTimeout(this.tuneInTimerId);
|
|
351
|
-
this.tuneInTimerId = null;
|
|
352
|
-
}
|
|
353
|
-
// TODO ensure that CORE_ACTIVE_CONTAINER_CHANGED does not get caught before onReady
|
|
354
322
|
setTimeout(() => this.tuneIn(), 0);
|
|
355
323
|
},
|
|
356
324
|
onPlay: () => {
|
|
@@ -383,15 +351,12 @@ export class Player {
|
|
|
383
351
|
sources,
|
|
384
352
|
});
|
|
385
353
|
this.rootNode = rootNode;
|
|
386
|
-
const coreOptions = $.extend(true,
|
|
354
|
+
const coreOptions = $.extend(true, {
|
|
387
355
|
allowUserInteraction: true,
|
|
388
356
|
autoPlay: false,
|
|
389
|
-
|
|
390
|
-
debug: this.config.debug || 'none',
|
|
357
|
+
debug: 'none',
|
|
391
358
|
events: this.events,
|
|
392
359
|
height: rootNode.clientHeight,
|
|
393
|
-
loop: this.config.loop,
|
|
394
|
-
mute: this.config.mute,
|
|
395
360
|
playback: {
|
|
396
361
|
controls: false,
|
|
397
362
|
playInline: true,
|
|
@@ -403,12 +368,11 @@ export class Player {
|
|
|
403
368
|
},
|
|
404
369
|
},
|
|
405
370
|
parent: rootNode,
|
|
406
|
-
playbackType: this.config.playbackType,
|
|
407
371
|
width: rootNode.clientWidth,
|
|
408
372
|
source: source ? source.source : undefined,
|
|
409
373
|
mimeType: source ? source.mimeType : undefined,
|
|
374
|
+
}, this.config, {
|
|
410
375
|
sources,
|
|
411
|
-
strings: this.config.strings,
|
|
412
376
|
});
|
|
413
377
|
return coreOptions;
|
|
414
378
|
}
|
|
@@ -420,23 +384,27 @@ export class Player {
|
|
|
420
384
|
// TODO ensure unsupported sources are filtered out
|
|
421
385
|
this.config.sources.map((s) => wrapSource(s)), this.config.priorityTransport);
|
|
422
386
|
}
|
|
423
|
-
bindContainerEventListeners(
|
|
424
|
-
|
|
425
|
-
|
|
387
|
+
bindContainerEventListeners() {
|
|
388
|
+
const activePlayback = this.player?.core.activePlayback;
|
|
389
|
+
const activeContainer = this.player?.core.activeContainer;
|
|
390
|
+
if (Browser.isiOS && activePlayback) {
|
|
391
|
+
// TODO check out
|
|
392
|
+
activePlayback.$el.on('webkitendfullscreen', () => {
|
|
426
393
|
try {
|
|
427
|
-
|
|
394
|
+
activeContainer?.handleFullscreenChange();
|
|
428
395
|
}
|
|
429
396
|
catch (e) {
|
|
430
397
|
reportError(e);
|
|
431
398
|
}
|
|
432
399
|
});
|
|
433
400
|
}
|
|
434
|
-
|
|
401
|
+
activeContainer?.on(ClapprEvents.CONTAINER_VOLUME, (volume) => {
|
|
435
402
|
this.safeTriggerEvent(PlayerEvent.VolumeUpdate, volume);
|
|
436
403
|
}, null);
|
|
437
404
|
}
|
|
438
|
-
|
|
439
|
-
|
|
405
|
+
bindCoreListeners() {
|
|
406
|
+
const core = this.player?.core;
|
|
407
|
+
core?.on(ClapprEvents.CORE_SCREEN_ORIENTATION_CHANGED, ({ orientation }) => {
|
|
440
408
|
trace(`${T} on CORE_SCREEN_ORIENTATION_CHANGED`, {
|
|
441
409
|
orientation,
|
|
442
410
|
rootNode: {
|
|
@@ -445,20 +413,20 @@ export class Player {
|
|
|
445
413
|
},
|
|
446
414
|
});
|
|
447
415
|
if (Browser.isiOS && this.rootNode) {
|
|
448
|
-
|
|
416
|
+
core?.resize({
|
|
449
417
|
width: this.rootNode.clientWidth,
|
|
450
418
|
height: this.rootNode.clientHeight,
|
|
451
419
|
});
|
|
452
420
|
}
|
|
453
421
|
}, null);
|
|
454
|
-
|
|
422
|
+
core?.on(ClapprEvents.CORE_RESIZE, ({ width, height }) => {
|
|
455
423
|
trace(`${T} on CORE_RESIZE`, {
|
|
456
424
|
width,
|
|
457
425
|
height,
|
|
458
426
|
});
|
|
459
427
|
this.safeTriggerEvent(PlayerEvent.Resize, { width, height });
|
|
460
428
|
}, null);
|
|
461
|
-
|
|
429
|
+
core?.on(ClapprEvents.CORE_FULLSCREEN, (isFullscreen) => {
|
|
462
430
|
trace(`${T} CORE_FULLSCREEN`, {
|
|
463
431
|
isFullscreen,
|
|
464
432
|
});
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -144,14 +144,13 @@ export default class DashPlayback extends HTML5Video {
|
|
|
144
144
|
this._dash = dash;
|
|
145
145
|
this._dash.initialize();
|
|
146
146
|
if (this.options.dash) {
|
|
147
|
-
|
|
148
|
-
const settings = $.extend({}, this.options.dash, {
|
|
147
|
+
const settings = $.extend(true, {
|
|
149
148
|
streaming: {
|
|
150
149
|
text: {
|
|
151
150
|
defaultEnabled: false,
|
|
152
151
|
},
|
|
153
152
|
},
|
|
154
|
-
});
|
|
153
|
+
}, this.options.dash);
|
|
155
154
|
this._dash.updateSettings(settings);
|
|
156
155
|
}
|
|
157
156
|
this._dash.attachView(this.el);
|
|
@@ -65,7 +65,7 @@ export declare class MediaControl extends UICorePlugin {
|
|
|
65
65
|
private $volumeBarScrubber;
|
|
66
66
|
private $volumeContainer;
|
|
67
67
|
private $volumeIcon;
|
|
68
|
-
private readonly template;
|
|
68
|
+
private static readonly template;
|
|
69
69
|
get name(): string;
|
|
70
70
|
get supportedVersion(): {
|
|
71
71
|
min: string;
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"MediaControl.d.ts","sourceRoot":"","sources":["../../../src/plugins/media-control/MediaControl.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
92
92
|
$volumeBarScrubber = null;
|
|
93
93
|
$volumeContainer = null;
|
|
94
94
|
$volumeIcon = null;
|
|
95
|
-
template = template(mediaControlHTML);
|
|
95
|
+
static template = template(mediaControlHTML);
|
|
96
96
|
get name() {
|
|
97
97
|
return 'media_control';
|
|
98
98
|
}
|
|
@@ -878,9 +878,6 @@ export class MediaControl extends UICorePlugin {
|
|
|
878
878
|
parseColors() {
|
|
879
879
|
const design = this.options.design || {};
|
|
880
880
|
let variables = [];
|
|
881
|
-
if (!template) {
|
|
882
|
-
return;
|
|
883
|
-
}
|
|
884
881
|
// TODO camel case
|
|
885
882
|
if (design.background_color) {
|
|
886
883
|
variables = variables.concat([
|
|
@@ -923,7 +920,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
923
920
|
}
|
|
924
921
|
render() {
|
|
925
922
|
const timeout = this.options.hideMediaControlDelay || 2000;
|
|
926
|
-
const html =
|
|
923
|
+
const html = MediaControl.template({ settings: this.settings ?? {} });
|
|
927
924
|
this.$el.html(html);
|
|
928
925
|
// const style = Styler.getStyleFor(mediaControlStyle, { baseUrl: this.options.baseUrl });
|
|
929
926
|
// this.$el.append(style[0]);
|
package/package.json
CHANGED
package/src/Player.ts
CHANGED
|
@@ -83,10 +83,6 @@ export class Player {
|
|
|
83
83
|
|
|
84
84
|
private rootNode: HTMLElement | null = null
|
|
85
85
|
|
|
86
|
-
private tuneInTimerId: ReturnType<typeof setTimeout> | null = null
|
|
87
|
-
|
|
88
|
-
private tunedIn = false
|
|
89
|
-
|
|
90
86
|
constructor(config: PlayerConfig) {
|
|
91
87
|
this.setConfig(config)
|
|
92
88
|
// TODO decide whether the order of playback modules might vary,
|
|
@@ -185,11 +181,6 @@ export class Player {
|
|
|
185
181
|
this.player = null
|
|
186
182
|
}
|
|
187
183
|
this.ready = false
|
|
188
|
-
this.tunedIn = false
|
|
189
|
-
if (this.tuneInTimerId) {
|
|
190
|
-
clearTimeout(this.tuneInTimerId)
|
|
191
|
-
this.tuneInTimerId = null
|
|
192
|
-
}
|
|
193
184
|
}
|
|
194
185
|
|
|
195
186
|
/**
|
|
@@ -369,44 +360,21 @@ export class Player {
|
|
|
369
360
|
|
|
370
361
|
const player = new PlayerClappr(coreOptions)
|
|
371
362
|
this.player = player
|
|
372
|
-
|
|
373
|
-
// TODO checks if the whole thing is necessary
|
|
374
|
-
this.tuneInTimerId = globalThis.setTimeout(() => {
|
|
375
|
-
trace(`${T} tuneInTimer`, {
|
|
376
|
-
ready: this.ready,
|
|
377
|
-
tunedIn: this.tunedIn,
|
|
378
|
-
})
|
|
379
|
-
this.tuneInTimerId = null
|
|
380
|
-
this.tuneIn()
|
|
381
|
-
}, 4000)
|
|
363
|
+
this.bindCoreListeners()
|
|
382
364
|
}
|
|
383
365
|
|
|
384
366
|
private async tuneIn() {
|
|
385
367
|
assert.ok(this.player)
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
tunedIn: this.tunedIn,
|
|
389
|
-
})
|
|
390
|
-
if (this.tunedIn) {
|
|
391
|
-
return
|
|
392
|
-
}
|
|
393
|
-
this.tunedIn = true
|
|
394
|
-
const player = this.player
|
|
395
|
-
|
|
396
|
-
this.bindContainerEventListeners(player)
|
|
397
|
-
player.core.on(
|
|
368
|
+
this.bindContainerEventListeners()
|
|
369
|
+
this.player.core.on(
|
|
398
370
|
ClapprEvents.CORE_ACTIVE_CONTAINER_CHANGED,
|
|
399
|
-
() => this.bindContainerEventListeners(
|
|
371
|
+
() => this.bindContainerEventListeners(),
|
|
400
372
|
null,
|
|
401
373
|
)
|
|
402
|
-
this.bindSizeManagementListeners(player)
|
|
403
|
-
|
|
404
374
|
if (this.config.autoPlay) {
|
|
375
|
+
trace(`${T} autoPlay`)
|
|
405
376
|
setTimeout(() => {
|
|
406
|
-
|
|
407
|
-
playback: this.player?.core.activePlayback.name,
|
|
408
|
-
})
|
|
409
|
-
player.play({
|
|
377
|
+
this.player?.play({
|
|
410
378
|
autoPlay: true,
|
|
411
379
|
})
|
|
412
380
|
}, 0)
|
|
@@ -436,11 +404,6 @@ export class Player {
|
|
|
436
404
|
return
|
|
437
405
|
}
|
|
438
406
|
this.ready = true
|
|
439
|
-
if (this.tuneInTimerId) {
|
|
440
|
-
clearTimeout(this.tuneInTimerId)
|
|
441
|
-
this.tuneInTimerId = null
|
|
442
|
-
}
|
|
443
|
-
// TODO ensure that CORE_ACTIVE_CONTAINER_CHANGED does not get caught before onReady
|
|
444
407
|
setTimeout(() => this.tuneIn(), 0)
|
|
445
408
|
},
|
|
446
409
|
onPlay: () => {
|
|
@@ -476,15 +439,12 @@ export class Player {
|
|
|
476
439
|
|
|
477
440
|
this.rootNode = rootNode
|
|
478
441
|
|
|
479
|
-
const coreOptions: CoreOptions & PluginOptions = $.extend(true,
|
|
442
|
+
const coreOptions: CoreOptions & PluginOptions = $.extend(true, {
|
|
480
443
|
allowUserInteraction: true,
|
|
481
444
|
autoPlay: false,
|
|
482
|
-
|
|
483
|
-
debug: this.config.debug || 'none',
|
|
445
|
+
debug: 'none',
|
|
484
446
|
events: this.events,
|
|
485
447
|
height: rootNode.clientHeight,
|
|
486
|
-
loop: this.config.loop,
|
|
487
|
-
mute: this.config.mute,
|
|
488
448
|
playback: {
|
|
489
449
|
controls: false,
|
|
490
450
|
playInline: true,
|
|
@@ -496,12 +456,11 @@ export class Player {
|
|
|
496
456
|
},
|
|
497
457
|
},
|
|
498
458
|
parent: rootNode,
|
|
499
|
-
playbackType: this.config.playbackType,
|
|
500
459
|
width: rootNode.clientWidth,
|
|
501
460
|
source: source ? source.source : undefined,
|
|
502
461
|
mimeType: source ? source.mimeType : undefined,
|
|
462
|
+
}, this.config, {
|
|
503
463
|
sources,
|
|
504
|
-
strings: this.config.strings,
|
|
505
464
|
})
|
|
506
465
|
return coreOptions
|
|
507
466
|
}
|
|
@@ -518,23 +477,27 @@ export class Player {
|
|
|
518
477
|
)
|
|
519
478
|
}
|
|
520
479
|
|
|
521
|
-
private bindContainerEventListeners(
|
|
522
|
-
|
|
523
|
-
|
|
480
|
+
private bindContainerEventListeners() {
|
|
481
|
+
const activePlayback = this.player?.core.activePlayback
|
|
482
|
+
const activeContainer = this.player?.core.activeContainer
|
|
483
|
+
if (Browser.isiOS && activePlayback) {
|
|
484
|
+
// TODO check out
|
|
485
|
+
activePlayback.$el.on('webkitendfullscreen', () => {
|
|
524
486
|
try {
|
|
525
|
-
|
|
487
|
+
activeContainer?.handleFullscreenChange()
|
|
526
488
|
} catch (e) {
|
|
527
489
|
reportError(e)
|
|
528
490
|
}
|
|
529
491
|
})
|
|
530
492
|
}
|
|
531
|
-
|
|
493
|
+
activeContainer?.on(ClapprEvents.CONTAINER_VOLUME, (volume: number) => {
|
|
532
494
|
this.safeTriggerEvent(PlayerEvent.VolumeUpdate, volume)
|
|
533
495
|
}, null)
|
|
534
496
|
}
|
|
535
497
|
|
|
536
|
-
private
|
|
537
|
-
player
|
|
498
|
+
private bindCoreListeners() {
|
|
499
|
+
const core = this.player?.core
|
|
500
|
+
core?.on(
|
|
538
501
|
ClapprEvents.CORE_SCREEN_ORIENTATION_CHANGED,
|
|
539
502
|
({ orientation }: { orientation: 'landscape' | 'portrait' }) => {
|
|
540
503
|
trace(`${T} on CORE_SCREEN_ORIENTATION_CHANGED`, {
|
|
@@ -545,7 +508,7 @@ export class Player {
|
|
|
545
508
|
},
|
|
546
509
|
})
|
|
547
510
|
if (Browser.isiOS && this.rootNode) {
|
|
548
|
-
|
|
511
|
+
core?.resize({
|
|
549
512
|
width: this.rootNode.clientWidth,
|
|
550
513
|
height: this.rootNode.clientHeight,
|
|
551
514
|
})
|
|
@@ -553,7 +516,7 @@ export class Player {
|
|
|
553
516
|
},
|
|
554
517
|
null,
|
|
555
518
|
)
|
|
556
|
-
|
|
519
|
+
core?.on(
|
|
557
520
|
ClapprEvents.CORE_RESIZE,
|
|
558
521
|
({ width, height }: { width: number; height: number }) => {
|
|
559
522
|
trace(`${T} on CORE_RESIZE`, {
|
|
@@ -564,7 +527,7 @@ export class Player {
|
|
|
564
527
|
},
|
|
565
528
|
null,
|
|
566
529
|
)
|
|
567
|
-
|
|
530
|
+
core?.on(
|
|
568
531
|
ClapprEvents.CORE_FULLSCREEN,
|
|
569
532
|
(isFullscreen: boolean) => {
|
|
570
533
|
trace(`${T} CORE_FULLSCREEN`, {
|
|
@@ -239,14 +239,17 @@ export default class DashPlayback extends HTML5Video {
|
|
|
239
239
|
this._dash.initialize()
|
|
240
240
|
|
|
241
241
|
if (this.options.dash) {
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
242
|
+
const settings = $.extend(
|
|
243
|
+
true,
|
|
244
|
+
{
|
|
245
|
+
streaming: {
|
|
246
|
+
text: {
|
|
247
|
+
defaultEnabled: false,
|
|
248
|
+
},
|
|
247
249
|
},
|
|
248
250
|
},
|
|
249
|
-
|
|
251
|
+
this.options.dash,
|
|
252
|
+
)
|
|
250
253
|
this._dash.updateSettings(settings)
|
|
251
254
|
}
|
|
252
255
|
|
|
@@ -277,10 +280,13 @@ export default class DashPlayback extends HTML5Video {
|
|
|
277
280
|
})
|
|
278
281
|
})
|
|
279
282
|
|
|
280
|
-
this._dash.on(
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
283
|
+
this._dash.on(
|
|
284
|
+
DASHJS.MediaPlayer.events.QUALITY_CHANGE_RENDERED,
|
|
285
|
+
(evt: DASHJS.QualityChangeRenderedEvent) => {
|
|
286
|
+
const currentLevel = this.getLevel(evt.newQuality)
|
|
287
|
+
this.onLevelSwitchEnd(currentLevel)
|
|
288
|
+
},
|
|
289
|
+
)
|
|
284
290
|
|
|
285
291
|
this._dash.on(
|
|
286
292
|
DASHJS.MediaPlayer.events.METRIC_ADDED,
|
|
@@ -168,7 +168,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
168
168
|
|
|
169
169
|
private $volumeIcon: ZeptoResult | null = null
|
|
170
170
|
|
|
171
|
-
private readonly template = template(mediaControlHTML)
|
|
171
|
+
private static readonly template = template(mediaControlHTML)
|
|
172
172
|
|
|
173
173
|
get name() {
|
|
174
174
|
return 'media_control'
|
|
@@ -1189,10 +1189,6 @@ export class MediaControl extends UICorePlugin {
|
|
|
1189
1189
|
|
|
1190
1190
|
let variables: string[] = []
|
|
1191
1191
|
|
|
1192
|
-
if (!template) {
|
|
1193
|
-
return
|
|
1194
|
-
}
|
|
1195
|
-
|
|
1196
1192
|
// TODO camel case
|
|
1197
1193
|
if (design.background_color) {
|
|
1198
1194
|
variables = variables.concat([
|
|
@@ -1244,7 +1240,7 @@ export class MediaControl extends UICorePlugin {
|
|
|
1244
1240
|
override render() {
|
|
1245
1241
|
const timeout = this.options.hideMediaControlDelay || 2000
|
|
1246
1242
|
|
|
1247
|
-
const html =
|
|
1243
|
+
const html = MediaControl.template({ settings: this.settings ?? {} })
|
|
1248
1244
|
this.$el.html(html)
|
|
1249
1245
|
// const style = Styler.getStyleFor(mediaControlStyle, { baseUrl: this.options.baseUrl });
|
|
1250
1246
|
// this.$el.append(style[0]);
|