Skip to content

Commit 1795ea9

Browse files
jstarpljstarpl
committed
Merge branch 'release51' into release52
2 parents 3a66e93 + ea7cece commit 1795ea9

File tree

17 files changed

+263
-70
lines changed

17 files changed

+263
-70
lines changed

‎meteor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"object-path": "^0.11.8",
6868
"p-lazy": "^3.1.0",
6969
"semver": "^7.5.4",
70-
"superfly-timeline": "9.0.1",
70+
"superfly-timeline": "9.0.2",
7171
"threadedclass": "^1.2.2",
7272
"timecode": "0.0.4",
7373
"type-fest": "^3.13.1",

‎meteor/yarn.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ __metadata:
12111211
node-fetch: ^2.7.0
12121212
p-lazy: ^3.1.0
12131213
p-timeout: ^4.1.0
1214-
superfly-timeline: 9.0.1
1214+
superfly-timeline: 9.0.2
12151215
threadedclass: ^1.2.2
12161216
tslib: ^2.6.2
12171217
type-fest: ^3.13.1
@@ -2349,7 +2349,7 @@ __metadata:
23492349
prettier: ^2.8.8
23502350
semver: ^7.5.4
23512351
standard-version: ^9.5.0
2352-
superfly-timeline: 9.0.1
2352+
superfly-timeline: 9.0.2
23532353
threadedclass: ^1.2.2
23542354
timecode: 0.0.4
23552355
ts-jest: ^29.1.2
@@ -10026,12 +10026,12 @@ __metadata:
1002610026
languageName: node
1002710027
linkType: hard
1002810028

10029-
"superfly-timeline@npm:9.0.1":
10030-
version: 9.0.1
10031-
resolution: "superfly-timeline@npm:9.0.1"
10029+
"superfly-timeline@npm:9.0.2":
10030+
version: 9.0.2
10031+
resolution: "superfly-timeline@npm:9.0.2"
1003210032
dependencies:
1003310033
tslib: ^2.6.0
10034-
checksum: 4267eed691fe9ce9f89bf17c8aed1a98206938dd6d850c64b083e4fd3a3dc5329801c76c757450c9520375bad100ce512cc6d6a3e4a997bdfa14a4e7d65f09f2
10034+
checksum: d628d467d5384f5667bc10b877478c5b8b0a91774b5d5c5e9d9d3134b8f1b760225f2fbbb0f9ccd3e55f930c9f3719f81b9347b94ea853fbc0a18bc121d97665
1003510035
languageName: node
1003610036
linkType: hard
1003710037

‎packages/blueprints-integration/CHANGELOG.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,46 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
7+
8+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
9+
10+
11+
12+
13+
14+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
15+
16+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
17+
18+
19+
20+
21+
22+
## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
23+
24+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
25+
26+
27+
28+
29+
30+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
31+
32+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
33+
34+
35+
36+
37+
38+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
39+
40+
**Note:** Version bump only for package @sofie-automation/blueprints-integration
41+
42+
43+
44+
45+
646
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
747

848
**Note:** Version bump only for package @sofie-automation/blueprints-integration

‎packages/job-worker/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"node-fetch": "^2.7.0",
5353
"p-lazy": "^3.1.0",
5454
"p-timeout": "^4.1.0",
55-
"superfly-timeline": "9.0.1",
55+
"superfly-timeline": "9.0.2",
5656
"threadedclass": "^1.2.2",
5757
"tslib": "^2.6.2",
5858
"type-fest": "^3.13.1",

‎packages/job-worker/src/ingest/syncChangesToPartInstance.ts‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
import { validateAdlibTestingPartInstanceProperties } from '../playout/adlibTesting'
3232
import { ReadonlyDeep } from 'type-fest'
3333
import { convertIngestModelToPlayoutRundownWithSegments } from './commit'
34+
import { PlayoutRundownModel } from '../playout/model/PlayoutRundownModel'
3435

