Fix: Fadi In/out when "master" mode didn´t turn down when PGM was on.

olzzon · Apr 14, 2019 · 2313f0d · 2313f0d
1 parent 069b4b0
commit 2313f0d
Showing 1 changed file with 29 additions and 17 deletions.
diff --git a/src/utils/MixerConnection.js b/src/utils/MixerConnection.js
@@ -42,25 +42,37 @@ export class MixerConnection {
                 targetVal = parseFloat(this.store.channels[0].channel[channelIndex].faderLevel);
             }
 
-            let fadeDirection = 1;
             if (targetVal<outputLevel) {
-                fadeDirection = -1;
+                let timer = setInterval(() => {
+                    outputLevel = outputLevel - 3*this.mixerProtocol.fader.step;
+                    if ( outputLevel <= targetVal){
+                        outputLevel = targetVal;
+                        clearInterval(timer);
+                        return true;
+                    }
+                    window.storeRedux.dispatch({
+                        type:'SET_OUTPUT_LEVEL',
+                        channel: channelIndex,
+                        level: outputLevel
+                    });
+                    this.mixerConnection.updateOutLevel(channelIndex);
+                }, 1);
+            } else {
+                let timer = setInterval(() => {
+                    outputLevel = outputLevel + 3*this.mixerProtocol.fader.step;
+                    if ( outputLevel >= targetVal){
+                        outputLevel = targetVal;
+                        clearInterval(timer);
+                        return true;
+                    }
+                    window.storeRedux.dispatch({
+                        type:'SET_OUTPUT_LEVEL',
+                        channel: channelIndex,
+                        level: outputLevel
+                    });
+                    this.mixerConnection.updateOutLevel(channelIndex);
+                }, 1);
             }
-
-            let timer = setInterval(() => {
-                outputLevel = outputLevel + fadeDirection*3*this.mixerProtocol.fader.step;
-                if ( outputLevel >= targetVal){
-                    outputLevel = targetVal;
-                    clearInterval(timer);
-                    return true;
-                }
-                window.storeRedux.dispatch({
-                    type:'SET_OUTPUT_LEVEL',
-                    channel: channelIndex,
-                    level: outputLevel
-                });
-                this.mixerConnection.updateOutLevel(channelIndex);
-            }, 1);
         } else {
             let outputLevel = this.store.channels[0].channel[channelIndex].outputLevel;
             let timer = setInterval(() => {