Skip to content

Commit

Permalink
feat: full ch strip - OSCMixerProtocol a lot of code removed with sup…
Browse files Browse the repository at this point in the history 
…port for fxParams
  • Loading branch information
olzzon authored and olzzon committed Oct 29, 2020
1 parent 4defbad commit 486dfce
Showing 1 changed file with 36 additions and 163 deletions.
199 changes: 36 additions & 163 deletions server/utils/mixerConnections/OscMixerConnection.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,170 +344,8 @@ export class OscMixerConnection {
ch - 1
].assignedFader
)
} else if (
this.checkOscCommand(
message.address,
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.CompThrs
][0].mixerMessage
)
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
store.dispatch(
storeFaderFx(
fxParamsList.CompThrs,
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
message.args[0]
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
} else if (
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.CompRatio
][0].mixerMessage
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
let ratio = this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.CompRatio
][0]
let level =
message.args[0] /
(ratio.max || 1 - ratio.min || 0 + ratio.min || 0)
store.dispatch(
storeFaderFx(
fxParamsList.CompRatio,
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
level
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
} else if (
this.checkOscCommand(
message.address,
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.DelayTime
][0].mixerMessage
)
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
let delay = this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.DelayTime
][0]
let delayTime =
message.args[0] /
(delay.max || 1 - delay.min || 0 + delay.min || 0)
store.dispatch(
storeFaderFx(
fxParamsList.DelayTime,
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
delayTime
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
} else if (
this.checkOscCommand(
message.address,
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.EqGain01
][0].mixerMessage
)
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
store.dispatch(
storeFaderFx(
fxParamsList.EqGain01,
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
message.args[0]
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
} else if (
this.checkOscCommand(
message.address,
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.EqGain02
][0].mixerMessage
)
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
store.dispatch(
storeFaderFx(
fxParamsList.EqGain02,
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
message.args[0]
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
} else if (
this.checkOscCommand(
message.address,
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.EqGain03
][0].mixerMessage
)
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
store.dispatch(
storeFaderFx(
fxParamsList.EqGain03,
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
message.args[0]
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
} else if (
this.checkOscCommand(
message.address,
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList.EqGain04
][0].mixerMessage
)
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
store.dispatch(
storeFaderFx(
fxParamsList.EqGain04,
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
message.args[0]
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
} else {
this.checkFxCommands(message)
logger.verbose(
'Unknown OSC message: ' + message.address,
{}
Expand Down Expand Up @@ -604,6 +442,41 @@ export class OscMixerConnection {
}, this.mixerProtocol.pingTime)
}

checkFxCommands(message: any) {
Object.keys(fxParamsList)
.filter((fxKey: number | string) => {
return typeof fxKey === 'string'
})
.forEach((keyName: string) => {
let fxKey = keyName as keyof typeof fxParamsList
if (
this.checkOscCommand(
message.address,
this.mixerProtocol.channelTypes[0].fromMixer[
fxParamsList[fxKey]
][0].mixerMessage
)
) {
let ch = message.address.split('/')[this.cmdChannelIndex]
store.dispatch(
storeFaderFx(
fxParamsList[fxKey],
state.channels[0].chConnection[this.mixerIndex]
.channel[ch - 1].assignedFader,
message.args[0]
)
)
global.mainThreadHandler.updatePartialStore(
state.channels[0].chConnection[this.mixerIndex].channel[
ch - 1
].assignedFader
)
}

console.log(fxKey)
})
}

checkOscCommand(message: string, command: string): boolean {
if (message === command) return true
let messageArray: string[] = message.split('/')
Expand Down

0 comments on commit 486dfce

Please sign in to comment.