Skip to content

Commit

Permalink
fix: datastructure didn´t reference to key but to index.
Browse files Browse the repository at this point in the history
  • Loading branch information
olzzon authored and olzzon committed Oct 29, 2020
1 parent 5382c6f commit 75c5944
Show file tree
Hide file tree
Showing 28 changed files with 368 additions and 1,022 deletions.
261 changes: 107 additions & 154 deletions client/components/ChanStrip.tsx
View file

Large diffs are not rendered by default.

223 changes: 62 additions & 161 deletions client/components/ChanStripFull.tsx
View file

Large diffs are not rendered by default.

28 changes: 0 additions & 28 deletions server/MainThreadHandler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ import {
SOCKET_SET_AUX_LEVEL,
SOCKET_NEXT_MIX,
SOCKET_CLEAR_PST,
SOCKET_SET_THRESHOLD,
SOCKET_SET_RATIO,
SOCKET_SET_FX,
SOCKET_RESTART_SERVER,
SOCKET_SET_FADER_MONITOR,
Expand All @@ -49,7 +47,6 @@ import {
SOCKET_SET_STORE_CHANNEL,
SOCKET_SET_INPUT_OPTION,
SOCKET_SAVE_CCG_FILE,
SOCKET_SET_DELAY_TIME,
SOCKET_SHOW_IN_MINI_MONITOR,
SOCKET_GET_MIXER_PRESET_LIST,
SOCKET_RETURN_MIXER_PRESET_LIST,
Expand All @@ -64,9 +61,6 @@ import {
import {
storeFaderLevel,
storeInputGain,
storeFaderThreshold,
storeFaderRatio,
storeFaderDelayTime,
storeFaderFx,
storeFaderMonitor,
storeTogglePgm,
Expand Down Expand Up @@ -301,28 +295,6 @@ export class MainThreadHandlers {
this.updateFullClientStore()
remoteConnections.updateRemoteAuxPanels()
})
.on(SOCKET_SET_THRESHOLD, (payload: any) => {
logger.verbose('Set Threshold:' + String(payload.channel), {})
store.dispatch(
storeFaderThreshold(payload.channel, payload.level)
)
mixerGenericConnection.updateThreshold(payload.channel)
this.updatePartialStore(payload.channel)
})
.on(SOCKET_SET_RATIO, (payload: any) => {
logger.verbose('Set Ratio:' + String(payload.channel), {})
store.dispatch(storeFaderRatio(payload.channel, payload.level))
mixerGenericConnection.updateRatio(payload.channel)
this.updatePartialStore(payload.channel)
})
.on(SOCKET_SET_DELAY_TIME, (payload: any) => {
logger.verbose('Set Delay:' + String(payload.channel), {})
store.dispatch(
storeFaderDelayTime(payload.channel, payload.delayTime)
)
mixerGenericConnection.updateDelayTime(payload.channel)
this.updatePartialStore(payload.channel)
})
.on(SOCKET_SET_FX, (payload: any) => {
logger.verbose(
'Set ' +
Expand Down
14 changes: 6 additions & 8 deletions server/constants/MixerProtocolInterface.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export enum fxParamsList {
EqQ02,
EqQ03,
EqQ04,
CompThrs,
CompRatio,
DelayTime,
}
export interface IMixerProtocolGeneric {
protocol: string
Expand Down Expand Up @@ -54,10 +57,7 @@ export interface IChannelTypes {
CHANNEL_NAME?: Array<IMixerMessageProtocol>
PFL?: Array<IMixerMessageProtocol>
NEXT_SEND?: Array<IMixerMessageProtocol>
THRESHOLD?: Array<IMixerMessageProtocol>
RATIO?: Array<IMixerMessageProtocol>
DELAY_TIME?: Array<IMixerMessageProtocol>
FX_PARAMS?: Array<IFxProtocol>
[FX_PARAM: number]: Array<IMixerMessageProtocol>
AUX_LEVEL?: Array<IMixerMessageProtocol>
CHANNEL_MUTE_ON?: Array<IMixerMessageProtocol>
CHANNEL_MUTE_OFF?: Array<IMixerMessageProtocol>
Expand All @@ -71,10 +71,7 @@ export interface IChannelTypes {
PFL_ON?: Array<IMixerMessageProtocol>
PFL_OFF?: Array<IMixerMessageProtocol>
NEXT_SEND?: Array<IMixerMessageProtocol>
THRESHOLD?: Array<IMixerMessageProtocol>
RATIO?: Array<IMixerMessageProtocol>
DELAY_TIME?: Array<IMixerMessageProtocol>
FX_PARAMS?: Array<IFxProtocol>
[FX_PARAM: number]: Array<IMixerMessageProtocol>
AUX_LEVEL?: Array<IMixerMessageProtocol>
CHANNEL_MUTE_ON?: Array<IMixerMessageProtocol>
CHANNEL_MUTE_OFF?: Array<IMixerMessageProtocol>
Expand All @@ -90,6 +87,7 @@ interface IMixerMessageProtocol {
max?: number
zero?: number
label?: string
valueLabel?: string
minLabel?: number
maxLabel?: number
zeroLabel?: number
Expand Down
3 changes: 0 additions & 3 deletions server/constants/SOCKET_IO_DISPATCHERS.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ export const SOCKET_SET_FADER_MONITOR = 'FaderMonitor'
export const SOCKET_SHOW_IN_MINI_MONITOR = 'showInMiniMonitor'
export const SOCKET_SET_AUX_LEVEL = 'setAuxLevel'
export const SOCKET_SET_INPUT_OPTION = 'setInputOption'
export const SOCKET_SET_THRESHOLD = 'setThreshold'
export const SOCKET_SET_RATIO = 'setRatio'
export const SOCKET_SET_DELAY_TIME = 'setDelayTime'
export const SOCKET_SET_FX = 'setHigh'
export const SOCKET_TOGGLE_PGM = 'togglePgm'
export const SOCKET_TOGGLE_VO = 'toggleVo'
Expand Down
6 changes: 0 additions & 6 deletions server/constants/mixerProtocols/DmxIs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ export const DMXIS: IMixerProtocol = {
CHANNEL_NAME: [emptyMixerMessage()],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down Expand Up @@ -62,9 +59,6 @@ export const DMXIS: IMixerProtocol = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down
6 changes: 0 additions & 6 deletions server/constants/mixerProtocols/LawoRelayVrx4.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ export const LawoRelayVrx4: IMixerProtocol = {
],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down Expand Up @@ -73,9 +70,6 @@ export const LawoRelayVrx4: IMixerProtocol = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down
6 changes: 0 additions & 6 deletions server/constants/mixerProtocols/StuderOnAirEmber.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ export const StuderOnAirMaster: IMixerProtocol = {
],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down Expand Up @@ -184,9 +181,6 @@ 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
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down
18 changes: 0 additions & 18 deletions server/constants/mixerProtocols/StuderVistaEmber.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ export const StuderVistaMaster: IMixerProtocol = {
CHANNEL_NAME: [emptyMixerMessage()],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [
{
mixerMessage: 'a1 a1 {ch-type} {channel} a1 a4 {aux}',
Expand Down Expand Up @@ -134,9 +131,6 @@ export const StuderVistaMaster: IMixerProtocol = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [
{
mixerMessage:
Expand Down Expand Up @@ -202,9 +196,6 @@ export const StuderVistaMaster: IMixerProtocol = {
],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down Expand Up @@ -236,9 +227,6 @@ export const StuderVistaMaster: IMixerProtocol = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [
{
mixerMessage:
Expand Down Expand Up @@ -304,9 +292,6 @@ export const StuderVistaMaster: IMixerProtocol = {
],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down Expand Up @@ -337,9 +322,6 @@ export const StuderVistaMaster: IMixerProtocol = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [
{
mixerMessage:
Expand Down
6 changes: 0 additions & 6 deletions server/constants/mixerProtocols/ardourMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ export const ArdourMaster: IMixerProtocol = {
],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down Expand Up @@ -107,9 +104,6 @@ export const ArdourMaster: IMixerProtocol = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down
114 changes: 0 additions & 114 deletions server/constants/mixerProtocols/behringerXrMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,63 +89,6 @@ export const BehringerXrMaster: IMixerProtocol = {
],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [
{
mixerMessage: '/ch/{channel}/dyn/thr',
},
],
RATIO: [
{
mixerMessage: '/ch/{channel}/dyn/ratio',
},
],
DELAY_TIME: [
{
mixerMessage: '/ch/{channel}/delay/time',
},
],
FX_PARAMS: [
{
key: fxParamsList.EqGain01,
params: [
{
mixerMessage: '/ch/{channel}/eq/1/g',
minLabel: -15,
maxLabel: 15,
},
],
},
{
key: fxParamsList.EqGain02,
params: [
{
mixerMessage: '/ch/{channel}/eq/2/g',
minLabel: -15,
maxLabel: 15,
},
],
},
{
key: fxParamsList.EqGain03,
params: [
{
mixerMessage: '/ch/{channel}/eq/3/g',
minLabel: -15,
maxLabel: 15,
},
],
},
{
key: fxParamsList.EqGain04,
params: [
{
mixerMessage: '/ch/{channel}/eq/4/g',
minLabel: -15,
maxLabel: 15,
},
],
},
],
AUX_LEVEL: [
{
mixerMessage: '/ch/{channel}/mix/{argument}/level',
Expand Down Expand Up @@ -173,63 +116,6 @@ export const BehringerXrMaster: IMixerProtocol = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [
{
mixerMessage: '/ch/{channel}/dyn/thr',
},
],
RATIO: [
{
mixerMessage: '/ch/{channel}/dyn/ratio',
},
],
DELAY_TIME: [
{
mixerMessage: '/ch/{channel}/delay/time',
},
],
FX_PARAMS: [
{
key: fxParamsList.EqGain01,
params: [
{
mixerMessage: '/ch/{channel}/eq/1/g',
minLabel: -15,
maxLabel: 15,
},
],
},
{
key: fxParamsList.EqGain02,
params: [
{
mixerMessage: '/ch/{channel}/eq/2/g',
minLabel: -15,
maxLabel: 15,
},
],
},
{
key: fxParamsList.EqGain03,
params: [
{
mixerMessage: '/ch/{channel}/eq/3/g',
minLabel: -15,
maxLabel: 15,
},
],
},
{
key: fxParamsList.EqGain04,
params: [
{
mixerMessage: '/ch/{channel}/eq/4/g',
minLabel: -15,
maxLabel: 15,
},
],
},
],
AUX_LEVEL: [
{
mixerMessage: '/ch/{channel}/mix/{argument}/level',
Expand Down
6 changes: 0 additions & 6 deletions server/constants/mixerProtocols/casparCGMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,6 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
CHANNEL_NAME: [emptyMixerMessage()],
PFL: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand All @@ -171,9 +168,6 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
PFL_ON: [emptyMixerMessage()],
PFL_OFF: [emptyMixerMessage()],
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
DELAY_TIME: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
CHANNEL_MUTE_ON: [emptyMixerMessage()],
CHANNEL_MUTE_OFF: [emptyMixerMessage()],
Expand Down
Loading

0 comments on commit 75c5944

Please sign in to comment.