fix: consistent API for super source methods

nrkno · Aug 5, 2019 · 4327660 · 4327660
1 parent 7e0c2e9
commit 4327660
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/__tests__/index.spec.ts b/src/__tests__/index.spec.ts
@@ -35,10 +35,10 @@ test('setSuperSourceProperties - 7.2', async () => {
 	try {
 		expect(conn.sendCommand).not.toHaveBeenCalled()
 
-		await conn.setSuperSourceProperties(2, {
+		await conn.setSuperSourceProperties({
 			artPreMultiplied: true,
 			artOption: Enums.SuperSourceArtOption.Background
-		})
+		}, 2)
 		expect(conn.sendCommand).toHaveBeenCalledTimes(1)
 		expect(conn.sendCommand).toHaveBeenNthCalledWith(1, {
 			rawName: 'CSSc',
@@ -58,10 +58,10 @@ test('setSuperSourceProperties - 8.0', async () => {
 	try {
 		expect(conn.sendCommand).not.toHaveBeenCalled()
 
-		await conn.setSuperSourceProperties(2, {
+		await conn.setSuperSourceProperties({
 			artPreMultiplied: true,
 			artOption: Enums.SuperSourceArtOption.Background
-		})
+		}, 2)
 		expect(conn.sendCommand).toHaveBeenCalledTimes(1)
 		expect(conn.sendCommand).toHaveBeenNthCalledWith(1, {
 			rawName: 'CSSc',
@@ -83,10 +83,10 @@ test('setSuperSourceBorder - 7.2', async () => {
 	try {
 		expect(conn.sendCommand).not.toHaveBeenCalled()
 
-		await conn.setSuperSourceBorder(2, {
+		await conn.setSuperSourceBorder({
 			borderBevelSoftness: 12,
 			borderLuma: 3
-		})
+		}, 2)
 		expect(conn.sendCommand).toHaveBeenCalledTimes(1)
 		expect(conn.sendCommand).toHaveBeenNthCalledWith(1, {
 			rawName: 'CSSc',
@@ -106,10 +106,10 @@ test('setSuperSourceBorder - 8.0', async () => {
 	try {
 		expect(conn.sendCommand).not.toHaveBeenCalled()
 
-		await conn.setSuperSourceBorder(2, {
+		await conn.setSuperSourceBorder({
 			borderBevelSoftness: 12,
 			borderLuma: 3
-		})
+		}, 2)
 		expect(conn.sendCommand).toHaveBeenCalledTimes(1)
 		expect(conn.sendCommand).toHaveBeenNthCalledWith(1, {
 			rawName: 'CSBd',

diff --git a/src/atem.ts b/src/atem.ts
@@ -341,15 +341,15 @@ export class Atem extends EventEmitter {
 		return this.sendCommand(command)
 	}
 
-	setSuperSourceBoxSettings (ssrcId: number, newProps: Partial<SuperSourceBox>, box = 0) {
+	setSuperSourceBoxSettings (newProps: Partial<SuperSourceBox>, box = 0, ssrcId = 0) {
 		const command = new Commands.SuperSourceBoxParametersCommand()
 		command.ssrcId = ssrcId
 		command.boxId = box
 		command.updateProps(newProps)
 		return this.sendCommand(command)
 	}
 
-	setSuperSourceProperties (ssrcId: number, newProps: Partial<SuperSourceProperties>) {
+	setSuperSourceProperties (newProps: Partial<SuperSourceProperties>, ssrcId = 0) {
 		if (this.state.info.apiVersion >= Enums.ProtocolVersion.V8_0) {
 			const command = new Commands.SuperSourcePropertiesV8Command()
 			command.ssrcId = ssrcId
@@ -362,7 +362,7 @@ export class Atem extends EventEmitter {
 		}
 	}
 
-	setSuperSourceBorder (ssrcId: number, newProps: Partial<SuperSourceBorder>) {
+	setSuperSourceBorder (newProps: Partial<SuperSourceBorder>, ssrcId = 0) {
 		if (this.state.info.apiVersion >= Enums.ProtocolVersion.V8_0) {
 			const command = new Commands.SuperSourceBorderCommand()
 			command.ssrcId = ssrcId