wip: adlib clear layer

Author: Julusian

packages/corelib/src/playout/processAndPrune.ts

@@ -88,9 +88,8 @@ export interface PieceInstanceWithTimings extends ReadonlyDeep<PieceInstance> {
 	 * This is a maximum end point of the pieceInstance.
 	 * If the pieceInstance also has a enable.duration or userDuration set then the shortest one will need to be used
 	 * This can be:
-	 *  - 'now', if it was stopped by something that does not need a preroll (or is virtual)
-	 *  - '#something.start + 100', if it was stopped by something that needs a preroll
-	 *  - '100', if not relative to now at all
+	 *  - '100', if relative to the start of the part
+	 *  - { offsetFromNow: 100 }, if stopped by an absolute time
 	 */
 	resolvedEndCap?: number | RelativeResolvedEndCap
 	priority: number

packages/job-worker/src/playout/timeline/pieceGroup.ts

@@ -137,7 +137,7 @@ export function createPieceGroupAndCap(
 	// If the start has been adjusted, the end needs to be updated to compensate
 	if (typeof pieceInstance.resolvedEndCap === 'number') {
 		resolvedEndCap = pieceInstance.resolvedEndCap - (pieceStartOffset ?? 0)
-	} else if (pieceInstance.resolvedEndCap) {
+	} else if (pieceInstance.resolvedEndCap || controlObj.enable.end === 'now') {
 		// TODO - there could already be a piece with a cap of 'now' that we could use as our end time
 		// As the cap is for 'now', rather than try to get tsr to understand `end: 'now'`, we can create a 'now' object to tranlate it
 		const nowObj = literal<TimelineObjRundown & OnGenerateTimelineObjExt<PieceTimelineMetadata>>({
@@ -157,7 +157,13 @@ export function createPieceGroupAndCap(
 			priority: 0,
 		})
 		capObjs.push(nowObj)
-		resolvedEndCap = `#${nowObj.id}.start + ${pieceInstance.resolvedEndCap.offsetFromNow}`
+
+		resolvedEndCap = `#${nowObj.id}.start + ${pieceInstance.resolvedEndCap?.offsetFromNow ?? 0}`
+
+		// If the object has an end of now, we can remove it as it will be replaced by the `resolvedEndCap`
+		if (controlObj.enable.end === 'now') {
+			delete controlObj.enable.end
+		}
 	}
 
 	if (controlObj.enable.duration !== undefined || controlObj.enable.end !== undefined) {

packages/job-worker/src/playout/timeline/rundown.ts

@@ -385,7 +385,16 @@ function calculateInfinitePieceEnable(
 
 		// nocommit prerollDuration?
 
-		// Ingore userDuration, it gets handled later
+		// // If an end time has been set by a hotkey, then update the duration to be correct
+		// if (pieceInstance.userDuration && pieceInstance.piece.enable.start !== 'now') {
+		// 	if ('endRelativeToNow' in pieceInstance.userDuration) {
+		// 		infiniteGroupEnable.duration =
+		// 			pieceInstance.userDuration.endRelativeToNow - pieceInstance.piece.enable.start
+		// 	} else {
+		// 		// This should never be hit
+		// 		infiniteGroupEnable.end = 'now'
+		// 	}
+		// }
 	}
 
 	return {