Skip to content

Commit 76db05c

Browse files
author
Simon Rogers
committed
Change the setting name from 'allowInfiniteAdlibsToPersist' to 'allowTestingAdlibsToPersist'
1 parent dfa860d commit 76db05c

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

meteor/server/api/rest/v1/typeConversion.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): Comple
384384
multiGatewayNowSafeLatency: apiStudioSettings.multiGatewayNowSafeLatency,
385385
allowRundownResetOnAir: apiStudioSettings.allowRundownResetOnAir,
386386
preserveOrphanedSegmentPositionInRundown: apiStudioSettings.preserveOrphanedSegmentPositionInRundown,
387-
allowInfiniteAdlibToPersist: apiStudioSettings.allowInfiniteAdlibToPersist,
387+
allowTestingAdlibsToPersist: apiStudioSettings.allowTestingAdlibsToPersist,
388388
minimumTakeSpan: apiStudioSettings.minimumTakeSpan ?? DEFAULT_MINIMUM_TAKE_SPAN,
389389
enableQuickLoop: apiStudioSettings.enableQuickLoop,
390390
forceQuickLoopAutoNext: forceQuickLoopAutoNextFrom(apiStudioSettings.forceQuickLoopAutoNext),
@@ -417,7 +417,7 @@ export function APIStudioSettingsFrom(settings: IStudioSettings): Complete<APISt
417417
fallbackPartDuration: settings.fallbackPartDuration,
418418
enableUserEdits: settings.enableUserEdits,
419419
allowAdlibTestingSegment: settings.allowAdlibTestingSegment,
420-
allowInfiniteAdlibToPersist: settings.allowInfiniteAdlibToPersist,
420+
allowTestingAdlibsToPersist: settings.allowTestingAdlibsToPersist,
421421
allowHold: settings.allowHold,
422422
allowPieceDirectPlay: settings.allowPieceDirectPlay,
423423
enableBuckets: settings.enableBuckets,

