fix: Midas/X32 - Q-param in Eq was reverted and non exponential

olzzon · Feb 24, 2021 · 41e3809 · 41e3809
1 parent 18ac6c0
commit 41e3809
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 20 deletions.
diff --git a/client/components/ChanStripFull.tsx b/client/components/ChanStripFull.tsx
@@ -21,7 +21,6 @@ import ReductionMeter from './ReductionMeter'
 import ClassNames from 'classnames'
 import { fxParamsList } from '../../server/constants/MixerProtocolInterface'
 import { IChannel } from '../../server/reducers/channelsReducer'
-import { storeFaderFx } from '../../server/reducers/faderActions'
 
 interface IChanStripFullInjectProps {
     label: string
@@ -527,12 +526,18 @@ class ChanStripFull extends React.PureComponent<
             <div className="parameter-text">
                 <div className="parameter-mini-text">
                     {Math.round(
-                        (maxLabel - minLabel) *
-                            this.props.fader[this.props.faderIndex][
-                                fxParam
-                            ]?.[0] +
-                            minLabel
-                    )}
+                        ((maxLabel - minLabel) *
+                            (1 -
+                                Math.pow(
+                                    1 -
+                                        this.props.fader[this.props.faderIndex][
+                                            fxParam
+                                        ]?.[0],
+                                    3
+                                )) +
+                            minLabel) *
+                            10
+                    ) / 10}
                     {valueLabel}
                 </div>
                 <ReactSlider
@@ -541,17 +546,23 @@ class ChanStripFull extends React.PureComponent<
                     orientation="horisontal"
                     min={0}
                     max={1}
+                    invert="true"
                     step={0.01}
                     value={
                         this.props.fader[this.props.faderIndex][fxParam]?.[0]
                     }
                     renderThumb={(props: any, state: any) => (
                         <div {...props}>
                             {Math.round(
-                                (maxLabel - minLabel) *
-                                    parseFloat(state.valueNow) +
-                                    minLabel
-                            )}
+                                ((maxLabel - minLabel) *
+                                    (1 -
+                                        Math.pow(
+                                            1 - parseFloat(state.valueNow),
+                                            3
+                                        )) +
+                                    minLabel) *
+                                    10
+                            ) / 10}
                             {valueLabel}
                         </div>
                     )}
@@ -590,7 +601,6 @@ class ChanStripFull extends React.PureComponent<
                     className="chan-strip-full-fader"
                     thumbClassName="chan-strip-full-thumb"
                     orientation="vertical"
-                    invert
                     min={0}
                     max={1}
                     step={0.01}

diff --git a/server/constants/mixerProtocols/midasMaster.ts b/server/constants/mixerProtocols/midasMaster.ts
@@ -289,35 +289,35 @@ export const MidasMaster: IMixerProtocol = {
                 [fxParamsList.EqQ01]: [
                     {
                         mixerMessage: '/ch/{channel}/eq/1/q',
-                        minLabel: 0.3,
-                        maxLabel: 10,
+                        minLabel: 10,
+                        maxLabel: 0.3,
                         label: 'Low Q',
                         valueLabel: ' Q',
                     },
                 ],
                 [fxParamsList.EqQ02]: [
                     {
                         mixerMessage: '/ch/{channel}/eq/2/q',
-                        minLabel: 0.3,
-                        maxLabel: 10,
+                        minLabel: 10,
+                        maxLabel: 0.3,
                         label: 'LoMid Q',
                         valueLabel: ' Q',
                     },
                 ],
                 [fxParamsList.EqQ03]: [
                     {
                         mixerMessage: '/ch/{channel}/eq/3/q',
-                        minLabel: 0.3,
-                        maxLabel: 10,
+                        minLabel: 10,
+                        maxLabel: 0.3,
                         label: 'HiMid Q',
                         valueLabel: ' Q',
                     },
                 ],
                 [fxParamsList.EqQ04]: [
                     {
                         mixerMessage: '/ch/{channel}/eq/4/q',
-                        minLabel: 0.3,
-                        maxLabel: 10,
+                        minLabel: 10,
+                        maxLabel: 0.3,
                         label: 'High Q',
                         valueLabel: ' Q',
                     },