Skip to content

Commit

Permalink
Merge commit 'c75d4d8ee6271be95d1fcd60f8741c3281db0521' into feat/vmi…
Browse files Browse the repository at this point in the history
…x-media-reload-retrying

* commit 'c75d4d8ee6271be95d1fcd60f8741c3281db0521':
  fix: another potential fix for this system not working as intended
  • Loading branch information
jesperstarkar committed Aug 15, 2023
2 parents 266969d + c75d4d8 commit b0c2df7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions packages/timeline-state-resolver/src/integrations/vmix/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,13 @@ export class VMixDevice extends DeviceWithState<VMixStateExtended, DeviceOptions
// or even outright preventing Sisyfos from working.
for (const inputKey of Object.keys(realState.inputs)) {
const cherryPickedRealState: Pick<VMixInput, EnforceableVMixInputStateKeys> = {
duration: expectedState.reportedState.inputs[inputKey].duration,
loop: expectedState.reportedState.inputs[inputKey].loop,
transform: expectedState.reportedState.inputs[inputKey].transform,
overlays: expectedState.reportedState.inputs[inputKey].overlays,
duration: realState.inputs[inputKey].duration,
loop: realState.inputs[inputKey].loop,
transform: realState.inputs[inputKey].transform,
overlays: realState.inputs[inputKey].overlays,

// This particular key is what enables the ability to re-load failed/missing media in a List Input.
listFilePaths: expectedState.reportedState.inputs[inputKey].listFilePaths,
listFilePaths: realState.inputs[inputKey].listFilePaths,
}

// Shallow merging is sufficient.
Expand Down

0 comments on commit b0c2df7

Please sign in to comment.