From 12d63594fb6a857ba82ad7c9cce8b9d48f4bd980 Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 2 Apr 2024 13:11:26 +0200 Subject: [PATCH 1/3] fix: return channel automationstate as array --- server/src/utils/AutomationConnection.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/utils/AutomationConnection.ts b/server/src/utils/AutomationConnection.ts index c32a6306..6eaa1d42 100644 --- a/server/src/utils/AutomationConnection.ts +++ b/server/src/utils/AutomationConnection.ts @@ -338,7 +338,7 @@ export class AutomationConnection { this.automationProtocol.toAutomation.STATE_CHANNEL, ch, JSON.stringify({ - channel: channelState, + channel: [channelState], }), 's', info, From 8ea6e09bd2975bccae293cc9fd583347e600acd1 Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 2 Apr 2024 14:45:12 +0200 Subject: [PATCH 2/3] fix: revert automation showChannel instead of visible for backward compatibility --- server/src/utils/AutomationConnection.ts | 6 +++--- shared/src/constants/AutomationPresets.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/utils/AutomationConnection.ts b/server/src/utils/AutomationConnection.ts index 6eaa1d42..82484609 100644 --- a/server/src/utils/AutomationConnection.ts +++ b/server/src/utils/AutomationConnection.ts @@ -218,7 +218,7 @@ export class AutomationConnection { pgmOn: apiState.pgmOn || state.faders[0].fader[ch - 1].pgmOn, voOn: apiState.voOn || state.faders[0].fader[ch - 1].voOn, pstOn: apiState.pstOn || state.faders[0].fader[ch - 1].pstOn, - showChannel: apiState.visible || state.faders[0].fader[ch - 1].showChannel, + showChannel: apiState.showChannel || state.faders[0].fader[ch - 1].showChannel, muteOn: apiState.muteOn || state.faders[0].fader[ch - 1].muteOn, inputGain: apiState.inputGain || state.faders[0].fader[ch - 1].inputGain, inputSelector: apiState.inputSelector || state.faders[0].fader[ch - 1].inputSelector, @@ -308,7 +308,7 @@ export class AutomationConnection { pgmOn, voOn, pstOn, - visible: showChannel, + showChannel, inputGain, inputSelector, label: getFaderLabel(index), @@ -328,7 +328,7 @@ export class AutomationConnection { pgmOn: currentFader.pgmOn, voOn: currentFader.voOn, pstOn: currentFader.pstOn, - visible: currentFader.showChannel, + showChannel: currentFader.showChannel, label: getFaderLabel(ch - 1), muteOn: currentFader.muteOn, inputGain: currentFader.inputGain, diff --git a/shared/src/constants/AutomationPresets.ts b/shared/src/constants/AutomationPresets.ts index f35ee80e..f400e4fb 100644 --- a/shared/src/constants/AutomationPresets.ts +++ b/shared/src/constants/AutomationPresets.ts @@ -69,7 +69,7 @@ export interface AutomationChannelAPI { pgmOn: boolean voOn: boolean pstOn: boolean - visible: boolean + showChannel: boolean muteOn: boolean inputGain: number inputSelector: number From c07ddd392aa2def19738af67c4a4c519e5948cb9 Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 2 Apr 2024 17:00:57 +0200 Subject: [PATCH 3/3] doc: update README.md with showChannel info --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c55f6638..568b17d6 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ export interface AutomationChannelAPI { pgmOn?: boolean voOn?: boolean pstOn?: boolean - visible?: boolean + showChannel?: boolean muteOn?: boolean inputGain?: number inputSelector?: number @@ -282,7 +282,7 @@ export interface AutomationChannelAPI { pgmOn: boolean voOn: boolean pstOn: boolean - visible: boolean + showChannel: boolean muteOn: boolean inputGain: number inputSelector: number