Skip to content

Commit 8ff4e14

Browse files
committed
Merge remote-tracking branch 'nrk/release52' into bbc-release52
# Conflicts: # meteor/package.json # meteor/yarn.lock # packages/blueprints-integration/src/documents/piece.ts # packages/job-worker/src/blueprints/context/lib.ts # packages/meteor-lib/package.json # packages/mos-gateway/package.json # packages/shared-lib/package.json # packages/webui/package.json # packages/webui/src/client/ui/FloatingInspectors/VTFloatingInspector.tsx # packages/webui/src/client/ui/RundownView.tsx # packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx # packages/webui/src/client/ui/SegmentTimeline/SourceLayerItem.tsx # packages/yarn.lock
2 parents 0365534 + b51ee26 commit 8ff4e14

File tree

139 files changed

+1174
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+1174
-143
lines changed

meteor/CHANGELOG.md

Lines changed: 16 additions & 0 deletions

meteor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@babel/runtime": "^7.26.0",
4141
"@koa/cors": "^5.0.0",
4242
"@koa/router": "^13.1.0",
43-
"@mos-connection/helper": "^4.2.0",
43+
"@mos-connection/helper": "^4.2.2",
4444
"@slack/webhook": "^7.0.4",
4545
"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration",
4646
"@sofie-automation/corelib": "portal:../packages/corelib",

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,8 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
275275
connection: Meteor.Connection,
276276
event: string,
277277
rundownPlaylistId: RundownPlaylistId,
278-
delta: number
278+
delta: number,
279+
ignoreQuickLoop?: boolean
279280
): Promise<ClientAPI.ClientResponse<PartId | null>> {
280281
return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(
281282
this.context.getMethodContext(connection),
@@ -291,6 +292,7 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
291292
playlistId: rundownPlaylistId,
292293
partDelta: delta,
293294
segmentDelta: 0,
295+
ignoreQuickLoop,
294296
}
295297
)
296298
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,14 @@ export interface PlaylistsRestAPI {
109109
* @param event User event string
110110
* @param rundownPlaylistId Playlist to target.
111111
* @param delta Amount to move next point by (+/-)
112+
* @param ignoreQuickLoop When moving the next part it should ignore any of the boundaries set by the QuickLoop feature
112113
*/
113114
moveNextPart(
114115
connection: Meteor.Connection,
115116
event: string,
116117
rundownPlaylistId: RundownPlaylistId,
117-
delta: number
118+
delta: number,
119+
ignoreQuickLoop?: boolean
118120
): Promise<ClientAPI.ClientResponse<PartId | null>>
119121
/**
120122
* Moves the next Segment point by `delta` places. Negative values are allowed to move "backwards" in the script.

packages/blueprints-integration/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
-24 Bytes
-77 Bytes
-22.4 KB
-19.4 KB
-77.7 KB

0 commit comments

Comments
 (0)