Merge branch 'release50' into release51

Author: Julusian

meteor/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.50.4](///compare/v1.50.3...v1.50.4) (2024-08-08)
+
+
+### Bug Fixes
+
+* compensate for piece preroll for adlibbed pieces SOFIE-3369 ([#1236](undefined/undefined/undefined/issues/1236)) c8f7c42
+* rundown timing drifting when playing parts with preroll SOFIE-3291 ([#1234](undefined/undefined/undefined/issues/1234)) a444857
+* unexpected timeline updates while playing final part in rundown SOFIE-3371 ([#1237](undefined/undefined/undefined/issues/1237)) 393f0c1
+
+### [1.50.3](https://github.com/nrkno/sofie-core/compare/v1.50.2...v1.50.3) (2024-06-24)
+
+
+### Bug Fixes
+
+* **DashboardPieceButton:** hover previews are not positioned correctly ([89fd219](https://github.com/nrkno/sofie-core/commit/89fd219d57fb775ed140ed2eaf5326a80194661f))
+* input gateway devices lose rundown actions on reset SOFIE-3134 ([#1190](https://github.com/nrkno/sofie-core/issues/1190)) ([aa69e5d](https://github.com/nrkno/sofie-core/commit/aa69e5d2df512f0e79bb1ada51ed61560258c0cd))
+
 ### [1.50.2](///compare/v1.49.6...v1.50.2) (2024-05-15)
 
 

meteor/__mocks__/defaultCollectionObjects.ts

@@ -142,7 +142,7 @@ export function defaultPart(_id: PartId, rundownId: RundownId, segmentId: Segmen
 		_rank: 0,
 		externalId: unprotectString(_id),
 		title: 'Default Part',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 }
 export function defaultPiece(_id: PieceId, rundownId: RundownId, segmentId: SegmentId, partId: PartId): Piece {

meteor/__mocks__/helpers/database.ts

@@ -666,7 +666,7 @@ export async function setupDefaultRundown(
 		_rank: 0,
 		externalId: 'MOCK_PART_0_0',
 		title: 'Part 0 0',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part00)
 
@@ -734,7 +734,7 @@ export async function setupDefaultRundown(
 		_rank: 1,
 		externalId: 'MOCK_PART_0_1',
 		title: 'Part 0 1',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part01)
 
@@ -775,7 +775,7 @@ export async function setupDefaultRundown(
 		_rank: 0,
 		externalId: 'MOCK_PART_1_0',
 		title: 'Part 1 0',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part10)
 
@@ -786,7 +786,7 @@ export async function setupDefaultRundown(
 		_rank: 1,
 		externalId: 'MOCK_PART_1_1',
 		title: 'Part 1 1',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part11)
 
@@ -797,7 +797,7 @@ export async function setupDefaultRundown(
 		_rank: 2,
 		externalId: 'MOCK_PART_1_2',
 		title: 'Part 1 2',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part12)
 

meteor/client/lib/__tests__/rundownTiming.test.ts

@@ -50,7 +50,7 @@ function makeMockPart(
 		_rank: rank,
 		rundownId: protectString(rundownId),
 		...durations,
-		expectedDurationWithPreroll: durations.expectedDuration,
+		expectedDurationWithTransition: durations.expectedDuration,
 	})
 }
 

meteor/client/lib/rundown.ts

@@ -35,7 +35,7 @@ import { FindOptions } from '../../lib/collections/lib'
 import { getShowHiddenSourceLayers } from './localStorage'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { AdLibPieceUi } from './shelf'
 import { UIShowStyleBase } from '../../lib/api/showStyles'
 import { PartId, PieceId, RundownId, SegmentId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
@@ -58,7 +58,7 @@ export namespace RundownUtils {
 			return (
 				memo +
 				(part.instance.timings?.duration ||
-					calculatePartInstanceExpectedDurationWithPreroll(part.instance) ||
+					calculatePartInstanceExpectedDurationWithTransition(part.instance) ||
 					part.renderedDuration ||
 					(display ? Settings.defaultDisplayDuration : 0))
 			)
@@ -213,7 +213,7 @@ export namespace RundownUtils {
 								? part.instance.timings.duration + (part.instance.timings?.playOffset || 0)
 								: (partDuration ||
 										part.renderedDuration ||
-										calculatePartInstanceExpectedDurationWithPreroll(part.instance) ||
+										calculatePartInstanceExpectedDurationWithTransition(part.instance) ||
 										0) - (piece.renderedInPoint || 0)))
 					: part.instance.timings?.duration !== undefined
 					? part.instance.timings.duration + (part.instance.timings?.playOffset || 0)
@@ -414,7 +414,7 @@ export namespace RundownUtils {
 			const showHiddenSourceLayers = getShowHiddenSourceLayers()
 
 			partsE = segmentInfo.partInstances.map((partInstance, itIndex) => {
-				const partExpectedDuration = calculatePartInstanceExpectedDurationWithPreroll(partInstance)
+				const partExpectedDuration = calculatePartInstanceExpectedDurationWithTransition(partInstance)
 
 				// extend objects to match the Extended interface
 				const partE = literal<PartExtended>({

meteor/client/lib/rundownTiming.ts

@@ -14,7 +14,7 @@
 import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { PartInstance } from '../../lib/collections/PartInstances'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
@@ -216,7 +216,7 @@ export class RundownTimingCalculator {
 				// if the Part is using budgetDuration, this budget is calculated when going through all the segments
 				// in the Rundown (see further down)
 				if (!segmentUsesBudget && !partIsUntimed) {
-					totalRundownDuration += calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+					totalRundownDuration += calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 				}
 
 				const lastStartedPlayback = partInstance.timings?.plannedStartedPlayback
@@ -230,7 +230,7 @@ export class RundownTimingCalculator {
 				let displayDurationFromGroup = 0
 
 				partExpectedDuration =
-					calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+					calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 					partInstance.timings?.duration ||
 					0
 
@@ -254,7 +254,7 @@ export class RundownTimingCalculator {
 				) {
 					this.displayDurationGroups[partInstance.part.displayDurationGroup] =
 						(this.displayDurationGroups[partInstance.part.displayDurationGroup] || 0) +
-						(calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0)
+						(calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0)
 					displayDurationFromGroup =
 						partInstance.part.displayDuration ||
 						Math.max(
@@ -278,7 +278,7 @@ export class RundownTimingCalculator {
 							: undefined)
 					partDuration =
 						Math.max(
-							duration || calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0,
+							duration || calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0,
 							now - lastStartedPlayback
 						) - playOffset
 					// because displayDurationGroups have no actual timing on them, we need to have a copy of the
@@ -288,7 +288,7 @@ export class RundownTimingCalculator {
 						duration ||
 						(memberOfDisplayDurationGroup
 							? displayDurationFromGroup
-							: calculatePartInstanceExpectedDurationWithPreroll(partInstance)) ||
+							: calculatePartInstanceExpectedDurationWithTransition(partInstance)) ||
 						defaultDuration
 					partDisplayDuration = Math.max(partDisplayDurationNoPlayback, now - lastStartedPlayback)
 					this.partPlayed[partInstanceOrPartId] = now - lastStartedPlayback
@@ -310,23 +310,23 @@ export class RundownTimingCalculator {
 							(duration ||
 								(memberOfDisplayDurationGroup
 									? displayDurationFromGroup
-									: calculatePartInstanceExpectedDurationWithPreroll(partInstance)) ||
+									: calculatePartInstanceExpectedDurationWithTransition(partInstance)) ||
 								0) -
 								(now - lastStartedPlayback)
 						)
 					}
 				} else {
 					partDuration =
 						(partInstance.timings?.duration ||
-							calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+							calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 							0) - playOffset
 					partDisplayDurationNoPlayback = Math.max(
 						0,
 						(partInstance.timings?.duration && partInstance.timings?.duration + playOffset) ||
 							displayDurationFromGroup ||
 							ensureMinimumDefaultDurationIfNotAuto(
 								partInstance,
-								calculatePartInstanceExpectedDurationWithPreroll(partInstance),
+								calculatePartInstanceExpectedDurationWithTransition(partInstance),
 								defaultDuration
 							)
 					)
@@ -349,7 +349,7 @@ export class RundownTimingCalculator {
 							valToAddToAsPlayedDuration = partInstance.timings.duration
 						} else if (partCounts) {
 							valToAddToAsPlayedDuration =
-								calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+								calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 						}
 
 						asPlayedRundownDuration += valToAddToAsPlayedDuration
@@ -386,15 +386,15 @@ export class RundownTimingCalculator {
 						memberOfDisplayDurationGroup
 							? Math.max(
 									partExpectedDuration,
-									calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+									calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 							  )
-							: calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0,
+							: calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0,
 						now - lastStartedPlayback
 					)
 				} else {
 					asDisplayedRundownDuration +=
 						partInstance.timings?.duration ||
-						calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+						calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 						0
 				}
 
@@ -437,12 +437,12 @@ export class RundownTimingCalculator {
 					waitDuration =
 						partInstance.timings?.duration ||
 						partDisplayDuration ||
-						calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+						calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 						0
 				} else {
 					waitDuration =
 						partInstance.timings?.duration ||
-						calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+						calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 						0
 				}
 				if (segmentUsesBudget) {
@@ -466,7 +466,8 @@ export class RundownTimingCalculator {
 						// this needs to use partInstance.part.expectedDuration as opposed to partExpectedDuration, because
 						// partExpectedDuration is affected by displayGroups, and if it hasn't played yet then it shouldn't
 						// add any duration to the "remaining" time pool
-						remainingRundownDuration += calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+						remainingRundownDuration +=
+							calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 						// item is onAir right now, and it's is currently shorter than expectedDuration
 					} else if (
 						lastStartedPlayback &&
@@ -605,7 +606,7 @@ export class RundownTimingCalculator {
 
 			let onAirPartDuration =
 				currentLivePartInstance.timings?.duration ||
-				calculatePartInstanceExpectedDurationWithPreroll(currentLivePartInstance) ||
+				calculatePartInstanceExpectedDurationWithTransition(currentLivePartInstance) ||
 				0
 			if (
 				currentLivePart.displayDurationGroup &&

meteor/client/ui/ClockView/PresenterScreen.tsx

@@ -30,7 +30,7 @@ import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/Sho
 import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
 import { ShelfDashboardLayout } from '../Shelf/ShelfDashboardLayout'
 import { parse as queryStringParse } from 'query-string'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { getPlaylistTimingDiff } from '../../lib/rundownTiming'
 import { UIShowStyleBase } from '../../../lib/api/showStyles'
 import { UIShowStyleBases, UIStudios } from '../Collections'
@@ -465,7 +465,9 @@ function PresenterScreenContentDefaultLayout({
 									showStyleBaseId={currentShowStyleBaseId}
 									rundownIds={rundownIds}
 									partAutoNext={currentPartInstance.instance.part.autoNext || false}
-									partExpectedDuration={calculatePartInstanceExpectedDurationWithPreroll(currentPartInstance.instance)}
+									partExpectedDuration={calculatePartInstanceExpectedDurationWithTransition(
+										currentPartInstance.instance
+									)}
 									partStartedPlayback={currentPartInstance.instance.timings?.plannedStartedPlayback}
 									playlistActivationId={playlist?.activationId}
 								/>

meteor/client/ui/RundownView/RundownTiming/SegmentDuration.tsx

@@ -4,7 +4,7 @@ import { withTiming, WithTiming } from './withTiming'
 import { unprotectString } from '../../../../lib/lib'
 import { RundownUtils } from '../../../lib/rundown'
 import { PartUi } from '../../SegmentTimeline/SegmentTimelineContainer'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { getPartInstanceTimingId } from '../../../lib/rundownTiming'
 
@@ -46,7 +46,7 @@ export const SegmentDuration = withTiming<ISegmentDurationProps, {}>()(function
 				budget +=
 					part.instance.orphaned || part.instance.part.untimed
 						? 0
-						: calculatePartInstanceExpectedDurationWithPreroll(part.instance) || 0
+						: calculatePartInstanceExpectedDurationWithTransition(part.instance) || 0
 			})
 		}
 		props.parts.forEach((part) => {

meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx

@@ -8,7 +8,7 @@ import * as _ from 'underscore'
 
 import { getElementWidth } from '../../../utils/dimensions'
 import { MicFloatingInspector } from '../../FloatingInspectors/MicFloatingInspector'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { unprotectString } from '../../../../lib/lib'
 import { IFloatingInspectorPosition } from '../../FloatingInspectors/IFloatingInspectorPosition'
 import { logger } from '../../../../lib/logging'
@@ -137,8 +137,8 @@ export const MicSourceRenderer = withTranslation()(
 				_forceSizingRecheck = true
 			}
 
-			const expectedDuration = calculatePartInstanceExpectedDurationWithPreroll(this.props.part.instance)
-			const prevExpectedDuration = calculatePartInstanceExpectedDurationWithPreroll(prevProps.part.instance)
+			const expectedDuration = calculatePartInstanceExpectedDurationWithTransition(this.props.part.instance)
+			const prevExpectedDuration = calculatePartInstanceExpectedDurationWithTransition(prevProps.part.instance)
 
 			if (
 				!_forceSizingRecheck &&

meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx

@@ -229,7 +229,7 @@ export const BUDGET_GAP_PART = {
 		gap: true,
 		title: 'gap',
 		invalid: true,
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}),
 	pieces: [],
 	renderedDuration: 0,