fix(casparcg): use normal input selector rather than custom component

olzzon · Nov 10, 2020 · f33a18f · f33a18f
1 parent 50b3c30
commit f33a18f
Show file tree

Hide file tree

Showing 7 changed files with 287 additions and 302 deletions.
diff --git a/client/components/CcgChannelSettings.tsx b/client/components/CcgChannelSettings.tsx
diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx
@@ -17,7 +17,6 @@ import {
     SOCKET_SET_INPUT_GAIN,
     SOCKET_SET_INPUT_SELECTOR,
 } from '../../server/constants/SOCKET_IO_DISPATCHERS'
-import CcgChannelInputSettings from './CcgChannelSettings'
 import ReductionMeter from './ReductionMeter'
 import ClassNames from 'classnames'
 import { fxParamsList } from '../../server/constants/MixerProtocolInterface'
@@ -506,13 +505,7 @@ class ChanStrip extends React.PureComponent<
                         </button>
                     </div>
                     <hr />
-                    {this.props.selectedProtocol.includes('caspar') ? (
-                        <CcgChannelInputSettings
-                            channelIndex={this.props.faderIndex}
-                        />
-                    ) : (
-                        this.parameters()
-                    )}
+                    {this.parameters()}
                 </div>
             )
         } else {

diff --git a/client/components/MiniChanStrip.tsx b/client/components/MiniChanStrip.tsx
@@ -6,7 +6,6 @@ import { Store } from 'redux'
 import { connect } from 'react-redux'
 import { IFader } from '../../server/reducers/fadersReducer'
 import { SOCKET_SET_AUX_LEVEL } from '../../server/constants/SOCKET_IO_DISPATCHERS'
-import CcgChannelInputSettings from './CcgChannelSettings'
 
 interface IChanStripInjectProps {
     label: string
@@ -73,28 +72,21 @@ class MiniChanStrip extends React.PureComponent<
         )
     }
     parameters() {
-        if (this.props.selectedProtocol.includes('caspar')) {
-            return (
-                <CcgChannelInputSettings channelIndex={this.props.faderIndex} />
-            )
-        } else {
-            return (
-                <div className="parameters">
-                    <div className="group-text">
-                        {this.props.label ||
-                            'FADER ' + (this.props.faderIndex + 1)}
-                        {' - MONITOR MIX MINUS'}
-                    </div>
-                    <ul className="monitor-sends">
-                        {this.props.channel.map((ch: any, index: number) => {
-                            if (ch.auxLevel[this.props.auxSendIndex] >= 0) {
-                                return this.monitor(index)
-                            }
-                        })}
-                    </ul>
+        return (
+            <div className="parameters">
+                <div className="group-text">
+                    {this.props.label || 'FADER ' + (this.props.faderIndex + 1)}
+                    {' - MONITOR MIX MINUS'}
                 </div>
-            )
-        }
+                <ul className="monitor-sends">
+                    {this.props.channel.map((ch: any, index: number) => {
+                        if (ch.auxLevel[this.props.auxSendIndex] >= 0) {
+                            return this.monitor(index)
+                        }
+                    })}
+                </ul>
+            </div>
+        )
     }
 
     render() {
@@ -114,7 +106,8 @@ const mapStateToProps = (state: any, props: any): IChanStripInjectProps => {
     let inject: IChanStripInjectProps = {
         label: '',
         selectedProtocol: state.settings[0].mixers[0].mixerProtocol,
-        numberOfChannelsInType: state.settings[0].mixers[0].numberOfChannelsInType,
+        numberOfChannelsInType:
+            state.settings[0].mixers[0].numberOfChannelsInType,
         channel: state.channels[0].chConnection[0].channel,
         fader: state.faders[0].fader,
         auxSendIndex: -1,
@@ -124,7 +117,8 @@ const mapStateToProps = (state: any, props: any): IChanStripInjectProps => {
         inject = {
             label: state.faders[0].fader[props.faderIndex].label,
             selectedProtocol: state.settings[0].mixers[0].mixerProtocol,
-            numberOfChannelsInType: state.settings[0].mixers[0].numberOfChannelsInType,
+            numberOfChannelsInType:
+                state.settings[0].mixers[0].numberOfChannelsInType,
             channel: state.channels[0].chConnection[0].channel,
             fader: state.faders[0].fader,
             auxSendIndex: state.faders[0].fader[props.faderIndex].monitor - 1,

diff --git a/server/constants/MixerProtocolInterface.ts b/server/constants/MixerProtocolInterface.ts
@@ -130,6 +130,7 @@ export interface ICasparCGMixerGeometryFile {
         PGM_CHANNEL_FADER_LEVEL: Array<ICasparCGChannelLayerPair[]>
         PFL_AUX_FADER_LEVEL: Array<ICasparCGChannelLayerPair[]>
         NEXT_AUX_FADER_LEVEL: Array<ICasparCGChannelLayerPair[]>
+        CHANNEL_INPUT_SELECTOR?: Array<IMixerMessageProtocol>
     }
     sourceOptions?: {
         sources: Array<
@@ -160,6 +161,7 @@ export interface ICasparCGMixerGeometry extends IMixerProtocolGeneric {
         PGM_CHANNEL_FADER_LEVEL: Array<ICasparCGChannelLayerPair[]>
         PFL_AUX_FADER_LEVEL: Array<ICasparCGChannelLayerPair[]>
         NEXT_AUX_FADER_LEVEL: Array<ICasparCGChannelLayerPair[]>
+        CHANNEL_INPUT_SELECTOR?: Array<IMixerMessageProtocol>
     }
     channelLabels?: string[]
     sourceOptions?: {

diff --git a/server/constants/mixerProtocols/casparCGMaster.ts b/server/constants/mixerProtocols/casparCGMaster.ts
@@ -116,8 +116,8 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
     sourceOptions: geometry.sourceOptions,
     fader: {
         min: 0,
-        max: 1.5,
-        zero: 1,
+        max: 1,
+        zero: 0.75,
         step: 0.001,
     },
     meter: {
@@ -136,22 +136,20 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
             fromMixer: {
                 CHANNEL_OUT_GAIN: [
                     {
-                        mixerMessage: 'none',
+                        mixerMessage: 'MIXER ${CHANNEL} VOLUME ',
                         value: 0,
                         type: 'f',
                         min: 0,
-                        max: 1.5,
-                        zero: 1,
+                        max: 1,
+                        zero: 0.75,
+                    },
+                ],
+                CHANNEL_VU: [
+                    {
+                        mixerMessage:
+                            '/stage/channel/{ch}/layer/{layer}/mixer/volume',
                     },
                 ],
-                CHANNEL_VU: [emptyMixerMessage()],
-                CHANNEL_VU_REDUCTION: [emptyMixerMessage()],
-                CHANNEL_NAME: [emptyMixerMessage()],
-                PFL: [emptyMixerMessage()],
-                NEXT_SEND: [emptyMixerMessage()],
-                AUX_LEVEL: [emptyMixerMessage()],
-                CHANNEL_MUTE_ON: [emptyMixerMessage()],
-                CHANNEL_MUTE_OFF: [emptyMixerMessage()],
             },
             toMixer: {
                 CHANNEL_OUT_GAIN: [
@@ -160,17 +158,24 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
                         value: 0,
                         type: 'f',
                         min: 0,
-                        max: 1.5,
-                        zero: 1,
+                        max: 1,
+                        zero: 0.75,
+                    },
+                ],
+                CHANNEL_INPUT_SELECTOR: [
+                    {
+                        mixerMessage: '',
+                        label: '1L-2R',
+                    },
+                    {
+                        mixerMessage: '',
+                        label: '1L-1R',
+                    },
+                    {
+                        mixerMessage: '',
+                        label: '2L-2R',
                     },
                 ],
-                CHANNEL_NAME: [emptyMixerMessage()],
-                PFL_ON: [emptyMixerMessage()],
-                PFL_OFF: [emptyMixerMessage()],
-                NEXT_SEND: [emptyMixerMessage()],
-                AUX_LEVEL: [emptyMixerMessage()],
-                CHANNEL_MUTE_ON: [emptyMixerMessage()],
-                CHANNEL_MUTE_OFF: [emptyMixerMessage()],
             },
         },
     ],