Merge branch 'contribute/EAV-343' of github.com:tv2norge-collab/sofie…

…-timeline-state-resolver into release52 # Conflicts: # packages/timeline-state-resolver-types/src/integrations/vmix.ts # packages/timeline-state-resolver/src/integrations/vmix/__tests__/connection.spec.ts # packages/timeline-state-resolver/src/integrations/vmix/__tests__/vMixStateDiffer.spec.ts # packages/timeline-state-resolver/src/integrations/vmix/__tests__/vMixTimelineStateConverter.spec.ts # packages/timeline-state-resolver/src/integrations/vmix/connection.ts # packages/timeline-state-resolver/src/integrations/vmix/vMixCommands.ts # packages/timeline-state-resolver/src/integrations/vmix/vMixStateDiffer.ts # packages/timeline-state-resolver/src/integrations/vmix/vMixTimelineStateConverter.ts
nrkno · Nov 27, 2024 · ad41ae6 · ad41ae6
2 parents 842fbf3 + 02db182
commit ad41ae6
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 0 deletions.
diff --git a/packages/timeline-state-resolver-types/src/integrations/vmix.ts b/packages/timeline-state-resolver-types/src/integrations/vmix.ts
@@ -46,6 +46,7 @@ export enum VMixCommand {
 	LIST_REMOVE_ALL = 'LIST_REMOVE_ALL',
 	RESTART_INPUT = 'RESTART_INPUT',
 	BROWSER_NAVIGATE = 'BROWSER_NAVIGATE',
+	SELECT_INDEX = 'SELECT_INDEX',
 }
 
 export type TimelineContentVMixAny =
@@ -192,6 +193,13 @@ export interface TimelineContentVMixInput extends TimelineContentVMixBase {
 
 	/** The URL for Browser input */
 	url?: string
+
+	/**
+	 * Photos, List: Selects item in List
+	 * Virtual Set: Zooms to selected preset using the current speed settings
+	 * starts from 1
+	 */
+	index?: number
 }
 
 export interface TimelineContentVMixOutput extends TimelineContentVMixBase {

diff --git a/packages/timeline-state-resolver/src/integrations/vmix/__tests__/connection.spec.ts b/packages/timeline-state-resolver/src/integrations/vmix/__tests__/connection.spec.ts
@@ -107,4 +107,18 @@ describe('VMixCommandSender', () => {
 			value: 'https%3A%2F%2Fexample.com',
 		})
 	})
+	it('selects index', async () => {
+		const { sender, mockConnection } = createTestee()
+		await sender.sendCommand({
+			command: VMixCommand.SELECT_INDEX,
+			input: 5,
+			value: 3,
+		})
+
+		expect(mockConnection.sendCommandFunction).toHaveBeenCalledTimes(1)
+		expect(mockConnection.sendCommandFunction).toHaveBeenLastCalledWith('SelectIndex', {
+			input: 5,
+			value: 3,
+		})
+	})
 })
diff --git a/packages/timeline-state-resolver/src/integrations/vmix/__tests__/vMixStateDiffer.spec.ts b/packages/timeline-state-resolver/src/integrations/vmix/__tests__/vMixStateDiffer.spec.ts
@@ -168,4 +168,25 @@ describe('VMixStateDiffer', () => {
 			value: url,
 		})
 	})
+	it('sets index', () => {
+		const differ = createTestee()
+
+		const oldState = makeMockFullState()
+		const newState = makeMockFullState()
+
+		oldState.reportedState.existingInputs['99'] = differ.getDefaultInputState(99)
+
+		newState.reportedState.existingInputs['99'] = differ.getDefaultInputState(99)
+		const index = 3
+		newState.reportedState.existingInputs['99'].index = index
+
+		const commands = differ.getCommandsToAchieveState(Date.now(), oldState, newState)
+
+		expect(commands.length).toBe(1)
+		expect(commands[0].command).toMatchObject({
+			command: VMixCommand.SELECT_INDEX,
+			input: '99',
+			value: index,
+		})
+	})
 })
diff --git a/...imeline-state-resolver/src/integrations/vmix/__tests__/vMixTimelineStateConverter.spec.ts b/...imeline-state-resolver/src/integrations/vmix/__tests__/vMixTimelineStateConverter.spec.ts
@@ -224,6 +224,26 @@ describe('VMixTimelineStateConverter', () => {
 			)
 			expect(result.reportedState.existingInputs['1'].url).toEqual(url)
 		})
