Skip to content

Commit

Permalink
chore: update blueprints-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
Julusian committed May 25, 2020
1 parent 0b63bfe commit 2baee3b
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 15 deletions.
22 changes: 11 additions & 11 deletions meteor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"soap": "^0.24.0",
"superfly-timeline": "^7.3.1",
"timecode": "0.0.4",
"tv-automation-sofie-blueprints-integration": "1.11.0",
"tv-automation-sofie-blueprints-integration": "1.12.0-nightly-20200522-143610-38735c5.0",
"underscore": "^1.8.3",
"velocity-animate": "^1.5.1",
"velocity-react": "^1.3.3",
Expand Down
16 changes: 14 additions & 2 deletions meteor/server/api/blueprints/context.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as _ from 'underscore'
import { Meteor } from 'meteor/meteor'
import { getHash, formatDateAsTimecode, formatDurationAsTimecode, unprotectString, unprotectObject, unprotectObjectArray, protectString } from '../../../lib/lib'
import { getHash, formatDateAsTimecode, formatDurationAsTimecode, unprotectString, unprotectObject, unprotectObjectArray, protectString, getCurrentTime } from '../../../lib/lib'
import { DBPart, PartId } from '../../../lib/collections/Parts'
import { check, Match } from 'meteor/check'
import { logger } from '../../../lib/logging'
Expand Down Expand Up @@ -249,7 +249,7 @@ export class ShowStyleContext extends StudioContext implements IShowStyleContext

/** Rundown */

export class RundownContext extends ShowStyleContext implements IRundownContext {
export class RundownContext extends ShowStyleContext implements IRundownContext, IEventContext {
readonly rundownId: string
readonly rundown: Readonly<IBlueprintRundownDB>
readonly _rundown: Rundown
Expand All @@ -263,6 +263,10 @@ export class RundownContext extends ShowStyleContext implements IRundownContext
this._rundown = rundown
this.playlistId = rundown.playlistId
}

getCurrentTime(): number {
return getCurrentTime()
}
}

export type BlueprintRuntimeArgumentsSet = { [key: string]: BlueprintRuntimeArguments | undefined }
Expand Down Expand Up @@ -295,6 +299,10 @@ export class SegmentContext extends RundownContext implements ISegmentContext {

export class EventContext extends CommonContext implements IEventContext {
// TDB: Certain actions that can be triggered in Core by the Blueprint

getCurrentTime(): number {
return getCurrentTime()
}
}

export class PartEventContext extends RundownContext implements IPartEventContext {
Expand All @@ -305,6 +313,10 @@ export class PartEventContext extends RundownContext implements IPartEventContex

this.part = unprotectPartInstance(partInstance)
}

getCurrentTime(): number {
return getCurrentTime()
}
}

export class AsRunEventContext extends RundownContext implements IAsRunEventContext {
Expand Down
2 changes: 1 addition & 1 deletion meteor/server/api/playout/lookahead.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function getLookeaheadObjects (playoutData: RundownPlaylistPlayoutData, s
obj.enable = enable
obj.isLookahead = true
if (obj.keyframes) {
obj.keyframes = obj.keyframes.filter(kf => (kf as any).preserveForLookahead)
obj.keyframes = obj.keyframes.filter(kf => kf.preserveForLookahead)
}
delete obj.inGroup // force it to be cleared

Expand Down

0 comments on commit 2baee3b

Please sign in to comment.