From a0cffcc302af7e36ecf1badfedc5e99b32efaee5 Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 3 Sep 2024 09:38:25 +0200 Subject: [PATCH 1/4] add Mono input selector option to Atem mixer --- .../utils/mixerConnections/AtemConnection.ts | 17 +++++++++++++++++ shared/src/constants/mixerProtocols/atem.ts | 10 +++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) 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/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 From 8ad08044dc5c06aa79f2a7891ff94851e766c8e6 Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 3 Sep 2024 09:39:10 +0200 Subject: [PATCH 2/4] add Mono input selector make buttons smaller 2 fit 4 options --- client/src/assets/css/ChanStrip.css | 2 +- client/src/assets/css/ChanStripFull.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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); From b384ff13e2ab0113776d9159653e6ad93aaed27f Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 3 Sep 2024 09:40:00 +0200 Subject: [PATCH 3/4] add Mono input selectorfor Lawo Ruby --- shared/src/constants/mixerProtocols/LawoRuby.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/shared/src/constants/mixerProtocols/LawoRuby.ts b/shared/src/constants/mixerProtocols/LawoRuby.ts index bd5153db..2deb002a 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: 2, + 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: 2, + type: 'int', + label: 'MONO', + }, ], CHANNEL_OUT_GAIN: [ // { From 3c826143a6ef65122cb27dc860f34b7761e33968 Mon Sep 17 00:00:00 2001 From: olzzon Date: Tue, 3 Sep 2024 11:52:39 +0200 Subject: [PATCH 4/4] fix Mono input selector for Lawo Ruby should be 5 --- shared/src/constants/mixerProtocols/LawoRuby.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/src/constants/mixerProtocols/LawoRuby.ts b/shared/src/constants/mixerProtocols/LawoRuby.ts index 2deb002a..044cb1a5 100644 --- a/shared/src/constants/mixerProtocols/LawoRuby.ts +++ b/shared/src/constants/mixerProtocols/LawoRuby.ts @@ -59,7 +59,7 @@ export const LawoRuby: MixerProtocol = { { mixerMessage: 'Ruby.Sources.{channel}.DSP.Input.LR Mode', - value: 2, + value: 5, type: 'int', label: 'MONO', }, @@ -129,7 +129,7 @@ export const LawoRuby: MixerProtocol = { { mixerMessage: 'Ruby.Sources.{channel}.DSP.Input.LR Mode', - value: 2, + value: 5, type: 'int', label: 'MONO', },