fix: broken autoDownstreamKey function and mangled multiviewer window…

… state
nrkno · Sep 17, 2019 · 71c61f6 · 71c61f6
1 parent b3af54b
commit 71c61f6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/atem.ts b/src/atem.ts
@@ -142,9 +142,10 @@ export class Atem extends EventEmitter {
 		return this.sendCommand(command)
 	}
 
-	autoDownstreamKey (key = 0) {
+	autoDownstreamKey (key = 0, isTowardsOnAir?: boolean) {
 		const command = new Commands.DownstreamKeyAutoCommand()
 		command.downstreamKeyerId = key
+		command.updateProps({ isTowardsOnAir })
 		return this.sendCommand(command)
 	}
 

diff --git a/src/commands/DownstreamKey/DownstreamKeyAutoCommand.ts b/src/commands/DownstreamKey/DownstreamKeyAutoCommand.ts
@@ -10,7 +10,11 @@ export class DownstreamKeyAutoCommand extends AbstractCommand {
 	}
 
 	properties: {
-		isTowardsOnAir: boolean
+		isTowardsOnAir?: boolean
+	}
+
+	updateProps (newProps: Partial<DownstreamKeyAutoCommand['properties']>) {
+		this._updateProps(newProps)
 	}
 
 	serialize (version: ProtocolVersion) {

diff --git a/src/commands/Settings/MultiViewerSourceCommand.ts b/src/commands/Settings/MultiViewerSourceCommand.ts
@@ -40,12 +40,10 @@ export class MultiViewerSourceUpdateCommand extends AbstractCommand {
 	}
 
 	applyToState (state: AtemState) {
-		const obj: { [key: string]: MultiViewerSourceState } = {}
-		obj[this.index] = this.properties
-
-		state.settings.getMultiViewer(this.multiViewerId).windows[this.index] = {
-			...state.settings.getMultiViewer(this.multiViewerId).windows[this.index],
-			...obj
+		const multiviewer = state.settings.getMultiViewer(this.multiViewerId)
+		multiviewer.windows[this.index] = {
+			...multiviewer.windows[this.index],
+			...this.properties
 		}
 
 		return `settings.multiViewers.${this.multiViewerId}.windows.${this.index}`