diff --git a/packages/timeline-state-resolver/package.json b/packages/timeline-state-resolver/package.json index 9e73bf2ea2..049d849eae 100644 --- a/packages/timeline-state-resolver/package.json +++ b/packages/timeline-state-resolver/package.json @@ -90,7 +90,7 @@ "atem-connection": "2.4.0", "atem-state": "^0.12.2", "casparcg-connection": "^5.1.0", - "casparcg-state": "2.1.1-nightly-20220216-113227-36bcfd5.0", + "casparcg-state": "^2.1.1", "debug": "^4.3.4", "deepmerge": "^4.2.2", "emberplus-connection": "^0.1.2", diff --git a/packages/timeline-state-resolver/src/__tests__/rundown.spec.ts b/packages/timeline-state-resolver/src/__tests__/rundown.spec.ts index abd2ee104a..1c7d8536dd 100644 --- a/packages/timeline-state-resolver/src/__tests__/rundown.spec.ts +++ b/packages/timeline-state-resolver/src/__tests__/rundown.spec.ts @@ -364,7 +364,7 @@ describe('Rundown', () => { noClear: false, clip: 'opener_short', loop: false, - seek: 1, // start at 10000 - 50 ms passed => seek 2 + seek: 0, // One might think that since this started 50ms ago we should seek to 1, however this is less than MIN_TIME_SINCE_PLAY in casparcg-state, so no seeking occurs }) expect(getMockCall(commandReceiver0, commandReceiver0Calls - 6, 1).name).toEqual('PlayCommand') expect(getMockCall(commandReceiver0, commandReceiver0Calls - 6, 1)._objectParams).toMatchObject({ diff --git a/yarn.lock b/yarn.lock index 6a425593f1..0b6436cf79 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2495,10 +2495,10 @@ casparcg-connection@^5.1.0: xml2js "^0.4.19" xmlbuilder "^9.0.7" -casparcg-state@2.1.1-nightly-20220216-113227-36bcfd5.0: - version "2.1.1-nightly-20220216-113227-36bcfd5.0" - resolved "https://registry.yarnpkg.com/casparcg-state/-/casparcg-state-2.1.1-nightly-20220216-113227-36bcfd5.0.tgz#dbedbee744678d08a0c99ecf267fc07aa62370c5" - integrity sha512-l7ZlZtAnNEQEv0ztBznL3h2ihCl4UclAlyKGY3S2aWosGys5tWY3tyAGbkqxSt+BOMhYlo+4AiZuLUOEKJTDNw== +casparcg-state@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/casparcg-state/-/casparcg-state-2.1.1.tgz#8d33bca7907f128b5a8a6918899ddc6d2d1413ae" + integrity sha512-p2EG2TsypyTHlLC+aiK65s0y9O22moGx3egZzfHU/PbnWmFeyYUo5eqU/s7sTdlyTpBNVgrbIJ7LPRgtgNOvWA== dependencies: casparcg-connection "^5.1.0" fast-clone "^1.5.13"