diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx index dbb9698d..18da8af7 100644 --- a/client/components/ChanStrip.tsx +++ b/client/components/ChanStrip.tsx @@ -20,6 +20,7 @@ import { SOCKET_SET_HIGH, SOCKET_SET_AUX_LEVEL, SOCKET_SET_INPUT_GAIN, + SOCKET_SET_INPUT_SELECTOR } from '../../server/constants/SOCKET_IO_DISPATCHERS' import CcgChannelInputSettings from './CcgChannelSettings' import ReductionMeter from './ReductionMeter' @@ -74,7 +75,7 @@ class ChanStrip extends React.PureComponent< }) } handleInputSelect(selected:number) { - window.socketIoClient.emit(SOCKET_SET_INPUT_GAIN, { + window.socketIoClient.emit(SOCKET_SET_INPUT_SELECTOR, { channel: this.props.faderIndex, inputSelect: selected, }) diff --git a/server/constants/MixerProtocolInterface.ts b/server/constants/MixerProtocolInterface.ts index 1f7034b0..81d742a9 100644 --- a/server/constants/MixerProtocolInterface.ts +++ b/server/constants/MixerProtocolInterface.ts @@ -32,6 +32,7 @@ export interface IChannelTypes { channelTypeColor: string fromMixer: { CHANNEL_INPUT_GAIN: Array + CHANNEL_INPUT_SELECTOR: Array CHANNEL_OUT_GAIN: Array CHANNEL_VU: Array CHANNEL_VU_REDUCTION: Array @@ -51,6 +52,7 @@ export interface IChannelTypes { } toMixer: { CHANNEL_INPUT_GAIN: Array + CHANNEL_INPUT_SELECTOR: Array CHANNEL_OUT_GAIN: Array CHANNEL_NAME: Array PFL_ON: Array diff --git a/server/constants/SOCKET_IO_DISPATCHERS.ts b/server/constants/SOCKET_IO_DISPATCHERS.ts index 4ff58e85..497976e6 100644 --- a/server/constants/SOCKET_IO_DISPATCHERS.ts +++ b/server/constants/SOCKET_IO_DISPATCHERS.ts @@ -3,6 +3,7 @@ // Fader Channels: export const SOCKET_SET_FADERLEVEL = 'FaderLevel' export const SOCKET_SET_INPUT_GAIN = 'InputGain' +export const SOCKET_SET_INPUT_SELECTOR = 'InputSelector' export const SOCKET_SET_ASSIGNED_FADER = 'setAssignedFader' export const SOCKET_SET_FADER_MONITOR = 'FaderMonitor' export const SOCKET_SHOW_IN_MINI_MONITOR = 'showInMiniMonitor' diff --git a/server/constants/mixerProtocols/DmxIs.ts b/server/constants/mixerProtocols/DmxIs.ts index 2bd7da8c..1df5d06f 100644 --- a/server/constants/mixerProtocols/DmxIs.ts +++ b/server/constants/mixerProtocols/DmxIs.ts @@ -17,6 +17,7 @@ export const DMXIS: IMixerProtocol = { channelTypeColor: '#3f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/dmxis/ch/{channel}', @@ -45,6 +46,7 @@ export const DMXIS: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/dmxis/ch/{channel}', diff --git a/server/constants/mixerProtocols/LawoMC2.ts b/server/constants/mixerProtocols/LawoMC2.ts index 1493aa84..1a6ba65a 100644 --- a/server/constants/mixerProtocols/LawoMC2.ts +++ b/server/constants/mixerProtocols/LawoMC2.ts @@ -17,6 +17,7 @@ export const LawoMC2: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: @@ -55,6 +56,7 @@ export const LawoMC2: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: diff --git a/server/constants/mixerProtocols/LawoRelayVrx4.ts b/server/constants/mixerProtocols/LawoRelayVrx4.ts index de5fba80..5489c742 100644 --- a/server/constants/mixerProtocols/LawoRelayVrx4.ts +++ b/server/constants/mixerProtocols/LawoRelayVrx4.ts @@ -17,6 +17,7 @@ export const LawoRelayVrx4: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: @@ -55,6 +56,7 @@ export const LawoRelayVrx4: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: diff --git a/server/constants/mixerProtocols/LawoRuby.ts b/server/constants/mixerProtocols/LawoRuby.ts index 7abd982c..049ae781 100644 --- a/server/constants/mixerProtocols/LawoRuby.ts +++ b/server/constants/mixerProtocols/LawoRuby.ts @@ -17,6 +17,7 @@ export const LawoRuby: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: @@ -55,6 +56,7 @@ export const LawoRuby: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: diff --git a/server/constants/mixerProtocols/SSLsystemT.ts b/server/constants/mixerProtocols/SSLsystemT.ts index 08282e90..24905ae4 100644 --- a/server/constants/mixerProtocols/SSLsystemT.ts +++ b/server/constants/mixerProtocols/SSLsystemT.ts @@ -26,6 +26,7 @@ export const SSLSystemT: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [emptyMixerMessage()], // Handled by SSLMixerconnection CHANNEL_VU: [emptyMixerMessage()], // Not implemented in SSL Automation protocol yet CHANNEL_VU_REDUCTION: [emptyMixerMessage()], @@ -54,6 +55,7 @@ export const SSLSystemT: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: 'f1 06 00 80 00 {channel} {level}', diff --git a/server/constants/mixerProtocols/StuderOnAirEmber.ts b/server/constants/mixerProtocols/StuderOnAirEmber.ts index 63009e72..b762f75c 100644 --- a/server/constants/mixerProtocols/StuderOnAirEmber.ts +++ b/server/constants/mixerProtocols/StuderOnAirEmber.ts @@ -17,6 +17,7 @@ export const StuderOnAirMaster: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: @@ -156,6 +157,7 @@ CH 96:7f 8f ff fe d9 5c 80 30 80 a4 19 31 17 a1 15 31 13 bf 60 10 31 0e a6 0c 31 toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: diff --git a/server/constants/mixerProtocols/StuderVistaEmber.ts b/server/constants/mixerProtocols/StuderVistaEmber.ts index 5607f0da..e5e6ed6e 100644 --- a/server/constants/mixerProtocols/StuderVistaEmber.ts +++ b/server/constants/mixerProtocols/StuderVistaEmber.ts @@ -56,6 +56,7 @@ export const StuderVistaMaster: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: 'a1 a1 {ch-type} {channel} a1 a2 e1', @@ -113,6 +114,7 @@ export const StuderVistaMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { // 7f 8f ff fe d9 5c 80 30 80 a1 25 31 23 a1 21 31 1f a1 1d 31 1b a1 19 31 17 {a3} 15 31 13 a1 11 31 0f a2 0d 31 0b e1 09 31 07 63 {05 09 03 c0 06 13 00 00 00 00} @@ -187,6 +189,7 @@ export const StuderVistaMaster: IMixerProtocol = { channelTypeColor: '#3f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: @@ -226,6 +229,7 @@ export const StuderVistaMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { // 7f 8f ff fe d9 5c 80 30 80 a1 25 31 23 a1 21 31 1f a1 1d 31 1b a2 19 31 17 b9 15 31 13 a1 11 31 0f a2 0d 31 0b e1 09 31 07 63 05 09 03 80 03 05 00 00 00 00 @@ -299,6 +303,7 @@ export const StuderVistaMaster: IMixerProtocol = { channelTypeColor: '#2f3f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: @@ -338,6 +343,7 @@ export const StuderVistaMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: diff --git a/server/constants/mixerProtocols/ardourMaster.ts b/server/constants/mixerProtocols/ardourMaster.ts index dceb4134..19f53634 100644 --- a/server/constants/mixerProtocols/ardourMaster.ts +++ b/server/constants/mixerProtocols/ardourMaster.ts @@ -44,6 +44,7 @@ export const ArdourMaster: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/strip/fader/{channel}', @@ -90,6 +91,7 @@ export const ArdourMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/strip/fader/{channel}', diff --git a/server/constants/mixerProtocols/behringerXrMaster.ts b/server/constants/mixerProtocols/behringerXrMaster.ts index 95018ada..e5f9a815 100644 --- a/server/constants/mixerProtocols/behringerXrMaster.ts +++ b/server/constants/mixerProtocols/behringerXrMaster.ts @@ -132,6 +132,7 @@ export const BehringerXrMaster: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/ch/{channel}/mix/fader', @@ -269,6 +270,7 @@ export const BehringerXrMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/ch/{channel}/mix/fader', diff --git a/server/constants/mixerProtocols/casparCGMaster.ts b/server/constants/mixerProtocols/casparCGMaster.ts index 0b3f71ad..6b8ff782 100644 --- a/server/constants/mixerProtocols/casparCGMaster.ts +++ b/server/constants/mixerProtocols/casparCGMaster.ts @@ -135,6 +135,7 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: 'none', @@ -163,6 +164,7 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: 'none', diff --git a/server/constants/mixerProtocols/genericMidi.ts b/server/constants/mixerProtocols/genericMidi.ts index 03bc6d10..02c0e7ef 100644 --- a/server/constants/mixerProtocols/genericMidi.ts +++ b/server/constants/mixerProtocols/genericMidi.ts @@ -17,6 +17,7 @@ export const GenericMidi: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '0', @@ -54,6 +55,7 @@ export const GenericMidi: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '38', diff --git a/server/constants/mixerProtocols/midasMaster.ts b/server/constants/mixerProtocols/midasMaster.ts index 4de0b6aa..2915bc89 100644 --- a/server/constants/mixerProtocols/midasMaster.ts +++ b/server/constants/mixerProtocols/midasMaster.ts @@ -133,6 +133,7 @@ export const MidasMaster: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/ch/{channel}/mix/fader', @@ -252,6 +253,7 @@ export const MidasMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/ch/{channel}/mix/fader', diff --git a/server/constants/mixerProtocols/reaperMaster.ts b/server/constants/mixerProtocols/reaperMaster.ts index 2c4905e3..d396e10d 100644 --- a/server/constants/mixerProtocols/reaperMaster.ts +++ b/server/constants/mixerProtocols/reaperMaster.ts @@ -17,6 +17,7 @@ export const ReaperMaster: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/track/{channel}/volume', @@ -63,6 +64,7 @@ export const ReaperMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/track/{channel}/volume', @@ -121,6 +123,7 @@ export const ReaperMaster: IMixerProtocol = { channelTypeColor: '#0f0f3f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/master/volume', @@ -166,6 +169,7 @@ export const ReaperMaster: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: '/master/volume', diff --git a/server/constants/mixerProtocols/yamahaQLCL.ts b/server/constants/mixerProtocols/yamahaQLCL.ts index ffec3dc1..4fabde47 100644 --- a/server/constants/mixerProtocols/yamahaQLCL.ts +++ b/server/constants/mixerProtocols/yamahaQLCL.ts @@ -26,6 +26,7 @@ export const YamahaQLCL: IMixerProtocol = { channelTypeColor: '#2f2f2f', fromMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: @@ -75,6 +76,7 @@ export const YamahaQLCL: IMixerProtocol = { }, toMixer: { CHANNEL_INPUT_GAIN: [emptyMixerMessage()], + CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()], CHANNEL_OUT_GAIN: [ { mixerMessage: