fix: update to newer atem-connection api

Julusian · Julusian · commit 425a245476b7 · 2020-01-15T14:14:29.000Z
diff --git a/src/__tests__/atemState.spec.ts b/src/__tests__/atemState.spec.ts
@@ -1,9 +1,10 @@
-import { AtemState, State as StateObject } from '../'
+import { AtemState } from '../'
+import { AtemStateUtil } from 'atem-connection'
 
 test('Unit test: Atem State: Set State', function () {
 	const state = new AtemState()
 
-	const newObj = new StateObject()
+	const newObj = AtemStateUtil.Create()
 	;(newObj.video.auxilliaries as number[]) = [0, 0, 1]
 	state.setState(newObj)
 
@@ -13,11 +14,11 @@ test('Unit test: Atem State: Set State', function () {
 test('Unit test: Atem State: Diff State', function () {
 	const state = new AtemState()
 
-	const newObj = new StateObject()
+	const newObj = AtemStateUtil.Create()
 	;(newObj.video.auxilliaries as number[]) = [0, 0, 1]
 	state.setState(newObj)
 
-	const newObj2 = new StateObject()
+	const newObj2 = AtemStateUtil.Create()
 	;(newObj2.video.auxilliaries as number[]) = [0, 0, 2]
 	const commands = state.diffState(newObj2)
 
diff --git a/src/atemState.ts b/src/atemState.ts
@@ -1,4 +1,4 @@
-import { Commands, Enums } from 'atem-connection'
+import { Commands, Enums, AtemStateUtil } from 'atem-connection'
 import { State as StateObject } from '.'
 import * as Resolvers from './resolvers'
 
@@ -8,7 +8,7 @@ export class AtemState {
 	private _state: StateObject
 
 	public constructor () {
-		this._state = new StateObject()
+		this._state = AtemStateUtil.Create()
 	}
 
 	setState (state: StateObject) {
diff --git a/src/defaults.ts b/src/defaults.ts
@@ -173,7 +173,7 @@ export namespace Defaults {
 			}
 		}
 
-		export const SuperSourceBox: VideoState.SuperSourceBox = {
+		export const SuperSourceBox: VideoState.SuperSource.SuperSourceBox = {
 			enabled: false,
 			source: defaultInput,
 			x: 0,
@@ -186,7 +186,7 @@ export namespace Defaults {
 			cropRight: 0
 		}
 
-		export const SuperSourceProperties: VideoState.SuperSourceProperties = {
+		export const SuperSourceProperties: VideoState.SuperSource.SuperSourceProperties = {
 			artFillSource: defaultInput,
 			artCutSource: defaultInput,
 			artOption: Enums.SuperSourceArtOption.Background,
@@ -196,7 +196,7 @@ export namespace Defaults {
 			artInvertKey: false
 		}
 
-		export const SuperSourceBorder: VideoState.SuperSourceBorder = {
+		export const SuperSourceBorder: VideoState.SuperSource.SuperSourceBorder = {
 			borderEnabled: false,
 			borderBevel: Enums.BorderBevel.None,
 			borderOuterWidth: 0,
diff --git a/src/resolvers/__tests__/audio.spec.ts b/src/resolvers/__tests__/audio.spec.ts
@@ -1,12 +1,11 @@
-import { State as StateObject } from '../../'
 import * as audio from '../audio'
 import * as _ from 'underscore'
 import { jsonClone } from '../../util'
-import { AudioState, Commands } from 'atem-connection'
+import { AudioState, Commands, AtemStateUtil } from 'atem-connection'
 
 function literal<T> (o: T) { return o }
 
-const STATE1 = new StateObject()
+const STATE1 = AtemStateUtil.Create()
 STATE1.audio.channels = [
 	literal<AudioState.AudioChannel>({
 		sourceType: 0,
@@ -23,7 +22,7 @@ STATE1.audio.channels = [
 		balance: 4
 	})
 ]
-const STATE2 = new StateObject()
+const STATE2 = AtemStateUtil.Create()
 STATE2.audio.channels = jsonClone(STATE1.audio.channels)
 STATE2.audio.master = {
 	gain: 0,
diff --git a/src/resolvers/__tests__/auxiliaries.spec.ts b/src/resolvers/__tests__/auxiliaries.spec.ts
@@ -1,11 +1,10 @@
 import * as video from '../index'
-import { State as StateObject } from '../../'
-import { Commands, Enums } from 'atem-connection'
+import { Commands, Enums, AtemStateUtil } from 'atem-connection'
 
-const STATE1 = new StateObject()
+const STATE1 = AtemStateUtil.Create()
 ;(STATE1.video.auxilliaries as number[]) = [ 0, 0, 0, 2 ]
 
-const STATE2 = new StateObject()
+const STATE2 = AtemStateUtil.Create()
 ;(STATE2.video.auxilliaries as number[]) = [ 1, 0, 2, 0 ]
 
 test('Unit: auxiliaries: same state gives no commands', function () {
diff --git a/src/resolvers/__tests__/downstreamKeyer.spec.ts b/src/resolvers/__tests__/downstreamKeyer.spec.ts
@@ -1,22 +1,22 @@
 import * as DSK from '../downstreamKeyer'
 import { State as StateObject } from '../../'
-import { Commands } from 'atem-connection'
+import { Commands, AtemStateUtil } from 'atem-connection'
 import * as _ from 'underscore'
 import { Defaults } from '../../defaults'
 import { jsonClone } from '../../util'
 
 function setupDSK (state: StateObject, index: number) {
-	const dsk = state.video.getDownstreamKeyer(index)
+	const dsk = AtemStateUtil.getDownstreamKeyer(state, index)
 	dsk.properties = jsonClone(Defaults.Video.DownstreamerKeyerProperties)
 	dsk.sources = jsonClone(Defaults.Video.DownstreamerKeyerSources)
 	return dsk
 }
 
-const STATE1 = new StateObject()
+const STATE1 = AtemStateUtil.Create()
 setupDSK(STATE1, 0)
 setupDSK(STATE1, 1)
 
-const STATE2 = new StateObject()
+const STATE2 = AtemStateUtil.Create()
 const DSK1 = setupDSK(STATE2, 0)
 const DSK2 = setupDSK(STATE2, 1)
 
diff --git a/src/resolvers/__tests__/macro.spec.ts b/src/resolvers/__tests__/macro.spec.ts
@@ -1,24 +1,23 @@
 import * as video from '../index'
-import { State as StateObject } from '../../'
-import { Commands, Enums } from 'atem-connection'
+import { Commands, Enums, AtemStateUtil } from 'atem-connection'
 
-const STATE1 = new StateObject()
+const STATE1 = AtemStateUtil.Create()
 STATE1.macro.macroPlayer = {
 	isRunning: true,
 	isWaiting: false,
 	loop: true,
 	macroIndex: 12
 }
 
-const STATE2 = new StateObject()
+const STATE2 = AtemStateUtil.Create()
 STATE2.macro.macroPlayer = {
 	isRunning: true,
 	isWaiting: false,
 	loop: true,
 	macroIndex: 10
 }
 
-const STATE3 = new StateObject()
+const STATE3 = AtemStateUtil.Create()
 STATE3.macro.macroPlayer = {
 	isRunning: false,
 	isWaiting: false,
diff --git a/src/resolvers/__tests__/media.spec.ts b/src/resolvers/__tests__/media.spec.ts
@@ -1,8 +1,7 @@
 import * as media from '../media'
-import { State as StateObject } from '../../'
-import { Commands, Enums, MediaState } from 'atem-connection'
+import { Commands, Enums, MediaState, AtemStateUtil } from 'atem-connection'
 
-const STATE1 = new StateObject()
+const STATE1 = AtemStateUtil.Create()
 ;(STATE1.media.players as MediaState.MediaPlayerState[]) = [
 	{
 		playing: false,
@@ -23,7 +22,7 @@ const STATE1 = new StateObject()
 		clipIndex: 0
 	}
 ]
-const STATE2 = new StateObject()
+const STATE2 = AtemStateUtil.Create()
 ;(STATE2.media.players as MediaState.MediaPlayerState[]) = [
 	{
 		playing: true,
diff --git a/src/resolvers/__tests__/mixEffect.spec.ts b/src/resolvers/__tests__/mixEffect.spec.ts
@@ -1,12 +1,12 @@
 import * as ME from '../mixEffect'
-import { State as StateObject, Enums, MixEffect, Defaults } from '../../'
-import { Commands, Enums as AtemEnums } from 'atem-connection'
+import { Enums, MixEffect, Defaults } from '../../'
+import { Commands, Enums as AtemEnums, AtemStateUtil } from 'atem-connection'
 import { jsonClone } from '../../util'
 
-const STATE1 = new StateObject()
-const ME1 = STATE1.video.getMe(0) as MixEffect
-const STATE2 = new StateObject()
-const ME2 = STATE2.video.getMe(0) as MixEffect
+const STATE1 = AtemStateUtil.Create()
+const ME1 = AtemStateUtil.getMixEffect(STATE1, 0) as MixEffect
+const STATE2 = AtemStateUtil.Create()
+const ME2 = AtemStateUtil.getMixEffect(STATE2, 0) as MixEffect
 
 test('Unit: mix effect: same state gives no commands', function () {
 	// same state gives no commands:
diff --git a/src/resolvers/__tests__/supersourceBox.spec.ts b/src/resolvers/__tests__/supersourceBox.spec.ts
@@ -1,20 +1,20 @@
 import * as supersource from '../supersource'
-import { State as StateObject, Defaults } from '../../'
-import { Commands, Enums } from 'atem-connection'
+import { Defaults } from '../../'
+import { Commands, Enums, AtemStateUtil } from 'atem-connection'
 import * as _ from 'underscore'
 import { jsonClone } from '../../util'
 
-const STATE1 = new StateObject()
-const SSRC1 = STATE1.video.getSuperSource(0)
+const STATE1 = AtemStateUtil.Create()
+const SSRC1 = AtemStateUtil.getSuperSource(STATE1, 0)
 SSRC1.boxes[0] = jsonClone(Defaults.Video.SuperSourceBox)
 SSRC1.boxes[1] = jsonClone(Defaults.Video.SuperSourceBox)
 SSRC1.boxes[2] = jsonClone(Defaults.Video.SuperSourceBox)
 SSRC1.boxes[3] = jsonClone(Defaults.Video.SuperSourceBox)
 SSRC1.border = jsonClone(Defaults.Video.SuperSourceBorder)
 SSRC1.properties = jsonClone(Defaults.Video.SuperSourceProperties)
 
-const STATE2 = new StateObject()
-const SSRC2 = STATE2.video.getSuperSource(0)
+const STATE2 = AtemStateUtil.Create()
+const SSRC2 = AtemStateUtil.getSuperSource(STATE2, 0)
 SSRC2.boxes[0] = {
 	enabled: true,
 	source: 1,
@@ -70,7 +70,7 @@ test('Unit: super source boxes: box removed', function () {
 })
 
 test('Unit: super source boxes: new box', function () {
-	STATE1.video.getSuperSource(0).boxes[0] = jsonClone(Defaults.Video.SuperSourceBox)
+	AtemStateUtil.getSuperSource(STATE1, 0).boxes[0] = jsonClone(Defaults.Video.SuperSourceBox)
 	const commands = supersource.resolveSuperSourceState(STATE1, STATE2, Enums.ProtocolVersion.V7_2) as Array<Commands.SuperSourceBoxParametersCommand>
 
 	expect(commands[0].constructor.name).toEqual('SuperSourceBoxParametersCommand')
@@ -89,7 +89,7 @@ test('Unit: super source boxes: new box', function () {
 		cropRight: 1
 	})
 
-	STATE1.video.getSuperSource(0).boxes[0] = STATE2.video.getSuperSource(0).boxes[0]
+	AtemStateUtil.getSuperSource(STATE1, 0).boxes[0] = AtemStateUtil.getSuperSource(STATE2, 0).boxes[0]
 })
 
 test('Unit: super source properties: same state gives no commands', function () {
@@ -155,8 +155,8 @@ test('Unit: super source border v8: some properties changed', function () {
 })
 
 test('Unit: super source box v8: 2 super sources', function () {
-	STATE1.video.superSources[1] = jsonClone(STATE1.video.getSuperSource(0))
-	const newSSrc = STATE2.video.superSources[1] = jsonClone(STATE1.video.getSuperSource(0))
+	STATE1.video.superSources[1] = jsonClone(AtemStateUtil.getSuperSource(STATE1, 0))
+	const newSSrc = STATE2.video.superSources[1] = jsonClone(AtemStateUtil.getSuperSource(STATE1, 0))
 	newSSrc.boxes[0]!.cropped = false
 
 	const commands = supersource.resolveSuperSourceBoxState(STATE1, STATE2, Enums.ProtocolVersion.V8_0) as Array<Commands.SuperSourceBoxParametersCommand>
diff --git a/src/resolvers/downstreamKeyer.ts b/src/resolvers/downstreamKeyer.ts
@@ -1,5 +1,5 @@
 import {
-	Commands as AtemCommands, VideoState
+	Commands as AtemCommands, VideoState, AtemStateUtil
 } from 'atem-connection'
 import { State as StateObject, Defaults } from '../'
 import { getAllKeysNumber, diffObject } from '../util'
@@ -8,8 +8,8 @@ export function resolveDownstreamKeyerState (oldState: StateObject, newState: St
 	const commands: Array<AtemCommands.ISerializableCommand> = []
 
 	for (const index of getAllKeysNumber(oldState.video.downstreamKeyers, newState.video.downstreamKeyers)) {
-		const oldDsk = oldState.video.getDownstreamKeyer(index, true)
-		const newDsk = newState.video.getDownstreamKeyer(index, true)
+		const oldDsk = AtemStateUtil.getDownstreamKeyer(newState, index, true)
+		const newDsk = AtemStateUtil.getDownstreamKeyer(oldState, index, true)
 
 		commands.push(...resolveDownstreamKeyerPropertiesState(index, oldDsk, newDsk))
 		commands.push(...resolveDownstreamKeyerMaskState(index, oldDsk, newDsk))
diff --git a/src/resolvers/media.ts b/src/resolvers/media.ts
@@ -1,5 +1,5 @@
 import {
-	Commands as AtemCommands
+	Commands as AtemCommands, AtemStateUtil
 } from 'atem-connection'
 import { State as StateObject } from '../'
 import { diffObject, getAllKeysNumber } from '../util'
@@ -8,8 +8,8 @@ export function resolveMediaPlayerState (oldState: StateObject, newState: StateO
 	const commands: Array<AtemCommands.ISerializableCommand> = []
 
 	for (const index of getAllKeysNumber(oldState.media.players, newState.media.players)) {
-		const newPlayer = newState.media.getMediaPlayer(index, true)
-		const oldPlayer = oldState.media.getMediaPlayer(index, true)
+		const newPlayer = AtemStateUtil.getMediaPlayer(newState, index, true)
+		const oldPlayer = AtemStateUtil.getMediaPlayer(oldState, index, true)
 
 		const props = diffObject(oldPlayer, newPlayer)
 		const command = new AtemCommands.MediaPlayerStatusCommand(index)
diff --git a/src/resolvers/mixEffect.ts b/src/resolvers/mixEffect.ts
@@ -1,6 +1,7 @@
 import {
 	Commands as AtemCommands,
-	Enums as ConnectionEnums
+	Enums as ConnectionEnums,
+	AtemStateUtil
 } from 'atem-connection'
 import { Enums, State as StateObject, Defaults } from '../'
 import { getAllKeysNumber, diffObject } from '../util'
@@ -12,9 +13,9 @@ import { resolveUpstreamKeyerState } from './upstreamKeyers'
 export function resolveMixEffectsState (oldState: StateObject, newState: StateObject): Array<AtemCommands.ISerializableCommand> {
 	const commands: Array<AtemCommands.ISerializableCommand> = []
 
-	for (const mixEffectId of getAllKeysNumber(oldState.video.ME, newState.video.ME)) {
-		const oldMixEffect: MixEffect = oldState.video.getMe(mixEffectId, true)
-		const newMixEffect: MixEffect = newState.video.getMe(mixEffectId, true)
+	for (const mixEffectId of getAllKeysNumber(oldState.video.mixEffects, newState.video.mixEffects)) {
+		const oldMixEffect: MixEffect = AtemStateUtil.getMixEffect(oldState, mixEffectId, true)
+		const newMixEffect: MixEffect = AtemStateUtil.getMixEffect(newState, mixEffectId, true)
 
 		commands.push(...resolveTransitionPropertiesState(mixEffectId, oldMixEffect, newMixEffect))
 		commands.push(...resolveTransitionSettingsState(mixEffectId, oldMixEffect, newMixEffect))
diff --git a/src/resolvers/supersource.ts b/src/resolvers/supersource.ts
@@ -1,10 +1,12 @@
 import {
-	Commands as AtemCommands, VideoState, Enums
+	Commands as AtemCommands, VideoState, Enums, AtemStateUtil
 } from 'atem-connection'
 import { State as StateObject } from '..'
 import { diffObject, getAllKeysNumber } from '../util'
 import { Defaults } from '../defaults'
 
+type SuperSourceCombinedProperties = VideoState.SuperSource.SuperSourceProperties & VideoState.SuperSource.SuperSourceBorder
+
 export function resolveSuperSourceState (oldState: StateObject, newState: StateObject, version: Enums.ProtocolVersion): Array<AtemCommands.ISerializableCommand> {
 	const commands: Array<AtemCommands.ISerializableCommand> = []
 
@@ -29,8 +31,8 @@ export function resolveSuperSourceBoxState (oldState: StateObject, newState: Sta
 			continue
 		}
 
-		const newSSrc = newState.video.getSuperSource(ssrc, true)
-		const oldSSrc = oldState.video.getSuperSource(ssrc, true)
+		const newSSrc = AtemStateUtil.getSuperSource(newState, ssrc, true)
+		const oldSSrc = AtemStateUtil.getSuperSource(oldState, ssrc, true)
 		for (const index in newSSrc.boxes) {
 			const props = diffObject(oldSSrc.boxes[index] || Defaults.Video.SuperSourceBox, newSSrc.boxes[index] || Defaults.Video.SuperSourceBox)
 			const command = new AtemCommands.SuperSourceBoxParametersCommand(ssrc, Number(index))
@@ -47,14 +49,14 @@ export function resolveSuperSourcePropertiesState (oldState: StateObject, newSta
 	const commands: Array<AtemCommands.ISerializableCommand> = []
 
 	if (!newState.video.superSources[0] && !oldState.video.superSources[0]) return commands
-	const newSSrc = newState.video.getSuperSource(0, true)
-	const oldSSrc = oldState.video.getSuperSource(0, true)
+	const newSSrc = AtemStateUtil.getSuperSource(newState, 0, true)
+	const oldSSrc = AtemStateUtil.getSuperSource(oldState, 0, true)
 
-	const newSsProperties: Partial<VideoState.SuperSourceProperties & VideoState.SuperSourceBorder> = {
+	const newSsProperties: Partial<SuperSourceCombinedProperties> = {
 		...newSSrc.properties,
 		...newSSrc.border
 	}
-	const oldSsProperties: Partial<VideoState.SuperSourceProperties & VideoState.SuperSourceBorder> = {
+	const oldSsProperties: Partial<SuperSourceCombinedProperties> = {
 		...oldSSrc.properties,
 		...oldSSrc.border
 	}
@@ -72,8 +74,8 @@ export function resolveSuperSourcePropertiesV8State (oldState: StateObject, newS
 	const commands: Array<AtemCommands.ISerializableCommand> = []
 
 	for (const ssrc of getAllKeysNumber(oldState.video.superSources, newState.video.superSources).sort()) {
-		const newSSrc = newState.video.getSuperSource(ssrc, true)
-		const oldSSrc = oldState.video.getSuperSource(ssrc, true)
+		const newSSrc = AtemStateUtil.getSuperSource(newState, ssrc, true)
+		const oldSSrc = AtemStateUtil.getSuperSource(oldState, ssrc, true)
 
 		const props = diffObject(oldSSrc.properties || Defaults.Video.SuperSourceProperties, newSSrc.properties || Defaults.Video.SuperSourceProperties)
 		const command = new AtemCommands.SuperSourcePropertiesV8Command(ssrc)
@@ -89,8 +91,8 @@ export function resolveSuperSourceBorderV8State (oldState: StateObject, newState
 	const commands: Array<AtemCommands.ISerializableCommand> = []
 
 	for (const ssrc of getAllKeysNumber(oldState.video.superSources, newState.video.superSources).sort()) {
-		const newSSrc = newState.video.getSuperSource(ssrc, true)
-		const oldSSrc = oldState.video.getSuperSource(ssrc, true)
+		const newSSrc = AtemStateUtil.getSuperSource(newState, ssrc, true)
+		const oldSSrc = AtemStateUtil.getSuperSource(oldState, ssrc, true)
 
 		const props = diffObject(oldSSrc.border || Defaults.Video.SuperSourceBorder, newSSrc.border || Defaults.Video.SuperSourceBorder)
 		const command = new AtemCommands.SuperSourceBorderCommand(ssrc)
diff --git a/src/resolvers/upstreamKeyers/__tests__/chromaKeyer.spec.ts b/src/resolvers/upstreamKeyers/__tests__/chromaKeyer.spec.ts
diff --git a/src/resolvers/upstreamKeyers/__tests__/dveKeyer.spec.ts b/src/resolvers/upstreamKeyers/__tests__/dveKeyer.spec.ts
diff --git a/src/resolvers/upstreamKeyers/__tests__/lumaKeyer.spec.ts b/src/resolvers/upstreamKeyers/__tests__/lumaKeyer.spec.ts
diff --git a/src/resolvers/upstreamKeyers/__tests__/patternKeyer.spec.ts b/src/resolvers/upstreamKeyers/__tests__/patternKeyer.spec.ts
diff --git a/src/resolvers/upstreamKeyers/__tests__/upstreamKeyer.spec.ts b/src/resolvers/upstreamKeyers/__tests__/upstreamKeyer.spec.ts
diff --git a/src/resolvers/upstreamKeyers/index.ts b/src/resolvers/upstreamKeyers/index.ts
diff --git a/src/state.ts b/src/state.ts

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ export namespace Defaults {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`- export const SuperSourceBox: VideoState.SuperSourceBox = {`
	`176`	`+ export const SuperSourceBox: VideoState.SuperSource.SuperSourceBox = {`
`177`	`177`	`enabled: false,`
`178`	`178`	`source: defaultInput,`
`179`	`179`	`x: 0,`
`@@ -186,7 +186,7 @@ export namespace Defaults {`
`186`	`186`	`cropRight: 0`
`187`	`187`	`}`
`188`	`188`
`189`		`- export const SuperSourceProperties: VideoState.SuperSourceProperties = {`
	`189`	`+ export const SuperSourceProperties: VideoState.SuperSource.SuperSourceProperties = {`
`190`	`190`	`artFillSource: defaultInput,`
`191`	`191`	`artCutSource: defaultInput,`
`192`	`192`	`artOption: Enums.SuperSourceArtOption.Background,`
`@@ -196,7 +196,7 @@ export namespace Defaults {`
`196`	`196`	`artInvertKey: false`
`197`	`197`	`}`
`198`	`198`
`199`		`- export const SuperSourceBorder: VideoState.SuperSourceBorder = {`
	`199`	`+ export const SuperSourceBorder: VideoState.SuperSource.SuperSourceBorder = {`
`200`	`200`	`borderEnabled: false,`
`201`	`201`	`borderBevel: Enums.BorderBevel.None,`
`202`	`202`	`borderOuterWidth: 0,`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`import * as media from '../media'`
`2`		`-import { State as StateObject } from '../../'`
`3`		`-import { Commands, Enums, MediaState } from 'atem-connection'`
	`2`	`+import { Commands, Enums, MediaState, AtemStateUtil } from 'atem-connection'`
`4`	`3`
`5`		`-const STATE1 = new StateObject()`
	`4`	`+const STATE1 = AtemStateUtil.Create()`
`6`	`5`	`;(STATE1.media.players as MediaState.MediaPlayerState[]) = [`
`7`	`6`	`{`
`8`	`7`	`playing: false,`
`@@ -23,7 +22,7 @@ const STATE1 = new StateObject()`
`23`	`22`	`clipIndex: 0`
`24`	`23`	`}`
`25`	`24`	`]`
`26`		`-const STATE2 = new StateObject()`
	`25`	`+const STATE2 = AtemStateUtil.Create()`
`27`	`26`	`;(STATE2.media.players as MediaState.MediaPlayerState[]) = [`
`28`	`27`	`{`
`29`	`28`	`playing: true,`