Added Meter support for GroupFaders

Disabled Groupfader metering on Midas (no documentation for DCA metering)
olzzon · May 9, 2019 · 441b545 · 441b545
1 parent 9cf9aa4
commit 441b545
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/components/GrpFader.js b/src/components/GrpFader.js
@@ -134,7 +134,7 @@ class GrpFader extends PureComponent {
             :
             <div className="grpFader-body">
                 {this.fader()}
-                <GrpVuMeter faderIndex = {this.faderIndex}/>
+                { this.mixerProtocol.fromMixer.GRP_VU != 'none' ? <GrpVuMeter faderIndex = {this.faderIndex}/> : ''}
                 <br/>
                 {this.pgmButton()}
                 <br/>

diff --git a/src/constants/MixerProtocolPresets.js b/src/constants/MixerProtocolPresets.js
@@ -24,7 +24,7 @@ export const MixerProtocolPresets = {
             CHANNEL_VU: '/track/{channel}/vu',
             CHANNEL_NAME: '/track/{channel}/name',
             GRP_OUT_GAIN: '/dca/{channel}/fader',
-            GRP_VU: '/meters/1',
+            GRP_VU: 'none',
             GRP_NAME: '/dca/{channel}/config/name',
         },
         toMixer: {
@@ -84,7 +84,7 @@ export const MixerProtocolPresets = {
             CHANNEL_VU: '/meters/1',
             CHANNEL_NAME: '/ch/{channel}/config/name',
             GRP_OUT_GAIN: '/dca/{channel}/fader',
-            GRP_VU: '/meters/5',
+            GRP_VU: 'none',
             GRP_NAME: '/dca/{channel}/config/name',
         },
         toMixer: {
@@ -143,7 +143,7 @@ export const MixerProtocolPresets = {
             CHANNEL_OUT_GAIN: '/ch/{channel}/mix/01/level',
             CHANNEL_VU: '/meters/1',
             CHANNEL_NAME: '/ch/{channel}/config/name',
-            GRP_VU: '/meters/5',
+            GRP_VU: 'none',
             GRP_NAME: '/dca/{channel}/config/name',
             GRP_OUT_GAIN: '/dca/{channel}/fader',
         },
@@ -183,11 +183,6 @@ export const MixerProtocolPresets = {
                 oscMessage: "/meters",
                 value: "/meters/1",
                 type: "s"
-            },
-            {
-                oscMessage: "/meters",
-                value: "/meters/5",
-                type: "s"
             }
         ],
         pingTime: 9500,
@@ -209,7 +204,7 @@ export const MixerProtocolPresets = {
             CHANNEL_VU: '/meters/1',
             CHANNEL_NAME: '/ch/{channel}/config/name',
             GRP_OUT_GAIN: '/dca/{channel}/fader',
-            GRP_VU: '/meters/5',
+            GRP_VU: 'none',
             GRP_NAME: '/dca/{channel}/config/name',
         },
         toMixer: {
@@ -279,7 +274,7 @@ export const MixerProtocolPresets = {
             CHANNEL_VU: '/meters/1',
             CHANNEL_NAME: '/ch/{channel}/config/name',
             GRP_OUT_GAIN: '/dca/{channel}/mix/01/level',
-            GRP_VU: '/meters/5',
+            GRP_VU: 'none',
             GRP_NAME: '/dca/{channel}/config/name',
         },
         toMixer: {