+		it('supports index', () => {
+			const converter = createTestee()
+			const index = 3
+			const result = converter.getVMixStateFromTimelineState(
+				wrapInTimelineState({
+					inp0: wrapInTimelineObject('inp0', {
+						deviceType: DeviceType.VMIX,
+						index,
+						type: TimelineContentTypeVMix.INPUT,
+					}),
+				}),
+				{
+					inp0: wrapInMapping({
+						mappingType: MappingVmixType.Input,
+						index: '1',
+					}),
+				}
+			)
+			expect(result.reportedState.existingInputs['1'].index).toEqual(index)
+		})
 
 		// 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', () => {

diff --git a/packages/timeline-state-resolver/src/integrations/vmix/connection.ts b/packages/timeline-state-resolver/src/integrations/vmix/connection.ts
@@ -262,6 +262,8 @@ export class VMixCommandSender {
 				return this.restart(command.input)
 			case VMixCommand.BROWSER_NAVIGATE:
 				return this.browserNavigate(command.input, command.value)
+			case VMixCommand.SELECT_INDEX:
+				return this.selectIndex(command.input, command.value)
 			default:
 				throw new Error(`vmixAPI: Command ${((command || {}) as any).command} not implemented`)
 		}
@@ -473,6 +475,10 @@ export class VMixCommandSender {
 		return this.sendCommandFunction(`BrowserNavigate`, { input, value: encodeURIComponent(value) })
 	}
 
+	public async selectIndex(input: string | number, value: number): Promise<any> {
+		return this.sendCommandFunction(`SelectIndex`, { input, value })
+	}
+
 	private async sendCommandFunction(func: string, args: SentCommandArgs) {
 		return this.vMixConnection.sendCommandFunction(func, args)
 	}

diff --git a/packages/timeline-state-resolver/src/integrations/vmix/vMixCommands.ts b/packages/timeline-state-resolver/src/integrations/vmix/vMixCommands.ts
@@ -208,6 +208,11 @@ export interface VMixStateCommandBrowserNavigate extends VMixStateCommandBase {
 	input: string | number
 	value: string
 }
+export interface VMixStateCommanSelectIndex extends VMixStateCommandBase {
+	command: VMixCommand.SELECT_INDEX
+	input: string | number
+	value: number
+}
 export type VMixStateCommand =
 	| VMixStateCommandPreviewInput
 	| VMixStateCommandTransition
@@ -254,6 +259,7 @@ export type VMixStateCommand =
 	| VMixStateCommandListRemoveAll
 	| VMixStateCommandRestart
 	| VMixStateCommandBrowserNavigate
+	| VMixStateCommanSelectIndex
 
 export enum CommandContext {
 	None = 'none',

diff --git a/packages/timeline-state-resolver/src/integrations/vmix/vMixStateDiffer.ts b/packages/timeline-state-resolver/src/integrations/vmix/vMixStateDiffer.ts
@@ -79,6 +79,7 @@ export interface VMixInput {
 	listFilePaths?: string[]
 	restart?: boolean
 	url?: string
+	index?: number
 }
 
 export interface VMixInputAudio {
@@ -595,6 +596,17 @@ export class VMixStateDiffer {
 				timelineId: '',
 			})
 		}
+		if (input.index !== undefined && oldInput.index !== input.index) {
+			commands.push({
+				command: {
+					command: VMixCommand.SELECT_INDEX,
+					input: key,
+					value: input.index,
+				},
+				context: CommandContext.None,
+				timelineId: '',
+			})
+		}
 		return { preTransitionCommands, postTransitionCommands }
 	}
 

diff --git a/packages/timeline-state-resolver/src/integrations/vmix/vMixTimelineStateConverter.ts b/packages/timeline-state-resolver/src/integrations/vmix/vMixTimelineStateConverter.ts
@@ -149,6 +149,7 @@ export class VMixTimelineStateConverter {
 									listFilePaths: content.listFilePaths,
 									restart: content.restart,
 									url: content.url,
+									index: content.index,
 								},
 								{ key: mapping.options.index, filePath: content.filePath },
 								layerName