diff --git a/src/constants/MixerProtocolPresets.ts b/src/constants/MixerProtocolPresets.ts index 33e264f7..e7dee582 100644 --- a/src/constants/MixerProtocolPresets.ts +++ b/src/constants/MixerProtocolPresets.ts @@ -41,13 +41,14 @@ export interface IChannelTypes { CHANNEL_FADER_LEVEL: Array, CHANNEL_OUT_GAIN: Array, CHANNEL_VU: Array, - CHANNEL_NAME: string, + CHANNEL_NAME: Array, PFL: Array AUX_SEND: Array }, toMixer: { CHANNEL_FADER_LEVEL: Array, CHANNEL_OUT_GAIN: Array, + CHANNEL_NAME: Array, PFL_ON: Array, PFL_OFF: Array AUX_SEND: Array diff --git a/src/constants/mixerProtocols/EmberLawo.ts b/src/constants/mixerProtocols/EmberLawo.ts index b4bf65f5..b65a5bd2 100644 --- a/src/constants/mixerProtocols/EmberLawo.ts +++ b/src/constants/mixerProtocols/EmberLawo.ts @@ -44,7 +44,7 @@ export const LawoClient: IMixerProtocol = { }], CHANNEL_OUT_GAIN: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_VU: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], - CHANNEL_NAME: 'none', + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, @@ -66,6 +66,7 @@ export const LawoClient: IMixerProtocol = { zero: 0 }], + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/track/{channel}/solo", value: 1, @@ -92,13 +93,14 @@ export const LawoClient: IMixerProtocol = { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'Sapphire/Sums/Source{channel}/Fader', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_VU: [{ mixerMessage: '/track/{channel}/vu', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], - CHANNEL_NAME: '/track/{channel}/name', + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'Sapphire/Sums/Source{channel}/Fader', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: 'Sapphire/Sums/Source{channel}/Gain', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/track/{channel}/solo", value: 1, diff --git a/src/constants/mixerProtocols/ardourMaster.ts b/src/constants/mixerProtocols/ardourMaster.ts index a0b85926..0c44abce 100644 --- a/src/constants/mixerProtocols/ardourMaster.ts +++ b/src/constants/mixerProtocols/ardourMaster.ts @@ -34,13 +34,14 @@ export const ArdourMaster: IMixerProtocol = { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], //'none' ignores this command CHANNEL_OUT_GAIN: [{ mixerMessage: '/strip/fader/{channel}', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_VU: [{ mixerMessage: '/strip/meter/{channel}', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], - CHANNEL_NAME: '/strip/name/{channel}', + CHANNEL_NAME: [{ mixerMessage: '/strip/name/{channel}', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: '/strip/fader/{channel}', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], + CHANNEL_NAME: [{ mixerMessage: '/strip/name/{channel}', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/not_in_use", value: 0, type: "f", min: 0, max: 1, zero: 0.75 }], diff --git a/src/constants/mixerProtocols/behringerXrMaster.ts b/src/constants/mixerProtocols/behringerXrMaster.ts index 7156df2d..f90b94e1 100644 --- a/src/constants/mixerProtocols/behringerXrMaster.ts +++ b/src/constants/mixerProtocols/behringerXrMaster.ts @@ -33,13 +33,14 @@ export const BehringerXrMaster: IMixerProtocol = { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], //'none' ignores this command CHANNEL_OUT_GAIN: [{ mixerMessage: '/ch/{channel}/mix/fader', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_VU: [{ mixerMessage: '/meters/1', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], - CHANNEL_NAME: '/ch/{channel}/config/name', + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, toMixer : { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: '/ch/{channel}/mix/fader', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/not_in_use", value: 0, diff --git a/src/constants/mixerProtocols/casparCGMaster.ts b/src/constants/mixerProtocols/casparCGMaster.ts index 238fcb73..12d33ae2 100644 --- a/src/constants/mixerProtocols/casparCGMaster.ts +++ b/src/constants/mixerProtocols/casparCGMaster.ts @@ -55,13 +55,14 @@ if (geometry) { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1.5, zero: 1}], CHANNEL_OUT_GAIN: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1.5, zero: 1}], CHANNEL_VU: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], - CHANNEL_NAME: 'none', + CHANNEL_NAME: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1.5, zero: 1}], CHANNEL_OUT_GAIN: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1.5, zero: 1}], + CHANNEL_NAME: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "none", value: 1, type: "i", min: 0, max: 1, zero: 0.75 }], PFL_OFF: [{ mixerMessage: "none", value: 0, type: "i", min: 0, max: 1, zero: 0.75 }], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], diff --git a/src/constants/mixerProtocols/genericMidi.ts b/src/constants/mixerProtocols/genericMidi.ts index f4391544..7a6bfd5c 100644 --- a/src/constants/mixerProtocols/genericMidi.ts +++ b/src/constants/mixerProtocols/genericMidi.ts @@ -34,13 +34,14 @@ export const GenericMidi: IMixerProtocol = { CHANNEL_FADER_LEVEL: [{ mixerMessage: "39", value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], //PgmChange 0 - ignores this command CHANNEL_OUT_GAIN: [{ mixerMessage: "0", value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], //PgmChange 0 - ignores this command CHANNEL_VU: [{ mixerMessage: "0", value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], //PgmChange 0 - ignores this command - CHANNEL_NAME: 'some sysex not yet build', + CHANNEL_NAME: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: "39", value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: "38", value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], + CHANNEL_NAME: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/not_in_use", value: 0, diff --git a/src/constants/mixerProtocols/midasMaster.ts b/src/constants/mixerProtocols/midasMaster.ts index 36c64284..12a5629a 100644 --- a/src/constants/mixerProtocols/midasMaster.ts +++ b/src/constants/mixerProtocols/midasMaster.ts @@ -48,13 +48,14 @@ export const MidasMaster: IMixerProtocol = { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], //'none' ignores this command CHANNEL_OUT_GAIN: [{ mixerMessage: '/ch/{channel}/mix/fader', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_VU: [{ mixerMessage: '/meters/1', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], - CHANNEL_NAME: '/ch/{channel}/config/name', + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: '/ch/{channel}/mix/fader', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], + CHANNEL_NAME: [{ mixerMessage: '/ch/{channel}/config/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/not_in_use", value: 0, diff --git a/src/constants/mixerProtocols/reaper.ts b/src/constants/mixerProtocols/reaper.ts index a3aa3f70..cafe17f2 100644 --- a/src/constants/mixerProtocols/reaper.ts +++ b/src/constants/mixerProtocols/reaper.ts @@ -32,13 +32,14 @@ export const Reaper: IMixerProtocol = { CHANNEL_FADER_LEVEL: [{ mixerMessage: '/track/{channel}/volume', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: '/track/{channel}/fx/1/fxparam/1/value', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_VU: [{ mixerMessage: '/track/{channel}/vu', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], - CHANNEL_NAME: '/track/{channel}/name', + CHANNEL_NAME: [{ mixerMessage: '/track/{channel}/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: '/track/{channel}/volume', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], CHANNEL_OUT_GAIN: [{ mixerMessage: '/track/{channel}/fx/1/fxparam/1/value', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], + CHANNEL_NAME: [{ mixerMessage: '/track/{channel}/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/track/{channel}/solo", value: 1, diff --git a/src/constants/mixerProtocols/reaperMaster.ts b/src/constants/mixerProtocols/reaperMaster.ts index 7a6a4bee..9c6aa62f 100644 --- a/src/constants/mixerProtocols/reaperMaster.ts +++ b/src/constants/mixerProtocols/reaperMaster.ts @@ -34,13 +34,14 @@ export const ReaperMaster: IMixerProtocol = { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], CHANNEL_OUT_GAIN: [{ mixerMessage: '/track/{channel}/volume', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], CHANNEL_VU: [{ mixerMessage: '/track/{channel}/vu', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], - CHANNEL_NAME: '/track/{channel}/name', + CHANNEL_NAME: [{ mixerMessage: '/track/{channel}/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], CHANNEL_OUT_GAIN: [{ mixerMessage: '/track/{channel}/volume', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], + CHANNEL_NAME: [{ mixerMessage: '/track/{channel}/name', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "/track/{channel}/solo", value: 1, @@ -70,13 +71,14 @@ export const ReaperMaster: IMixerProtocol = { { mixerMessage: '/master/vu/L', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }, { mixerMessage: '/master/vu/R', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 } ], - CHANNEL_NAME: '', + CHANNEL_NAME: [{ mixerMessage: '', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], AUX_SEND: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], }, toMixer: { CHANNEL_FADER_LEVEL: [{ mixerMessage: 'none', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], CHANNEL_OUT_GAIN: [{ mixerMessage: '/master/volume', value: 0, type: 'f', min: 0, max: 1, zero: 0.75 }], + CHANNEL_NAME: [{ mixerMessage: '', value: 0, type: 'f', min: 0, max: 1, zero: 0.75}], PFL_ON: [{ mixerMessage: "", value: 1, diff --git a/src/utils/OscMixerConnection.ts b/src/utils/OscMixerConnection.ts index 9fbc0679..fc6eab78 100644 --- a/src/utils/OscMixerConnection.ts +++ b/src/utils/OscMixerConnection.ts @@ -109,7 +109,7 @@ export class OscMixerConnection { } } else if (this.checkOscCommand(message.address, this.mixerProtocol.channelTypes[0].fromMixer - .CHANNEL_NAME)) { + .CHANNEL_NAME[0].mixerMessage)) { let ch = message.address.split("/")[this.cmdChannelIndex]; window.storeRedux.dispatch({ type:'SET_CHANNEL_LABEL',