meteor/server/lib/rest/v1/studios.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export interface APIStudioSettings {
218218
fallbackPartDuration?: number
219219
enableUserEdits?: boolean
220220
allowAdlibTestingSegment?: boolean
221-
allowInfiniteAdlibToPersist?: boolean
221+
allowTestingAdlibsToPersist?: boolean
222222
allowHold?: boolean
223223
allowPieceDirectPlay?: boolean
224224
enableBuckets?: boolean

packages/corelib/src/playout/infinites.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ export function getPlayheadTrackingInfinitesForPart(
104104
newInstanceId: PartInstanceId,
105105
nextPartIsAfterCurrentPart: boolean,
106106
isTemporary: boolean,
107-
allowInfiniteAdlibToPersist: boolean
107+
allowTestingAdlibsToPersist: boolean
108108
): PieceInstance[] {
109109
if (
110-
!allowInfiniteAdlibToPersist &&
110+
!allowTestingAdlibsToPersist &&
111111
intoSegment._id !== playingSegment._id &&
112112
(intoSegment.orphaned === SegmentOrphanedReason.ADLIB_TESTING ||
113113
playingSegment.orphaned === SegmentOrphanedReason.ADLIB_TESTING)
@@ -214,7 +214,7 @@ export function getPlayheadTrackingInfinitesForPart(
214214
(segmentsToReceiveOnRundownEndFromSet.has(currentPartInstance.segmentId) ||
215215
currentPartInstance.segmentId === intoPart.segmentId ||
216216
// If infinites are allowed to persist, then the infinite is allowed to continue
217-
(allowInfiniteAdlibToPersist &&
217+
(allowTestingAdlibsToPersist &&
218218
intoSegment.orphaned === SegmentOrphanedReason.ADLIB_TESTING))
219219
break
220220
case PieceLifespan.OutOnShowStyleEnd:
@@ -386,7 +386,7 @@ export function getPieceInstancesForPart(
386386
newInstanceId: PartInstanceId,
387387
nextPartIsAfterCurrentPart: boolean,
388388
isTemporary: boolean,
389-
allowInfiniteAdlibToPersist: boolean
389+
allowTestingAdlibsToPersist: boolean
390390
): PieceInstance[] {
391391
const doesPieceAStartBeforePieceB = (
392392
pieceA: ReadonlyDeep<PieceInstancePiece>,
@@ -465,7 +465,7 @@ export function getPieceInstancesForPart(
465465
newInstanceId,
466466
nextPartIsAfterCurrentPart,
467467
isTemporary,
468-
allowInfiniteAdlibToPersist
468+
allowTestingAdlibsToPersist
469469
)
470470
: []
471471

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export async function syncPlayheadInfinitesForNextPartInstance(
279279
toPartInstance.partInstance._id,
280280
nextPartIsAfterCurrentPart,
281281
false,
282-
context.studio.settings.allowInfiniteAdlibToPersist ?? false
282+
context.studio.settings.allowTestingAdlibsToPersist ?? false
283283
)
284284

285285
toPartInstance.replaceInfinitesFromPreviousPlayhead(infinites)
@@ -380,7 +380,7 @@ export function getPieceInstancesForPart(
380380
newInstanceId,
381381
nextPartIsAfterCurrentPart,
382382
false,
383-
context.studio.settings.allowInfiniteAdlibToPersist ?? false
383+
context.studio.settings.allowTestingAdlibsToPersist ?? false
384384
)
385385
if (span) span.end()
386386
return res

packages/openapi/api/definitions/studios.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ components:
552552
allowAdlibTestingSegment:
553553
type: boolean
554554
description: Whether to allow adlib testing mode, before a Part is playing in a Playlist
555-
allowInfiniteAdlibToPersist:
555+
allowTestingAdlibsToPersist:
556556
type: boolean
557557
description: Whether to allow infinite adlib from adlib testing mode to persist in the rundown
558558
allowHold:

packages/shared-lib/src/core/model/StudioSettings.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export interface IStudioSettings {
4444
preserveOrphanedSegmentPositionInRundown?: boolean
4545

4646
/** Allow inifite adlibs from adlib testing mode to persist in the rundown */
47-
allowInfiniteAdlibToPersist?: boolean
47+
allowTestingAdlibsToPersist?: boolean
4848

4949
/**
5050
* The minimum amount of time, in milliseconds, that must pass after a take before another take may be performed.

packages/webui/src/client/lib/RundownResolver.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const SIMULATION_INVALIDATION = 3000
108108
* @param {boolean} nextPartIsAfterCurrentPart
109109
* @param {(PartInstance | undefined)} currentPartInstance
110110
* @param {(PieceInstance[] | undefined)} currentPartInstancePieceInstances
111-
* @param {boolean} allowInfiniteAdlibToPersist Studio config parameter to allow infinite adlibs from adlib testing to persist in the rundown
111+
* @param {boolean} allowTestingAdlibsToPersist Studio config parameter to allow infinite adlibs from adlib testing to persist in the rundown
112112
* @param {FindOptions<PieceInstance>} [options]
113113
* @param {boolean} [pieceInstanceSimulation] If there are no PieceInstances in the PartInstance, create temporary
114114
* PieceInstances based on the Pieces collection and register a reactive dependancy to recalculate the current
@@ -129,7 +129,7 @@ export function getPieceInstancesForPartInstance(
129129
currentPartInstance: PartInstance | undefined,
130130
currentSegment: Pick<DBSegment, '_id' | 'orphaned'> | undefined,
131131
currentPartInstancePieceInstances: PieceInstance[] | undefined,
132-
allowInfiniteAdlibToPersist: boolean,
132+
allowTestingAdlibsToPersist: boolean,
133133
/** Map of Pieces on Parts, passed through for performance */
134134
allPiecesCache?: Map<PartId, Piece[]>,
135135
options?: FindOptions<PieceInstance>,
@@ -165,7 +165,7 @@ export function getPieceInstancesForPartInstance(
165165
partInstance._id,
166166
nextPartIsAfterCurrentPart,
167167
partInstance.isTemporary,
168-
allowInfiniteAdlibToPersist
168+
allowTestingAdlibsToPersist
169169
)
170170
} else {
171171
const results =
@@ -213,7 +213,7 @@ export function getPieceInstancesForPartInstance(
213213
partInstance._id,
214214
nextPartIsAfterCurrentPart,
215215
true,
216-
allowInfiniteAdlibToPersist
216+
allowTestingAdlibsToPersist
217217
)
218218
} else {
219219
// otherwise, return results as they are

packages/webui/src/client/lib/rundown.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ export namespace RundownUtils {
497497
pieceInstanceFieldOptions
498498
).fetch()
499499
: undefined,
500-
studio?.settings.allowInfiniteAdlibToPersist ?? false,
500+
studio?.settings.allowTestingAdlibsToPersist ?? false,
501501
undefined,
502502
pieceInstanceFieldOptions,
503503
pieceInstanceSimulation

packages/webui/src/client/ui/Prompter/PrompterView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
547547
<Prompter
548548
rundownPlaylistId={this.props.rundownPlaylist._id}
549549
config={this.configOptions}
550-
allowInfiniteAdlibToPersist={this.props.studio?.settings.allowInfiniteAdlibToPersist ?? false}
550+
allowTestingAdlibsToPersist={this.props.studio?.settings.allowTestingAdlibsToPersist ?? false}
551551
>
552552
{this.configOptions.showOverUnder && (
553553
<OverUnderTimer rundownPlaylist={this.props.rundownPlaylist} style={overUnderStyle} />
@@ -637,7 +637,7 @@ export function PrompterView(props: Readonly<IProps>): JSX.Element {
637637
interface IPrompterProps {
638638
rundownPlaylistId: RundownPlaylistId
639639
config: PrompterConfig
640-
allowInfiniteAdlibToPersist: boolean
640+
allowTestingAdlibsToPersist: boolean
641641
}
642642
interface IPrompterTrackedProps {
643643
prompterData: PrompterData | null
@@ -690,7 +690,7 @@ function Prompter(props: Readonly<PropsWithChildren<IPrompterProps>>): JSX.Eleme
690690
)
691691

692692
const nextTrackedProps = useTracker(
693-
() => PrompterAPI.getPrompterData(props.rundownPlaylistId, props.allowInfiniteAdlibToPersist),
693+
() => PrompterAPI.getPrompterData(props.rundownPlaylistId, props.allowTestingAdlibsToPersist),
694694
[props.rundownPlaylistId],
695695
null
696696
)

packages/webui/src/client/ui/Prompter/prompter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export namespace PrompterAPI {
6363
// TODO: discuss: move this implementation to server-side?
6464
export function getPrompterData(
6565
playlistId: RundownPlaylistId,
66-
allowInfiniteAdlibToPersist: boolean
66+
allowTestingAdlibsToPersist: boolean
6767
): PrompterData | null {
6868
if (typeof playlistId !== 'string') throw new Error('Expected `playlistId` to be a string')
6969

@@ -235,7 +235,7 @@ export namespace PrompterAPI {
235235
currentPartInstance,
236236
currentSegment,
237237
currentPartInstancePieceInstances,
238-
allowInfiniteAdlibToPersist,
238+
allowTestingAdlibsToPersist,
239239
allPiecesCache,
240240
pieceInstanceFieldOptions,
241241
true

0 commit comments

Comments
 (0)