chore: simplify innerStopPieces (why was that using 'endRelativeToNow' in the first place?)

Author: jstarpl

packages/job-worker/src/playout/adlibUtils.ts

@@ -278,9 +278,7 @@ export function innerStopPieces(
 	}
 
 	const resolvedPieces = getResolvedPiecesForCurrentPartInstance(context, sourceLayers, currentPartInstance)
-	// TODO: this should be reworked, so that getNowOffsetLatency() can be a protected method of the model
-	const offsetRelativeToNow = (timeOffset ?? 0) + (playoutModel.getNowOffsetLatency() ?? 0)
-	const stopAt = getCurrentTime() + offsetRelativeToNow
+	const stopAt = playoutModel.getNowInPlayout() + (timeOffset ?? 0)
 	const relativeStopAt = stopAt - lastStartedPlayback
 
 	for (const resolvedPieceInstance of resolvedPieces) {
@@ -310,15 +308,9 @@ export function innerStopPieces(
 
 				const pieceInstanceModel = playoutModel.findPieceInstance(pieceInstance._id)
 				if (pieceInstanceModel) {
-					const newDuration: Required<PieceInstance>['userDuration'] = playoutModel.isMultiGatewayMode
-						? {
-								endRelativeToNow: offsetRelativeToNow,
-							}
-						: {
-								endRelativeToPart: relativeStopAt,
-							}
-
-					pieceInstanceModel.pieceInstance.setDuration(newDuration)
+					pieceInstanceModel.pieceInstance.setDuration({
+						endRelativeToPart: relativeStopAt,
+					})
 
 					stoppedInstances.push(pieceInstance._id)
 				} else {

packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts

@@ -274,7 +274,7 @@ export class PlayoutModelReadonlyImpl implements PlayoutModelReadonly {
 	 * Calculate an offset to apply to the 'now' value, to compensate for delay in playout-gateway
 	 * The intention is that any concrete value used instead of 'now' should still be just in the future for playout-gateway
 	 */
-	getNowOffsetLatency(): number | undefined {
+	protected getNowOffsetLatency(): number | undefined {
 		/** The timestamp that "now" was set to */
 		let nowOffsetLatency: number | undefined
 

packages/job-worker/src/studio/model/StudioPlayoutModel.ts

@@ -28,8 +28,6 @@ export interface StudioPlayoutModelBaseReadonly {
 	readonly isMultiGatewayMode: boolean
 
 	readonly multiGatewayNowSafeLatency: number | undefined
-
-	getNowOffsetLatency(): number | undefined
 }
 
 export interface StudioPlayoutModelBase extends StudioPlayoutModelBaseReadonly {

packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts

@@ -18,7 +18,6 @@ import { DatabasePersistedModel } from '../../modelBase.js'
 import { ExpectedPackageDBFromStudioBaselineObjects } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { ExpectedPlayoutItemStudio } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
 import { StudioBaselineHelper } from './StudioBaselineHelper.js'
-import { getExpectedLatency } from '@sofie-automation/corelib/dist/studio/playout'
 
 /**
  * This is a model used for studio operations.
@@ -83,27 +82,6 @@ export class StudioPlayoutModelImpl implements StudioPlayoutModel {
 		return this.context.studio.settings.multiGatewayNowSafeLatency
 	}
 
-	/**
-	 * Calculate an offset to apply to the 'now' value, to compensate for delay in playout-gateway
-	 * The intention is that any concrete value used instead of 'now' should still be just in the future for playout-gateway
-	 */
-	getNowOffsetLatency(): number | undefined {
-		/** The timestamp that "now" was set to */
-		let nowOffsetLatency: number | undefined
-
-		if (this.isMultiGatewayMode) {
-			const playoutDevices = this.peripheralDevices.filter(
-				(device) => device.type === PeripheralDeviceType.PLAYOUT
-			)
-			const worstLatency = Math.max(0, ...playoutDevices.map((device) => getExpectedLatency(device).safe))
-			/** Add a little more latency, to account for network latency variability */
-			const ADD_SAFE_LATENCY = this.multiGatewayNowSafeLatency || 30
-			nowOffsetLatency = worstLatency + ADD_SAFE_LATENCY
-		}
-
-		return nowOffsetLatency
-	}
-
 	setExpectedPackagesForStudioBaseline(packages: ExpectedPackageDBFromStudioBaselineObjects[]): void {
 		this.#baselineHelper.setExpectedPackages(packages)
 	}