chore: expose methods correctly and consistently

Author: Mint de Wit

packages/blueprints-integration/src/context/onSetAsNextContext.ts

@@ -76,5 +76,5 @@ export interface IOnSetAsNextContext extends IShowStyleUserContext, IEventContex
 	 * Multiple calls of this inside one call to `onSetAsNext` will replace earlier calls.
 	 * @returns Whether a new Part was found using the provided offset
 	 */
-	moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop: boolean): Promise<boolean>
+	moveNextPart(partDelta: number, segmentDelta: number, ignoreQuickLoop?: boolean): Promise<boolean>
 }

packages/job-worker/src/playout/model/PlayoutModel.ts

@@ -175,6 +175,17 @@ export interface PlayoutModelReadonly extends StudioPlayoutModelBaseReadonly {
 	 */
 	getSegmentsBetweenQuickLoopMarker(start: QuickLoopMarker, end: QuickLoopMarker): SegmentId[]
 
+	/**
+	 * Returns any segmentId's that are found between 2 quickloop markers, none will be returned if
+	 * the end is before the start.
+	 * @param start A quickloop marker
+	 * @param end A quickloop marker
+	 */
+	getPartsBetweenQuickLoopMarker(
+		start: QuickLoopMarker,
+		end: QuickLoopMarker
+	): { parts: PartId[]; segments: SegmentId[] }
+
 	/**
 	 * Search for a PieceInstance in the RundownPlaylist
 	 * @param id Id of the PieceInstance

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

@@ -243,6 +243,12 @@ export class PlayoutModelReadonlyImpl implements PlayoutModelReadonly {
 	getSegmentsBetweenQuickLoopMarker(start: QuickLoopMarker, end: QuickLoopMarker): SegmentId[] {
 		return this.quickLoopService.getSegmentsBetweenMarkers(start, end)
 	}
+	getPartsBetweenQuickLoopMarker(
+		start: QuickLoopMarker,
+		end: QuickLoopMarker
+	): { parts: PartId[]; segments: SegmentId[] } {
+		return this.quickLoopService.getPartsBetweenMarkers(start, end)
+	}
 
 	#isMultiGatewayMode: boolean | undefined = undefined
 	public get isMultiGatewayMode(): boolean {

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

@@ -6,7 +6,6 @@ import { sortPartsInSortedSegments } from '@sofie-automation/corelib/dist/playou
 import { logger } from '../logging'
 import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { ReadonlyDeep } from 'type-fest'
-import { QuickLoopService } from './model/services/QuickLoopService'
 
 export function selectNewPartWithOffsets(
 	_context: JobContext,
@@ -29,9 +28,8 @@ export function selectNewPartWithOffsets(
 	let rawParts = playoutModel.getAllOrderedParts()
 	let allowWrap = false // whether we should wrap to the first part if the curIndex + delta exceeds the total number of parts
 
-	const quickLoopService = new QuickLoopService(_context, playoutModel)
 	if (!ignoreQuickLoop && playlist.quickLoop?.start && playlist.quickLoop.end) {
-		const partsInQuickloop = quickLoopService.getPartsBetweenMarkers(
+		const partsInQuickloop = playoutModel.getPartsBetweenQuickLoopMarker(
 			playlist.quickLoop.start,
 			playlist.quickLoop.end
 		)