Skip to content

Commit

Permalink
feat: full ch strip - list all eq feature (preparation for graphic Eq…
Browse files Browse the repository at this point in the history 
… GUI)
  • Loading branch information
olzzon authored and olzzon committed Oct 26, 2020
1 parent df1f538 commit 0f68a0d
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 81 deletions.
2 changes: 1 addition & 1 deletion client/assets/css/ChanStrip.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.chan-strip-body {
position: relative;
top: 5px;
min-width: 320px;
width: 500px;
height: 940px;
background-color: rgb(31, 31, 31);
border-color: rgb(70, 70, 70);
Expand Down
14 changes: 7 additions & 7 deletions client/assets/css/ChanStripFull.css
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
.chan-strip-full-body {
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 1200px;
top: 50px;
left: 150px;
width: 1700px;
height: 1000px;
overflow: auto;
max-height: 90vh;
background-color: rgb(31, 31, 31);
border-color: rgb(124, 124, 124);
background-color: rgb(36, 36, 36);
border-color: rgb(149, 149, 149);
border-style: solid;
border-width: 4px;
border-radius: 8px;
text-align: left;
z-index: 2;

Expand Down
62 changes: 10 additions & 52 deletions client/components/ChanStripFull.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
import CcgChannelInputSettings from './CcgChannelSettings'
import ReductionMeter from './ReductionMeter'
import ClassNames from 'classnames'
import { fxParamsList } from '../../server/constants/MixerProtocolInterface'
import { fxParamsList, IFxProtocol } from '../../server/constants/MixerProtocolInterface'

interface IChanStripFullInjectProps {
label: string
Expand Down Expand Up @@ -389,7 +389,7 @@ class ChanStripFull extends React.PureComponent<
)
}

eqGain(fxParam: fxParamsList) {
fxFader(fxParam: fxParamsList) {
let maxLabel: number =
window.mixerProtocol.channelTypes[0].fromMixer.FX_PARAMS?.[fxParam]
.params[0].maxLabel ?? 1
Expand Down Expand Up @@ -546,60 +546,18 @@ class ChanStripFull extends React.PureComponent<
<div className="eq-group">
{window.mixerProtocol
.channelTypes[0].toMixer
.FX_PARAMS?.[
fxParamsList.EqLowGain
] ? (
<React.Fragment>
{this.eqGain(
fxParamsList.EqLowGain
)}
<p className="zero-eq">
_______
</p>
</React.Fragment>
) : null}
{window.mixerProtocol
.channelTypes[0].toMixer
.FX_PARAMS?.[
fxParamsList.EqLowMidGain
] ? (
<React.Fragment>
{this.eqGain(
fxParamsList.EqLowMidGain
)}
<p className="zero-eq">
_______
</p>
</React.Fragment>
) : null}
{window.mixerProtocol
.channelTypes[0].toMixer
.FX_PARAMS?.[
fxParamsList.EqMidGain
] ? (
<React.Fragment>
{this.eqGain(
fxParamsList.EqMidGain
)}
<p className="zero-eq">
_______
</p>
</React.Fragment>
) : null}
{window.mixerProtocol
.channelTypes[0].toMixer
.FX_PARAMS?.[
fxParamsList.EqHighGain
] ? (
<React.Fragment>
{this.eqGain(
fxParamsList.EqHighGain
.FX_PARAMS?.map((param: IFxProtocol) => {

return (<React.Fragment>
{this.fxFader(
param.key
)}
<p className="zero-eq">
_______
</p>
</React.Fragment>
) : null}
</React.Fragment>)
})
}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion server/constants/MixerProtocolInterface.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ interface IMixerMessageProtocol {
zeroLabel?: number
}

interface IFxProtocol {
export interface IFxProtocol {
key: fxParamsList
params: Array<IMixerMessageProtocol>
}
Expand Down
40 changes: 20 additions & 20 deletions server/constants/mixerProtocols/midasMaster.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/1/f',
minLabel: -15,
maxLabel: 15,
label: 'Low',
minLabel: 20,
maxLabel: 20000,
label: 'Low Freq',
},
],
},
Expand All @@ -161,9 +161,9 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/2/f',
minLabel: -15,
maxLabel: 15,
label: 'LoMid',
minLabel: 20,
maxLabel: 20000,
label: 'LoMid freq',
},
],
},
Expand All @@ -172,9 +172,9 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/3/f',
minLabel: -15,
maxLabel: 15,
label: 'HiMid',
minLabel: 20,
maxLabel: 20000,
label: 'HiMid freq',
},
],
},
Expand All @@ -183,9 +183,9 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/4/f',
minLabel: -15,
maxLabel: 15,
label: 'High',
minLabel: 20,
maxLabel: 20000,
label: 'High freq',
},
],
},
Expand All @@ -194,8 +194,8 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/1/q',
minLabel: -15,
maxLabel: 15,
minLabel: 0.3,
maxLabel: 10,
label: 'Low Q',
},
],
Expand All @@ -205,8 +205,8 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/2/q',
minLabel: -15,
maxLabel: 15,
minLabel: 0.3,
maxLabel: 10,
label: 'LoMid Q',
},
],
Expand All @@ -216,8 +216,8 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/3/q',
minLabel: -15,
maxLabel: 15,
minLabel: 0.3,
maxLabel: 10,
label: 'HiMid Q',
},
],
Expand All @@ -227,8 +227,8 @@ export const MidasMaster: IMixerProtocol = {
params: [
{
mixerMessage: '/ch/{channel}/eq/4/q',
minLabel: -15,
maxLabel: 15,
minLabel: 0.3,
maxLabel: 10,
label: 'High Q',
},
],
Expand Down

0 comments on commit 0f68a0d

Please sign in to comment.