3536
type PlayStatus = 'previous' | 'current' | 'next'
3637
type SyncedInstance = {
@@ -131,12 +132,22 @@ export async function syncChangesToPartInstances(
131132
pieceInstances: pieceInstancesInPart.map((p) => convertPieceInstanceToBlueprints(p.pieceInstance)),
132133
}
133134

135+
const part = newPart ?? existingPartInstance.partInstance.part
136+
137+
let playoutRundownModelForPart: PlayoutRundownModel | undefined = playoutRundownModel
138+
// Handle a case where the part is in a different rundown than the playoutRundownModel:
139+
if (playoutRundownModel.rundown._id !== part.rundownId) {
140+
playoutRundownModelForPart = playoutModel.getRundown(part.rundownId)
141+
}
142+
if (!playoutRundownModelForPart)
143+
throw new Error(`Internal Error: playoutRundownModelForPart is undefined (it should never be)`)
144+
134145
const proposedPieceInstances = getPieceInstancesForPart(
135146
context,
136147
playoutModel,
137148
previousPartInstance,
138-
playoutRundownModel,
139-
newPart ?? existingPartInstance.partInstance.part,
149+
playoutRundownModelForPart,
150+
part,
140151
await piecesThatMayBeActive,
141152
existingPartInstance.partInstance._id
142153
)
@@ -211,10 +222,11 @@ export async function syncChangesToPartInstances(
211222
// TODO - these dont get shown to the user currently
212223
// TODO - old notes from the sync may need to be pruned, or we will end up with duplicates and 'stuck' notes?+
213224
existingPartInstance.appendNotes(newNotes)
214-
215-
validateAdlibTestingPartInstanceProperties(context, playoutModel, existingPartInstance)
216225
}
217226

227+
// Make sure an adlib-testing part is still labeled correctly. This could happen if the partInstance used any recently updated adlibs
228+
validateAdlibTestingPartInstanceProperties(context, playoutModel, existingPartInstance)
229+
218230
if (existingPartInstance.partInstance._id === playoutModel.playlist.currentPartInfo?.partInstanceId) {
219231
// This should be run after 'current', before 'next':
220232
await syncPlayheadInfinitesForNextPartInstance(

‎packages/job-worker/src/playout/model/PlayoutPartInstanceModel.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,11 @@ export interface PlayoutPartInstanceModel {
176176
* @param time Reported stopped time
177177
*/
178178
setReportedStoppedPlayback(time: Time): boolean
179+
/**
180+
* Set the Reported stopped playback time, including still-playing PieceInstances
181+
* @param time Reported stopped time on all available objects
182+
*/
183+
setReportedStoppedPlaybackWithPieceInstances(time: Time): boolean
179184

180185
/**
181186
* Set the rank of this PartInstance, to update it's position in the Segment

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,11 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
502502
deactivatePlaylist(): void {
503503
delete this.playlistImpl.activationId
504504

505+
if (this.currentPartInstance) {
506+
this.currentPartInstance.setReportedStoppedPlaybackWithPieceInstances(getCurrentTime())
507+
this.queuePartInstanceTimingEvent(this.currentPartInstance.partInstance._id)
508+
}
509+
505510
this.clearSelectedPartInstances()
506511
this.playlistImpl.quickLoop = this.quickLoopService.getUpdatedPropsByClearingMarkers()
507512

‎packages/job-worker/src/playout/model/implementation/PlayoutPartInstanceModelImpl.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,19 @@ export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
493493
}
494494
return false
495495
}
496+
setReportedStoppedPlaybackWithPieceInstances(time: number): boolean {
497+
if (!this.partInstance.timings?.reportedStartedPlayback) return false
498+
499+
let setOnAll = this.setReportedStoppedPlayback(time)
500+
501+
for (const model of this.pieceInstances) {
502+
if (model.pieceInstance.reportedStartedPlayback) {
503+
setOnAll &&= model.setReportedStoppedPlayback(time)
504+
}
505+
}
506+
507+
return setOnAll
508+
}
496509

497510
setRank(rank: number): void {
498511
this.#compareAndSetPartValue('_rank', rank)

‎packages/mos-gateway/CHANGELOG.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,46 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
7+
8+
**Note:** Version bump only for package mos-gateway
9+
10+
11+
12+
13+
14+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
15+
16+
**Note:** Version bump only for package mos-gateway
17+
18+
19+
20+
21+
22+
## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
23+
24+
**Note:** Version bump only for package mos-gateway
25+
26+
27+
28+
29+
30+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
31+
32+
**Note:** Version bump only for package mos-gateway
33+
34+
35+
36+
37+
38+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
39+
40+
**Note:** Version bump only for package mos-gateway
41+
42+
43+
44+
45+
646
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
747

848
**Note:** Version bump only for package mos-gateway

‎packages/playout-gateway/CHANGELOG.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,46 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
7+
8+
**Note:** Version bump only for package playout-gateway
9+
10+
11+
12+
13+
14+
## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
15+
16+
**Note:** Version bump only for package playout-gateway
17+
18+
19+
20+
21+
22+
## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
23+
24+
**Note:** Version bump only for package playout-gateway
25+
26+
27+
28+
29+
30+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
31+
32+
**Note:** Version bump only for package playout-gateway
33+
34+
35+
36+
37+
38+
## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
39+
40+
**Note:** Version bump only for package playout-gateway
41+
42+
43+
44+
45+
646
# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
747

848
**Note:** Version bump only for package playout-gateway

0 commit comments

Comments
 (0)