fix: sorting of timelineObjects

Author: justandras

packages/job-worker/src/playout/lookahead/findForLayer.ts

@@ -51,6 +51,8 @@ export function findLookaheadForLayer(
 
 		if (partInstancesInfo.current.onTimeline) {
 			res.timed.push(...currentObjs)
+		} else {
+			res.future.push(...currentObjs)
 		}
 		previousPart = currentPartInfo.part
 	}
@@ -68,6 +70,8 @@ export function findLookaheadForLayer(
 		)
 
 		if (partInstancesInfo.next?.onTimeline) {
+			res.timed.push(...nextObjs)
+		} else {
 			res.future.push(...nextObjs)
 		}
 		previousPart = nextPartInfo.part
@@ -101,7 +105,7 @@ function generatePartInstanceLookaheads(
 ): { objs: LookaheadTimelineObject[]; partInfo: PartAndPieces } {
 	const partInfo: PartAndPieces = {
 		part: partInstanceInfo.part.part,
-		usesInTransition: partInstanceInfo.calculatedTimings.inTransitionStart !== null,
+		usesInTransition: partInstanceInfo.calculatedTimings?.inTransitionStart ? true : false,
 		pieces: sortPieceInstancesByStart(partInstanceInfo.allPieces, partInstanceInfo.nowInPart),
 	}
 

packages/job-worker/src/playout/lookahead/findObjects.ts

@@ -91,7 +91,7 @@ export function findLookaheadObjectsForPart(
 	_context: JobContext,
 	currentPartInstanceId: PartInstanceId | null,
 	layer: string,
-	previousPart: ReadonlyDeep<DBPart> | undefined,
+	partBefore: ReadonlyDeep<DBPart> | undefined,
 	partInfo: PartAndPieces,
 	partInstanceId: PartInstanceId | null,
 	nextTimeOffset?: number
@@ -120,8 +120,8 @@ export function findLookaheadObjectsForPart(
 	}
 
 	let classesFromPreviousPart: readonly string[] = []
-	if (previousPart && currentPartInstanceId && partInstanceId) {
-		classesFromPreviousPart = previousPart.classesForNext || []
+	if (partBefore && currentPartInstanceId && partInstanceId) {
+		classesFromPreviousPart = partBefore.classesForNext || []
 	}
 
 	const transitionPiece = partInfo.usesInTransition