diff --git a/client/src/assets/css/ChanStrip.css b/client/src/assets/css/ChanStrip.css index 8bab0bf9..1a2260ad 100644 --- 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 index 20e422d9..50c1dcba 100644 --- 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 index af4ad6ac..e06d10c5 100644 --- 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 index bd5153db..044cb1a5 100644 --- 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 index 1c7d4eaa..3cd21af0 100644 --- 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 @@ -66,6 +70,10 @@ export const Atem: MixerProtocol = { mixerMessage: '', label: 'RR', }, + { + mixerMessage: '', + label: 'MONO', + }, ], // CHANNEL_OUT_GAIN: [{ mixerMessage: '' }], // CHANNEL_NAME?: Array