feat: Midas - GUI Ratio on compressor is now from a list of values

nrkno · Nov 9, 2021 · cb48a27 · cb48a27
1 parent 9a1d691
commit cb48a27
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 941 deletions.
diff --git a/client/components/ChanStrip.tsx b/client/components/ChanStrip.tsx
@@ -256,11 +256,20 @@ class ChanStrip extends React.PureComponent<
                     }
                     renderThumb={(props: any, state: any) => (
                         <div {...props}>
-                            {Math.round(
-                                (maxLabel - minLabel) *
-                                    parseFloat(state.valueNow) +
-                                    minLabel
-                            )}
+                            {!window.mixerProtocol.channelTypes[0].fromMixer[
+                                fxParam
+                            ]?.[0].valueAsLabels
+                                ? Math.round(
+                                      (maxLabel - minLabel) *
+                                          parseFloat(state.valueNow) +
+                                          minLabel
+                                  )
+                                : window.mixerProtocol.channelTypes[0]
+                                      .fromMixer[fxParam]?.[0].valueAsLabels[
+                                      Math.round(
+                                          parseFloat(state.valueNow) * 10
+                                      )
+                                  ]}
                             {valueLabel}
                         </div>
                     )}
@@ -356,7 +365,7 @@ class ChanStrip extends React.PureComponent<
                                 </div>
                             </React.Fragment>
                         )}
-                                                {hasGainTrim && (
+                        {hasGainTrim && (
                             <React.Fragment>
                                 <div className="item">
                                     <div className="title">INPUT</div>

diff --git a/client/components/ChanStripFull.tsx b/client/components/ChanStripFull.tsx
@@ -613,11 +613,20 @@ class ChanStripFull extends React.PureComponent<
                     }
                     renderThumb={(props: any, state: any) => (
                         <div {...props}>
-                            {Math.round(
-                                (maxLabel - minLabel) *
-                                    parseFloat(state.valueNow) +
-                                    minLabel
-                            )}
+                            {!window.mixerProtocol.channelTypes[0].fromMixer[
+                                fxParam
+                            ]?.[0].valueAsLabels
+                                ? Math.round(
+                                      (maxLabel - minLabel) *
+                                          parseFloat(state.valueNow) +
+                                          minLabel
+                                  )
+                                : window.mixerProtocol.channelTypes[0]
+                                      .fromMixer[fxParam]?.[0].valueAsLabels[
+                                      Math.round(
+                                          parseFloat(state.valueNow) * 10
+                                      )
+                                  ]}
                             {valueLabel}
                         </div>
                     )}
@@ -793,19 +802,15 @@ class ChanStripFull extends React.PureComponent<
                         >
                             X
                         </button>
-                        {window.location.search.includes(
-                            'settings=1'
-                        ) ? (
+                        {window.location.search.includes('settings=1') ? (
                             <button
                                 className="button half"
                                 onClick={() => this.handleShowRoutingOptions()}
                             >
                                 Channel-Fader Routing
                             </button>
                         ) : null}
-                        {window.location.search.includes(
-                            'settings=1'
-                        ) ?  (
+                        {window.location.search.includes('settings=1') ? (
                             <button
                                 className="button half"
                                 onClick={() => this.handleShowMonitorOptions()}

diff --git a/server/constants/MixerProtocolInterface.ts b/server/constants/MixerProtocolInterface.ts
@@ -102,6 +102,7 @@ interface IMixerMessageProtocol {
     max?: number
     zero?: number
     label?: string
+    valueAsLabels?: Array<string>
     valueLabel?: string
     minLabel?: number
     maxLabel?: number

diff --git a/server/constants/mixerProtocols/midasMaster.ts b/server/constants/mixerProtocols/midasMaster.ts
@@ -150,6 +150,19 @@ export const MidasMaster: IMixerProtocol = {
                         minLabel: 1,
                         maxLabel: 10,
                         label: 'Ratio',
+                        valueAsLabels: [
+                            '1.1',
+                            '1.5',
+                            '2.0',
+                            '2.5',
+                            '3.0',
+                            '4.0',
+                            '5.0',
+                            '7.0',
+                            '10',
+                            '20',
+                            '100',
+                        ],
                         valueLabel: ' :1',
                     },
                 ],