Skip to content

Commit

Permalink
feat: added Low-mid to get 4-band eq instead of 3-band eq
Browse files Browse the repository at this point in the history
  • Loading branch information
@olzzon
olzzon committed Jan 23, 2020
1 parent 99c0207 commit 59542a8
Show file tree
Hide file tree
Showing 24 changed files with 126 additions and 6 deletions.
37 changes: 35 additions & 2 deletions client/components/ChanStrip.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
TOGGLE_SHOW_MONITOR_OPTIONS
} from '../../server/reducers/settingsActions'
import { IFader } from '../../server/reducers/fadersReducer'
import { SOCKET_SET_THRESHOLD, SOCKET_SET_RATIO, SOCKET_SET_LOW, SOCKET_SET_MID, SOCKET_SET_HIGH, SOCKET_SET_AUX_LEVEL } from '../../server/constants/SOCKET_IO_DISPATCHERS';
import { SOCKET_SET_THRESHOLD, SOCKET_SET_RATIO, SOCKET_SET_LOW, SOCKET_SET_LO_MID, SOCKET_SET_MID, SOCKET_SET_HIGH, SOCKET_SET_AUX_LEVEL } from '../../server/constants/SOCKET_IO_DISPATCHERS';

interface IChanStripInjectProps {
label: string,
Expand Down Expand Up @@ -86,6 +86,16 @@ class ChanStrip extends React.PureComponent<IChanStripProps & IChanStripInjectPr
}
)
}

handleLoMid(event: any) {
window.socketIoClient.emit( SOCKET_SET_LO_MID,
{
channel: this.props.faderIndex,
level: parseFloat(event)
}
)
}

