Merge pull request Sofie-Automation#1266 from bbc/fix/autonext-postroll

jstarpl · web-flow · commit 5bc015530dc5 · 2024-09-26T16:35:08.000+02:00
Bug fix: currentPart timeline duration should respect postroll in autonext
diff --git a/packages/job-worker/src/playout/timeline/piece.ts b/packages/job-worker/src/playout/timeline/piece.ts
@@ -106,7 +106,7 @@ export function getPieceEnableInsidePart(
 	if (partTimings.toPartPostroll) {
 		if (!pieceEnable.duration) {
 			// make sure that the control object is shortened correctly
-			pieceEnable.duration = `#${partGroupId} - ${partTimings.toPartPostroll}`
+			pieceEnable.end = `#${partGroupId} - ${partTimings.toPartPostroll}`
 		}
 	}
 
diff --git a/packages/job-worker/src/playout/timeline/rundown.ts b/packages/job-worker/src/playout/timeline/rundown.ts
@@ -146,7 +146,8 @@ export function buildTimelineObjsForRundown(
 			// If there is a valid autonext out of the current part, then calculate the duration
 			currentPartEnable.duration =
 				partInstancesInfo.current.partInstance.part.expectedDuration +
-				partInstancesInfo.current.calculatedTimings.toPartDelay
+				partInstancesInfo.current.calculatedTimings.toPartDelay +
+				partInstancesInfo.current.calculatedTimings.toPartPostroll // autonext should have the postroll added to it to not confuse the timeline
 		}
 		const currentPartGroup = createPartGroup(partInstancesInfo.current.partInstance, currentPartEnable)
 

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ export function getPieceEnableInsidePart(`
`106`	`106`	`if (partTimings.toPartPostroll) {`
`107`	`107`	`if (!pieceEnable.duration) {`
`108`	`108`	`// make sure that the control object is shortened correctly`
`109`		- pieceEnable.duration = `#${partGroupId} - ${partTimings.toPartPostroll}`
	`109`	+ pieceEnable.end = `#${partGroupId} - ${partTimings.toPartPostroll}`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,8 @@ export function buildTimelineObjsForRundown(`
`146`	`146`	`// If there is a valid autonext out of the current part, then calculate the duration`
`147`	`147`	`currentPartEnable.duration =`
`148`	`148`	`partInstancesInfo.current.partInstance.part.expectedDuration +`
`149`		`- partInstancesInfo.current.calculatedTimings.toPartDelay`
	`149`	`+ partInstancesInfo.current.calculatedTimings.toPartDelay +`
	`150`	`+ partInstancesInfo.current.calculatedTimings.toPartPostroll // autonext should have the postroll added to it to not confuse the timeline`
`150`	`151`	`}`
`151`	`152`	`const currentPartGroup = createPartGroup(partInstancesInfo.current.partInstance, currentPartEnable)`
`152`	`153`