Merge pull request #334 from bbc/bbc-release51

Feat/lawo and atem mono sum
tv2 · Sep 10, 2024 · 8824740 · 8824740
2 parents 9b68527 + 3c82614
commit 8824740
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/client/src/assets/css/ChanStrip.css b/client/src/assets/css/ChanStrip.css
@@ -168,7 +168,7 @@
     outline: none;
     -moz-outline: none;
     color: white;
-    height: 62px;
+    height: 55px;
     width: 70px;
     border-color: rgb(71, 71, 71);
     background-color: rgb(53, 53, 53);

diff --git a/client/src/assets/css/ChanStripFull.css b/client/src/assets/css/ChanStripFull.css
@@ -150,7 +150,7 @@
     outline: none;
     -moz-outline: none;
     color: white;
-    height: 62px;
+    height: 55px;
     width: 70px;
     border-color: rgb(71, 71, 71);
     background-color: rgb(53, 53, 53);

diff --git a/server/src/utils/mixerConnections/AtemConnection.ts b/server/src/utils/mixerConnections/AtemConnection.ts
@@ -23,6 +23,7 @@ import { FairlightAudioSource } from 'atem-connection/dist/state/fairlight'
 
 enum TrackIndex {
     Stereo = '-65280',
+    Mono = '-65281',
     Right = '-255',
     Left = '-256',
 }
@@ -279,6 +280,22 @@ export class AtemMixerConnection {
 
                 this._sourceTracks[channelTypeIndex] = TrackIndex.Right
                 break
+            case 'MONO':
+                this._connection.setFairlightAudioMixerInputProps(
+                    this._chNoToSource[channelIndex],
+                    { activeConfiguration: FairlightInputConfiguration.Mono }
+                )
+                if (pgmOn || pflOn) {
+                    this._connection.setFairlightAudioMixerSourceProps(
+                        this._chNoToSource[channelIndex],
+                        TrackIndex.Mono,
+                        {
+                            mixOption: FairlightAudioMixOption.On,
+                        }
+                    )
+                }
+                this._sourceTracks[channelTypeIndex] = TrackIndex.Mono
+                break
         }
     }
 

diff --git a/shared/src/constants/mixerProtocols/LawoRuby.ts b/shared/src/constants/mixerProtocols/LawoRuby.ts
@@ -56,6 +56,13 @@ export const LawoRuby: MixerProtocol = {
                         type: 'int',
                         label: 'RR',
                     },
+                    {
+                        mixerMessage:
+                            'Ruby.Sources.{channel}.DSP.Input.LR Mode',
+                        value: 5,
+                        type: 'int',
+                        label: 'MONO',
+                    },
                 ],
                 CHANNEL_OUT_GAIN: [
                     {
@@ -119,6 +126,13 @@ export const LawoRuby: MixerProtocol = {
                         type: 'int',
                         label: 'RR',
                     },
+                    {
+                        mixerMessage:
+                            'Ruby.Sources.{channel}.DSP.Input.LR Mode',
+                        value: 5,
+                        type: 'int',
+                        label: 'MONO',
+                    },
                 ],
                 CHANNEL_OUT_GAIN: [
                     // {

diff --git a/shared/src/constants/mixerProtocols/atem.ts b/shared/src/constants/mixerProtocols/atem.ts
@@ -2,7 +2,7 @@ import {
     MixerProtocol,
     fxParamsList,
     VuLabelConversionType,
-    MixerConnectionTypes
+    MixerConnectionTypes,
 } from '../MixerProtocolInterface'
 
 export const Atem: MixerProtocol = {
@@ -38,6 +38,10 @@ export const Atem: MixerProtocol = {
                         mixerMessage: '',
                         label: 'RR',
                     },
+                    {
+                        mixerMessage: '',
+                        label: 'MONO',
+                    },
                 ],
                 // CHANNEL_OUT_GAIN: [{ mixerMessage: '' }],
                 // CHANNEL_VU?: Array<IMixerMessageProtocol>
@@ -66,6 +70,10 @@ export const Atem: MixerProtocol = {
                         mixerMessage: '',
                         label: 'RR',
                     },
+                    {
+                        mixerMessage: '',
+                        label: 'MONO',
+                    },
                 ],
                 // CHANNEL_OUT_GAIN: [{ mixerMessage: '' }],
                 // CHANNEL_NAME?: Array<IMixerMessageProtocol>