handleMid(event: any) {
window.socketIoClient.emit( SOCKET_SET_MID,
{
Expand Down Expand Up @@ -177,10 +187,31 @@ class ChanStrip extends React.PureComponent<IChanStripProps & IChanStripInjectPr
)
}

loMid() {
return (
<div className="parameter-text">
Lo-Mid
<ReactSlider
className="chan-strip-fader"
thumbClassName = "chan-strip-thumb"
orientation = "vertical"
invert
min={0}
max={1}
step={0.01}
value= {this.props.fader[this.props.faderIndex].loMid}
onChange={(event: any) => {
this.handleLoMid(event)
}}
/>
</div>
)
}

mid() {
return (
<div className="parameter-text">
Mid
Hi-Mid
<ReactSlider
className="chan-strip-fader"
thumbClassName = "chan-strip-thumb"
Expand Down Expand Up @@ -265,6 +296,8 @@ class ChanStrip extends React.PureComponent<IChanStripProps & IChanStripInjectPr
<div className="parameter-group">
{this.low()}
<p className="zero-eq">_______</p>
{this.loMid()}
<p className="zero-eq">_______</p>
{this.mid()}
<p className="zero-eq">_______</p>
{this.high()}
Expand Down
18 changes: 16 additions & 2 deletions server/MainThreadHandler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import {
SOCKET_TOGGLE_IGNORE,
SOCKET_SET_FULL_STORE,
SOCKET_SET_STORE_FADER,
SOCKET_SET_STORE_CHANNEL
SOCKET_SET_STORE_CHANNEL,
SOCKET_SET_LO_MID
} from './constants/SOCKET_IO_DISPATCHERS'
import {
TOGGLE_PGM,
Expand All @@ -47,7 +48,8 @@ import {
SET_FADER_MID,
SET_FADER_HIGH,
SET_FADER_MONITOR,
IGNORE_AUTOMATION
IGNORE_AUTOMATION,
SET_FADER_LO_MID
} from './reducers/faderActions';
import { SET_FADER_LEVEL } from './reducers/faderActions';
import { SET_ASSIGNED_FADER, SET_AUX_LEVEL } from './reducers/channelActions';
Expand Down Expand Up @@ -231,6 +233,18 @@ export class MainThreadHandlers {
this.updatePartialStore(payload.channel)
})
)
.on(SOCKET_SET_LO_MID, (
(payload: any) => {
logger.verbose('Set Mid:' + String(payload.level), {})
store.dispatch({
type: SET_FADER_LO_MID,
channel: payload.channel,
level: payload.level
});
mixerGenericConnection.updateLoMid(payload.channel);
this.updatePartialStore(payload.channel)
})
)
.on(SOCKET_SET_MID, (
(payload: any) => {
logger.verbose('Set Mid:' + String(payload.level), {})
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 @@ -38,6 +38,7 @@ export interface IChannelTypes {
THRESHOLD: Array<IMixerMessageProtocol>
RATIO: Array<IMixerMessageProtocol>
LOW: Array<IMixerMessageProtocol>
LO_MID: Array<IMixerMessageProtocol>
MID: Array<IMixerMessageProtocol>
HIGH: Array<IMixerMessageProtocol>
AUX_LEVEL: Array<IMixerMessageProtocol>
Expand All @@ -54,6 +55,7 @@ export interface IChannelTypes {
THRESHOLD: Array<IMixerMessageProtocol>
RATIO: Array<IMixerMessageProtocol>
LOW: Array<IMixerMessageProtocol>
LO_MID: Array<IMixerMessageProtocol>
MID: Array<IMixerMessageProtocol>
HIGH: Array<IMixerMessageProtocol>
AUX_LEVEL: 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 @@ -8,6 +8,7 @@ export const SOCKET_SET_AUX_LEVEL = 'setAuxLevel'
export const SOCKET_SET_THRESHOLD = 'setThreshold'
export const SOCKET_SET_RATIO = 'setRatio'
export const SOCKET_SET_LOW = 'setLow'
export const SOCKET_SET_LO_MID = 'setLoMid'
export const SOCKET_SET_MID = 'setMid'
export const SOCKET_SET_HIGH = 'setHigh'
export const SOCKET_TOGGLE_PGM = 'togglePgm'
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 @@ -23,6 +23,7 @@ export const DMXIS: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -39,6 +40,7 @@ export const DMXIS: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down
2 changes: 2 additions & 0 deletions server/constants/mixerProtocols/EmberLawo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const LawoClient: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down Expand Up @@ -77,6 +78,7 @@ export const LawoClient: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
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 @@ -23,6 +23,7 @@ export const SSLSystemT: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -39,6 +40,7 @@ export const SSLSystemT: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
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 @@ -37,6 +37,7 @@ export const StuderVistaMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down Expand Up @@ -68,6 +69,7 @@ export const StuderVistaMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down Expand Up @@ -102,6 +104,7 @@ export const StuderVistaMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down Expand Up @@ -133,6 +136,7 @@ export const StuderVistaMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down Expand Up @@ -167,6 +171,7 @@ export const StuderVistaMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down Expand Up @@ -198,6 +203,7 @@ export const StuderVistaMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
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 @@ -50,6 +50,7 @@ export const ArdourMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -66,6 +67,7 @@ export const ArdourMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
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 @@ -45,6 +45,7 @@ export const BehringerXrMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -61,6 +62,7 @@ export const BehringerXrMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
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 @@ -62,6 +62,7 @@ if (geometry) {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -78,6 +79,7 @@ if (geometry) {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
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 @@ -23,6 +23,7 @@ export const GenericMidi: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -39,6 +40,7 @@ export const GenericMidi: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down
6 changes: 4 additions & 2 deletions server/constants/mixerProtocols/midasMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ export const MidasMaster: IMixerProtocol = {
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [{ mixerMessage: '/ch/{channel}/dyn/thr', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
RATIO: [{ mixerMessage: '/ch/{channel}/dyn/ratio', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
LOW: [{ mixerMessage: '/ch/{channel}/eq/2/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
LOW: [{ mixerMessage: '/ch/{channel}/eq/1/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
LO_MID: [{ mixerMessage: '/ch/{channel}/eq/2/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
MID: [{ mixerMessage: '/ch/{channel}/eq/3/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
HIGH: [{ mixerMessage: '/ch/{channel}/eq/4/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
AUX_LEVEL: [{mixerMessage: '/ch/{channel}/mix/{argument}/level', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
Expand All @@ -86,7 +87,8 @@ export const MidasMaster: IMixerProtocol = {
NEXT_SEND: [emptyMixerMessage()],
THRESHOLD: [{ mixerMessage: '/ch/{channel}/dyn/thr', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
RATIO: [{ mixerMessage: '/ch/{channel}/dyn/ratio', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
LOW: [{ mixerMessage: '/ch/{channel}/eq/2/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
LOW: [{ mixerMessage: '/ch/{channel}/eq/1/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
LO_MID: [{ mixerMessage: '/ch/{channel}/eq/2/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
MID: [{ mixerMessage: '/ch/{channel}/eq/3/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
HIGH: [{ mixerMessage: '/ch/{channel}/eq/4/g', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
AUX_LEVEL: [{mixerMessage: '/ch/{channel}/mix/{argument}/level', value: 0, type: 'f', min: 0, max: 1, zero: 0}],
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 @@ -23,6 +23,7 @@ export const ReaperMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down Expand Up @@ -53,6 +54,7 @@ export const ReaperMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -76,6 +78,7 @@ export const ReaperMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -92,6 +95,7 @@ export const ReaperMaster: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
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 @@ -23,6 +23,7 @@ export const YamahaQLCL: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand All @@ -39,6 +40,7 @@ export const YamahaQLCL: IMixerProtocol = {
THRESHOLD: [emptyMixerMessage()],
RATIO: [emptyMixerMessage()],
LOW: [emptyMixerMessage()],
LO_MID: [emptyMixerMessage()],
MID: [emptyMixerMessage()],
HIGH: [emptyMixerMessage()],
AUX_LEVEL: [emptyMixerMessage()],
Expand Down
1 change: 1 addition & 0 deletions server/reducers/faderActions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const SET_CHANNEL_LABEL = 'SET_CHANNEL_LABEL'
export const SET_FADER_THRESHOLD = 'SET_FADER_THRESHOLD'
export const SET_FADER_RATIO = 'SET_FADER_RATIO'
export const SET_FADER_LOW = 'SET_FADER_LOW'
export const SET_FADER_LO_MID = 'SET_FADER_LO_MID'
export const SET_FADER_MID = 'SET_FADER_MID'
export const SET_FADER_HIGH = 'SET_FADER_HIGH'
export const SET_FADER_MONITOR = 'SET_FADER_MONITOR'
Expand Down
Loading

0 comments on commit 59542a8

Please sign in to comment.