Skip to content

Commit

Permalink
feat: input selector - added CHANNEL_INPUT_SELECTOR in mixer protocol
Browse files Browse the repository at this point in the history
  • Loading branch information
olzzon authored and olzzon committed Jun 8, 2020
1 parent 1e8b550 commit 04e6c61
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 1 deletion.
3 changes: 2 additions & 1 deletion client/components/ChanStrip.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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,
})
Expand Down
2 changes: 2 additions & 0 deletions server/constants/MixerProtocolInterface.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export interface IChannelTypes {
channelTypeColor: string
fromMixer: {
CHANNEL_INPUT_GAIN: Array<IMixerMessageProtocol>
CHANNEL_INPUT_SELECTOR: Array<IMixerMessageProtocol>
CHANNEL_OUT_GAIN: Array<IMixerMessageProtocol>
CHANNEL_VU: Array<IMixerMessageProtocol>
CHANNEL_VU_REDUCTION: Array<IMixerMessageProtocol>
Expand All @@ -51,6 +52,7 @@ export interface IChannelTypes {
}
toMixer: {
CHANNEL_INPUT_GAIN: Array<IMixerMessageProtocol>
CHANNEL_INPUT_SELECTOR: Array<IMixerMessageProtocol>
CHANNEL_OUT_GAIN: Array<IMixerMessageProtocol>
CHANNEL_NAME: Array<IMixerMessageProtocol>
PFL_ON: Array<IMixerMessageProtocol>
Expand Down
1 change: 1 addition & 0 deletions server/constants/SOCKET_IO_DISPATCHERS.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/DmxIs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
Expand Down Expand Up @@ -45,6 +46,7 @@ export const DMXIS: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: '/dmxis/ch/{channel}',
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/LawoMC2.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const LawoMC2: IMixerProtocol = {
channelTypeColor: '#2f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down Expand Up @@ -55,6 +56,7 @@ export const LawoMC2: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/LawoRelayVrx4.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const LawoRelayVrx4: IMixerProtocol = {
channelTypeColor: '#2f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down Expand Up @@ -55,6 +56,7 @@ export const LawoRelayVrx4: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/LawoRuby.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const LawoRuby: IMixerProtocol = {
channelTypeColor: '#2f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down Expand Up @@ -55,6 +56,7 @@ export const LawoRuby: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/SSLsystemT.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()],
Expand Down Expand Up @@ -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}',
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/StuderOnAirEmber.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const StuderOnAirMaster: IMixerProtocol = {
channelTypeColor: '#2f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions server/constants/mixerProtocols/StuderVistaEmber.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -187,6 +189,7 @@ export const StuderVistaMaster: IMixerProtocol = {
channelTypeColor: '#3f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -299,6 +303,7 @@ export const StuderVistaMaster: IMixerProtocol = {
channelTypeColor: '#2f3f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down Expand Up @@ -338,6 +343,7 @@ export const StuderVistaMaster: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/ardourMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
Expand Down Expand Up @@ -90,6 +91,7 @@ export const ArdourMaster: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: '/strip/fader/{channel}',
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/behringerXrMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/casparCGMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
channelTypeColor: '#2f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: 'none',
Expand Down Expand Up @@ -163,6 +164,7 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: 'none',
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/genericMidi.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const GenericMidi: IMixerProtocol = {
channelTypeColor: '#2f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: '0',
Expand Down Expand Up @@ -54,6 +55,7 @@ export const GenericMidi: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: '38',
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/midasMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
4 changes: 4 additions & 0 deletions server/constants/mixerProtocols/reaperMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -63,6 +64,7 @@ export const ReaperMaster: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: '/track/{channel}/volume',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -166,6 +169,7 @@ export const ReaperMaster: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage: '/master/volume',
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/yamahaQLCL.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const YamahaQLCL: IMixerProtocol = {
channelTypeColor: '#2f2f2f',
fromMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down Expand Up @@ -75,6 +76,7 @@ export const YamahaQLCL: IMixerProtocol = {
},
toMixer: {
CHANNEL_INPUT_GAIN: [emptyMixerMessage()],
CHANNEL_INPUT_SELECTOR: [emptyMixerMessage()],
CHANNEL_OUT_GAIN: [
{
mixerMessage:
Expand Down

0 comments on commit 04e6c61

Please sign in to comment.