Merge pull request #307 from bbc/feat/automation-enhancements

Fix: use showChannel and return automation channel state as array
tv2 · Apr 9, 2024 · 9b68527 · 9b68527
2 parents bf70171 + c07ddd3
commit 9b68527
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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

diff --git 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,
@@ -338,7 +338,7 @@ export class AutomationConnection {
                         this.automationProtocol.toAutomation.STATE_CHANNEL,
                         ch,
                         JSON.stringify({
-                            channel: channelState,
+                            channel: [channelState],
                         }),
                         's',
                         info,

diff --git 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