fix: update media player source before playback status

Author: Julusian

src/resolvers/__tests__/media.spec.ts

@@ -1,5 +1,6 @@
 import * as media from '../media'
 import { Commands, Enums, MediaState, AtemStateUtil } from 'atem-connection'
+import { jsonClone } from '../../util'
 
 const STATE1 = AtemStateUtil.Create()
 ;(STATE1.media.players as MediaState.MediaPlayerState[]) = [
@@ -68,3 +69,27 @@ test('Unit: media player: status command', function () {
 		atBeginning: true,
 	})
 })
+
+test('Unit: media player: select clip and play', function () {
+	const state1b = jsonClone(STATE1)
+	if (state1b.media.players[0]) {
+		state1b.media.players[0].clipIndex = 1
+		state1b.media.players[0].playing = true
+		state1b.media.players[0].loop = true
+	}
+
+	const commands = media.resolveMediaPlayerState(STATE1, state1b) as Array<Commands.MediaPlayerStatusCommand>
+
+	expect(commands[0].constructor.name).toEqual('MediaPlayerSourceCommand')
+	expect(commands[0].mediaPlayerId).toEqual(0)
+	expect(commands[0].properties).toEqual({
+		clipIndex: 1,
+	})
+
+	expect(commands[1].constructor.name).toEqual('MediaPlayerStatusCommand')
+	expect(commands[1].mediaPlayerId).toEqual(0)
+	expect(commands[1].properties).toEqual({
+		playing: true,
+		loop: true,
+	})
+})

src/resolvers/media.ts

@@ -14,17 +14,17 @@ export function resolveMediaPlayerState(
 		const newPlayer = fillDefaults(Defaults.Video.MediaPlayer, newState.media?.players?.[index])
 		const oldPlayer = fillDefaults(Defaults.Video.MediaPlayer, oldState.media?.players?.[index])
 
-		const props = diffObject<MediaState.MediaPlayer>(oldPlayer, newPlayer)
-		const command = new AtemCommands.MediaPlayerStatusCommand(index)
-		if (command.updateProps(props)) {
-			commands.push(command)
-		}
-
 		const srcProps = diffObject<MediaState.MediaPlayerSource>(oldPlayer, newPlayer)
 		const srcCommand = new AtemCommands.MediaPlayerSourceCommand(index)
 		if (srcCommand.updateProps(srcProps)) {
 			commands.push(srcCommand)
 		}
+
+		const props = diffObject<MediaState.MediaPlayer>(oldPlayer, newPlayer)
+		const command = new AtemCommands.MediaPlayerStatusCommand(index)
+		if (command.updateProps(props)) {
+			commands.push(command)
+		}
 	}
 
 	return commands