fix: OSC protocol - All faders follows when changed on mixer

olzzon · Sep 3, 2019 · b5d9515 · b5d9515
1 parent 0fd1bd5
commit b5d9515
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/utils/OscMixerConnection.ts b/src/utils/OscMixerConnection.ts
@@ -76,11 +76,18 @@ export class OscMixerConnection {
                     level: message.args[0]
                 });
 
+
                 if (this.store.faders[0].fader[assignedFader - 1].pgmOn)
                 {
                     this.store.channels[0].channel.map((channel: any, index: number) => {
-                        if (channel.assignedFader === assignedFader - 1)
-                        this.updateOutLevel(index);
+                        if (channel.assignedFader === assignedFader - 1) {
+                            window.storeRedux.dispatch({
+                                type:'SET_OUTPUT_LEVEL',
+                                channel: index,
+                                level: message.args[0]
+                            });
+                            this.updateFadeIOLevel(index, this.store.faders[0].fader[assignedFader - 1].faderLevel);
+                        }
                     })
                 }
 
@@ -218,11 +225,10 @@ export class OscMixerConnection {
     updateOutLevel(channelIndex: number) {
         let channelType = this.store.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = this.store.channels[0].channel[channelIndex].channelTypeIndex;
-        let faderIndex = this.store.channels[0].channel[channelIndex].assignedFader;
         this.sendOutMessage(
             this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_OUT_GAIN[0].mixerMessage,
             channelTypeIndex+1,
-            this.store.faders[0].fader[faderIndex].faderLevel,
+            this.store.channels[0].channel[channelIndex].outputLevel,
             "f"
         );
     }