chore: remove endRelativeToNow completely

Author: jstarpl

packages/corelib/src/dataModel/PieceInstance.ts

@@ -61,18 +61,10 @@ export interface PieceInstance {
 	dynamicallyInserted?: Time
 
 	/** This is set when the duration needs to be overriden from some user action */
-	userDuration?:
-		| {
-				/** The time relative to the part (milliseconds since start of part) */
-				endRelativeToPart: number
-		  }
-		| {
-				/**
-				 * The time relative to 'now' (ms since 'now')
-				 * @deprecated Since 1.53.0; use `endRelativeToPart` instead.
-				 */
-				endRelativeToNow: number
-		  }
+	userDuration?: {
+		/** The time relative to the part (milliseconds since start of part) */
+		endRelativeToPart: number
+	}
 
 	/** The time the system started playback of this part, undefined if not yet played back (milliseconds since epoch) */
 	reportedStartedPlayback?: Time

packages/corelib/src/playout/processAndPrune.ts

@@ -247,11 +247,7 @@ export function resolvePrunedPieceInstance(
 
 	// Consider the playout userDuration
 	if (pieceInstance.userDuration) {
-		if ('endRelativeToPart' in pieceInstance.userDuration) {
-			caps.push(pieceInstance.userDuration.endRelativeToPart - resolvedStart)
-		} else if ('endRelativeToNow' in pieceInstance.userDuration) {
-			caps.push(nowInPart + pieceInstance.userDuration.endRelativeToNow - resolvedStart)
-		}
+		caps.push(pieceInstance.userDuration.endRelativeToPart - resolvedStart)
 	}
 
 	return {

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

@@ -26,10 +26,7 @@ export function hasPieceInstanceDefinitelyEnded(
 	}
 
 	if (pieceInstance.userDuration) {
-		const userDurationEnd =
-			'endRelativeToPart' in pieceInstance.userDuration
-				? pieceInstance.userDuration.endRelativeToPart
-				: pieceInstance.userDuration.endRelativeToNow + nowInPart
+		const userDurationEnd = pieceInstance.userDuration.endRelativeToPart
 
 		relativeEnd = relativeEnd === undefined ? userDurationEnd : Math.min(relativeEnd, userDurationEnd)
 	}

packages/job-worker/src/playout/timeline/multi-gateway.ts

@@ -6,7 +6,6 @@ import { PieceTimelineMetadata } from './pieceGroup.js'
 import { logger } from '../../logging.js'
 import { PlayoutModel } from '../model/PlayoutModel.js'
 import { RundownTimelineTimingContext, getInfinitePartGroupId } from './rundown.js'
-import { getPieceControlObjectId } from '@sofie-automation/corelib/dist/playout/ids'
 import { PlayoutPartInstanceModel } from '../model/PlayoutPartInstanceModel.js'
 import { PlayoutPieceInstanceModel } from '../model/PlayoutPieceInstanceModel.js'
 
@@ -231,29 +230,6 @@ function deNowifyCurrentPieces(
 		}
 	}
 
-	// Ensure any pieces with an unconfirmed userDuration is confirmed
-	for (const pieceInstance of currentPartInstance.pieceInstances) {
-		if (
-			pieceInstance.pieceInstance.userDuration &&
-			'endRelativeToNow' in pieceInstance.pieceInstance.userDuration
-		) {
-			const relativeToNow = pieceInstance.pieceInstance.userDuration.endRelativeToNow
-			const endRelativeToPart = relativeToNow + nowInPart
-			pieceInstance.setDuration({ endRelativeToPart })
-
-			// Update the piece control obj
-			const controlObj = timelineObjsMap[getPieceControlObjectId(pieceInstance.pieceInstance)]
-			if (controlObj && !Array.isArray(controlObj.enable) && controlObj.enable.end === 'now') {
-				controlObj.enable.end = endRelativeToPart
-			}
-
-			// If the piece is an infinite, there may be a now in the parent group
-			const infiniteGroup = timelineObjsMap[getInfinitePartGroupId(pieceInstance.pieceInstance._id)]
-			if (infiniteGroup && !Array.isArray(infiniteGroup.enable) && infiniteGroup.enable.end === 'now') {
-				infiniteGroup.enable.end = targetNowTime + relativeToNow
-			}
-		}
-	}
 	return { objectsNotDeNowified }
 }
 

packages/webui/src/client/lib/rundownLayouts.ts

@@ -165,12 +165,6 @@ export function getUnfinishedPieceInstancesReactive(
 							typeof pieceInstance.userDuration.endRelativeToPart === 'number'
 						) {
 							end = pieceInstance.userDuration.endRelativeToPart
-						} else if (
-							pieceInstance.userDuration &&
-							'endRelativeToNow' in pieceInstance.userDuration &&
-							typeof pieceInstance.userDuration.endRelativeToNow === 'number'
-						) {
-							end = pieceInstance.userDuration.endRelativeToNow + now
 						} else if (typeof piece.enable.duration === 'number' && pieceInstance.plannedStartedPlayback) {
 							end = piece.enable.duration + pieceInstance.plannedStartedPlayback
 						}