Merge pull request #356 from tv2norge-collab/contribute/EAV-54

feat(vMix): allow overriding vMix transition from a separate layer
nrkno · Nov 27, 2024 · 4bb7ff0 · 4bb7ff0
2 parents 3e5de55 + d6f4e81
commit 4bb7ff0
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 1 deletion.
diff --git a/...imeline-state-resolver/src/integrations/vmix/__tests__/vMixTimelineStateConverter.spec.ts b/...imeline-state-resolver/src/integrations/vmix/__tests__/vMixTimelineStateConverter.spec.ts
@@ -8,6 +8,7 @@ import {
 	TimelineContentTypeVMix,
 	TimelineContentVMixAny,
 	VMixInputType,
+	VMixTransitionType,
 } from 'timeline-state-resolver-types'
 import { VMixTimelineStateConverter } from '../vMixTimelineStateConverter'
 import { VMixOutput, VMixStateDiffer } from '../vMixStateDiffer'
@@ -136,6 +137,74 @@ describe('VMixTimelineStateConverter', () => {
 			expect(result.reportedState.inputsAddedByUsAudio[prefixAddedInput(filePath)]).toBeUndefined()
 		})
 
+		it('allows overriding transitions in usual layer order', () => {
+			const converter = createTestee()
+			const result = converter.getVMixStateFromTimelineState(
+				wrapInTimelineState({
+					pgm0: wrapInTimelineObject('pgm0', {
+						deviceType: DeviceType.VMIX,
+						type: TimelineContentTypeVMix.PROGRAM,
+						input: 2,
+					}),
+					pgm1: wrapInTimelineObject('pgm1', {
+						deviceType: DeviceType.VMIX,
+						type: TimelineContentTypeVMix.PROGRAM,
+						transition: {
+							duration: 500,
+							effect: VMixTransitionType.Fade,
+						},
+					}),
+				}),
+				{
+					pgm0: wrapInMapping({
+						mappingType: MappingVmixType.Program,
+					}),
+					pgm1: wrapInMapping({
+						mappingType: MappingVmixType.Program,
+					}),
+				}
+			)
+			expect(result.reportedState.mixes[0]?.transition).toEqual({
+				duration: 500,
+				effect: VMixTransitionType.Fade,
+			})
+			expect(result.reportedState.mixes[0]?.program).toEqual(2)
+		})
+
+		it('does not allow overriding transitions in reverse layer order', () => {
+			const converter = createTestee()
+			const result = converter.getVMixStateFromTimelineState(
+				wrapInTimelineState({
+					pgm0: wrapInTimelineObject('pgm0', {
+						deviceType: DeviceType.VMIX,
+						type: TimelineContentTypeVMix.PROGRAM,
+						transition: {
+							duration: 500,
+							effect: VMixTransitionType.Fade,
+						},
+					}),
+					pgm1: wrapInTimelineObject('pgm1', {
+						deviceType: DeviceType.VMIX,
+						type: TimelineContentTypeVMix.PROGRAM,
+						input: 2,
+					}),
+				}),
+				{
+					pgm0: wrapInMapping({
+						mappingType: MappingVmixType.Program,
+					}),
+					pgm1: wrapInMapping({
+						mappingType: MappingVmixType.Program,
+					}),
+				}
+			)
+			expect(result.reportedState.mixes[0]?.transition).toEqual({
+				duration: 0,
+				effect: VMixTransitionType.Cut,
+			})
+			expect(result.reportedState.mixes[0]?.program).toEqual(2)
+		})
+
 		// TODO: maybe we can't trust the defaults when adding an input? Make this test pass eventually
 		// it('tracks audio state for mapped inputs added by us', () => {
 		// 	const converter = createTestee()

diff --git a/packages/timeline-state-resolver/src/integrations/vmix/vMixTimelineStateConverter.ts b/packages/timeline-state-resolver/src/integrations/vmix/vMixTimelineStateConverter.ts
@@ -71,6 +71,11 @@ export class VMixTimelineStateConverter {
 								this._switchToInput(content.input, deviceState, mixProgram, content.transition)
 							} else if (content.inputLayer) {
 								this._switchToInput(content.inputLayer, deviceState, mixProgram, content.transition, true)
+							} else if (content.transition) {
+								const mixState = deviceState.reportedState.mixes[mixProgram]
+								if (mixState) {
+									mixState.transition = content.transition
+								}
 							}
 						}
 						break
@@ -238,7 +243,7 @@ export class VMixTimelineStateConverter {
 			mixState.preview = mixState.program
 			mixState.program = input
 
-			mixState.transition = transition || { effect: VMixTransitionType.Cut, duration: 0 }
+			mixState.transition = transition ?? { effect: VMixTransitionType.Cut, duration: 0 }
 			mixState.layerToProgram = layerToProgram
 		}
 	}