atem-state
Advanced tools
Comparing version 0.10.0-nightly-feat-v8-strict-20200720-093258-6efd32a.0 to 0.10.0-nightly-feat-v8-strict-20200813-134452-5ce4698.0
@@ -214,3 +214,5 @@ "use strict"; | ||
gain: 0, | ||
balance: 0 | ||
balance: 0, | ||
supportsRcaToXlrEnabled: false, | ||
rcaToXlrEnabled: false | ||
}; | ||
@@ -217,0 +219,0 @@ Audio.Master = { |
@@ -1,6 +0,6 @@ | ||
import { Commands as AtemCommands } from 'atem-connection'; | ||
import { Commands as AtemCommands, VideoState } from 'atem-connection'; | ||
import { State as StateObject } from '../'; | ||
import { MixEffect } from '../state'; | ||
import { ExtendedMixEffect } from '../state'; | ||
export declare function resolveMixEffectsState(oldState: StateObject, newState: StateObject): Array<AtemCommands.ISerializableCommand>; | ||
export declare function resolveTransitionPropertiesState(mixEffectId: number, oldMixEffect: MixEffect, newMixEffect: MixEffect): Array<AtemCommands.ISerializableCommand>; | ||
export declare function resolveTransitionSettingsState(mixEffectId: number, oldMixEffect: MixEffect, newMixEffect: MixEffect): Array<AtemCommands.ISerializableCommand>; | ||
export declare function resolveTransitionPropertiesState(mixEffectId: number, oldMixEffect: VideoState.MixEffect | ExtendedMixEffect, newMixEffect: VideoState.MixEffect | ExtendedMixEffect): Array<AtemCommands.ISerializableCommand>; | ||
export declare function resolveTransitionSettingsState(mixEffectId: number, oldMixEffect: VideoState.MixEffect | ExtendedMixEffect, newMixEffect: VideoState.MixEffect | ExtendedMixEffect): Array<AtemCommands.ISerializableCommand>; |
@@ -15,6 +15,5 @@ "use strict"; | ||
commands.push(...upstreamKeyers_1.resolveUpstreamKeyerState(mixEffectId, oldMixEffect, newMixEffect)); | ||
let oldMEInput = oldMixEffect.input; | ||
if (typeof oldMEInput === 'undefined') | ||
oldMEInput = oldMixEffect.programInput; | ||
if (typeof newMixEffect.input !== 'undefined' && typeof newMixEffect.transition !== 'undefined') { | ||
const oldMEInput = 'input' in oldMixEffect ? oldMixEffect.input : oldMixEffect.programInput; | ||
const oldMeTransition = 'transition' in oldMixEffect ? oldMixEffect.transition : oldMixEffect.transitionProperties.style; | ||
if ('input' in newMixEffect && 'transition' in newMixEffect) { | ||
if (newMixEffect.input !== oldMEInput || newMixEffect.transition === __1.Enums.TransitionStyle.DUMMY) { | ||
@@ -26,5 +25,5 @@ commands.push(new atem_connection_1.Commands.PreviewInputCommand(mixEffectId, newMixEffect.input)); | ||
else if (newMixEffect.transition !== __1.Enums.TransitionStyle.DUMMY) { | ||
if (newMixEffect.transition !== (oldMixEffect.transition || oldMixEffect.transitionProperties.style)) { // set style before auto transition command | ||
if (newMixEffect.transition !== oldMeTransition) { // set style before auto transition command | ||
const command = new atem_connection_1.Commands.TransitionPropertiesCommand(mixEffectId); | ||
command.updateProps({ style: newMixEffect.transition }); | ||
command.updateProps({ nextStyle: newMixEffect.transition }); | ||
commands.push(command); | ||
@@ -37,3 +36,3 @@ } | ||
} | ||
else { | ||
else if ('previewInput' in oldMixEffect && 'previewInput' in newMixEffect) { | ||
if (oldMixEffect.previewInput !== newMixEffect.previewInput) { | ||
@@ -50,6 +49,6 @@ commands.push(new atem_connection_1.Commands.PreviewInputCommand(mixEffectId, newMixEffect.previewInput)); | ||
} | ||
if (newMixEffect.inTransition && oldMixEffect.transitionPosition !== newMixEffect.transitionPosition) { | ||
commands.push(new atem_connection_1.Commands.TransitionPositionCommand(mixEffectId, newMixEffect.transitionPosition)); | ||
if (newMixEffect.transitionPosition.inTransition && oldMixEffect.transitionPosition.handlePosition !== newMixEffect.transitionPosition.handlePosition) { | ||
commands.push(new atem_connection_1.Commands.TransitionPositionCommand(mixEffectId, newMixEffect.transitionPosition.handlePosition)); | ||
} | ||
if (oldMixEffect.inTransition && !newMixEffect.inTransition) { | ||
if (oldMixEffect.transitionPosition.inTransition && !newMixEffect.transitionPosition.inTransition) { | ||
commands.push(new atem_connection_1.Commands.TransitionPositionCommand(mixEffectId, 10000)); // finish transition | ||
@@ -56,0 +55,0 @@ } |
import { Commands as AtemCommands, VideoState } from 'atem-connection'; | ||
import { MixEffect } from '../../'; | ||
import { MixEffect } from '../../state'; | ||
export declare function resolveUpstreamKeyerState(mixEffectId: number, oldMixEffect: MixEffect, newMixEffect: MixEffect): Array<AtemCommands.ISerializableCommand>; | ||
export declare function resolveUpstreamKeyerMaskState(mixEffectId: number, upstreamKeyerId: number, oldKeyer: VideoState.USK.UpstreamKeyer, newKeyer: VideoState.USK.UpstreamKeyer): Array<AtemCommands.ISerializableCommand>; |
import { AtemState, VideoState } from 'atem-connection'; | ||
import { Enums } from './enums'; | ||
export interface AtemVideoState extends VideoState.AtemVideoState { | ||
export interface AtemVideoState extends Omit<VideoState.AtemVideoState, 'mixEffects'> { | ||
mixEffects: Array<MixEffect | undefined>; | ||
} | ||
export interface MixEffect extends VideoState.MixEffect { | ||
input?: number; | ||
transition?: Enums.TransitionStyle; | ||
export declare type MixEffect = VideoState.MixEffect | ExtendedMixEffect; | ||
export interface ExtendedMixEffect extends Omit<VideoState.MixEffect, 'programInput' | 'previewInput'> { | ||
input: number; | ||
transition: Enums.TransitionStyle; | ||
} | ||
export interface State extends AtemState { | ||
export interface State extends Omit<AtemState, 'video'> { | ||
video: AtemVideoState; | ||
} |
{ | ||
"name": "atem-state", | ||
"version": "0.10.0-nightly-feat-v8-strict-20200720-093258-6efd32a.0", | ||
"version": "0.10.0-nightly-feat-v8-strict-20200813-134452-5ce4698.0", | ||
"description": "Typescript Node.js library for comparing ATEM states", | ||
@@ -117,3 +117,3 @@ "main": "dist/index.js", | ||
"dependencies": { | ||
"atem-connection": "2.0.0-nightly-20200720-080906-2fb917b.0", | ||
"atem-connection": "2.0.0-nightly-20200812-123955-e5e57e7.0", | ||
"tslib": "^1.13", | ||
@@ -120,0 +120,0 @@ "underscore": "^1.9.1" |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
92539
938
+ Addedatem-connection@2.0.0-nightly-20200812-123955-e5e57e7.0(transitive)
- Removedatem-connection@2.0.0-nightly-20200720-080906-2fb917b.0(transitive)
Updatedatem-connection@2.0.0-nightly-20200812-123955-e5e57e7.0