fix: PFL pass complete OSC command for turning on and of PFL

olzzon · May 30, 2019 · acb3108 · acb3108
1 parent 70e2437
commit acb3108
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 28 deletions.
diff --git a/src/constants/MixerProtocolPresets.ts b/src/constants/MixerProtocolPresets.ts
@@ -28,8 +28,8 @@ export interface IMixerProtocol {
         CHANNEL_FADER_LEVEL: string,
         CHANNEL_OUT_GAIN: string,
         GRP_OUT_GAIN: string,
-        PFL_ON: string,
-        PFL_OFF: string
+        PFL_ON: IMessageProtocol,
+        PFL_OFF: IMessageProtocol
     },
     fader: {
         min: number,

diff --git a/src/constants/protocols/ardourMaster.ts b/src/constants/protocols/ardourMaster.ts
@@ -35,8 +35,16 @@ export const ArdourMaster: IMixerProtocol = {
         CHANNEL_FADER_LEVEL: 'none',
         CHANNEL_OUT_GAIN: '/strip/fader/{channel}',
         GRP_OUT_GAIN: 'todo',
-        PFL_ON: 'todo',
-        PFL_OFF: 'todo'
+        PFL_ON: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        },
+        PFL_OFF: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        }
     },
     fader: {
         min: 0,

diff --git a/src/constants/protocols/behringerXrClient.ts b/src/constants/protocols/behringerXrClient.ts
@@ -45,8 +45,16 @@ export const BehringerXrClient: IMixerProtocol = {
         CHANNEL_FADER_LEVEL: '/ch/{channel}/mix/fader',
         CHANNEL_OUT_GAIN: '/ch/{channel}/mix/01/level',
         GRP_OUT_GAIN: '/dca/{channel}/fader',
-        PFL_ON: 'todo',
-        PFL_OFF: 'todo'
+        PFL_ON: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        },
+        PFL_OFF: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        }
     },
     fader: {
         min: 0,

diff --git a/src/constants/protocols/behringerXrMaster.ts b/src/constants/protocols/behringerXrMaster.ts
@@ -41,12 +41,20 @@ export const BehringerXrMaster: IMixerProtocol = {
         GRP_NAME: '/dca/{channel}/config/name',
         PFL: 'todo'
     },
-    toMixer: {
+    toMixer : {
         CHANNEL_FADER_LEVEL: 'none',
         CHANNEL_OUT_GAIN: '/ch/{channel}/mix/fader',
         GRP_OUT_GAIN: '/dca/{channel}/fader',
-        PFL_ON: 'todo',
-        PFL_OFF: 'todo'
+        PFL_ON: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        },
+        PFL_OFF: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        }
     },
     fader: {
         min: 0,
@@ -60,5 +68,5 @@ export const BehringerXrMaster: IMixerProtocol = {
         max: 1,
         zero: 0.75,
         test: 0.6,
-    },
+    }
 }
diff --git a/src/constants/protocols/genericMidi.ts b/src/constants/protocols/genericMidi.ts
@@ -35,8 +35,16 @@ export const GenericMidi: IMixerProtocol = {
         CHANNEL_FADER_LEVEL: "39",
         CHANNEL_OUT_GAIN: "38",
         GRP_OUT_GAIN: 'none',
-        PFL_ON: 'todo',
-        PFL_OFF: 'todo'
+        PFL_ON: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        },
+        PFL_OFF: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        }
     },
     fader: {
         min: 0,

diff --git a/src/constants/protocols/midasClient.ts b/src/constants/protocols/midasClient.ts
@@ -55,8 +55,16 @@ export const MidasClient: IMixerProtocol = {
         CHANNEL_FADER_LEVEL: '/ch/{channel}/mix/fader',
         CHANNEL_OUT_GAIN: '/ch/{channel}/mix/01/level',
         GRP_OUT_GAIN: '/dca/{channel}/mix/01/level',
-        PFL_ON: 'todo',
-        PFL_OFF: 'todo'
+        PFL_ON: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        },
+        PFL_OFF: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        }
     },
     fader: {
         min: 0,

diff --git a/src/constants/protocols/midasMaster.ts b/src/constants/protocols/midasMaster.ts
@@ -45,8 +45,16 @@ export const MidasMaster: IMixerProtocol = {
         CHANNEL_FADER_LEVEL: 'none',
         CHANNEL_OUT_GAIN: '/ch/{channel}/mix/fader',
         GRP_OUT_GAIN: '/dca/{channel}/fader',
-        PFL_ON: 'todo',
-        PFL_OFF: 'todo'
+        PFL_ON: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        },
+        PFL_OFF: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        }
     },
     fader: {
         min: 0,

diff --git a/src/constants/protocols/reaper.ts b/src/constants/protocols/reaper.ts
@@ -35,8 +35,16 @@ export const Reaper: IMixerProtocol = {
         CHANNEL_FADER_LEVEL: '/track/{channel}/volume',
         CHANNEL_OUT_GAIN: '/track/{channel}/fx/1/fxparam/1/value',
         GRP_OUT_GAIN: '/dca/{channel}/fader',
-        PFL_ON: 'todo',
-        PFL_OFF: 'todo'
+        PFL_ON: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        },
+        PFL_OFF: {
+            oscMessage: "/not_in_use",
+            value: 0,
+            type: "f"
+        }
     },
     fader: {
         min: 0,

diff --git a/src/utils/MidiMixerConnection.ts b/src/utils/MidiMixerConnection.ts
@@ -141,15 +141,15 @@ return true;
 
         if (this.store.channels[0].channel[channelIndex].pflOn = true) {
             this.sendOutMessage(
-                this.mixerProtocol.toMixer.PFL_ON,
+                this.mixerProtocol.toMixer.PFL_ON.oscMessage,
                 channelIndex+1,
-                this.store.channels[0].channel[channelIndex].outputLevel
+                this.mixerProtocol.toMixer.PFL_ON.value
             );
         } else {
             this.sendOutMessage(
-                this.mixerProtocol.toMixer.PFL_OFF,
+                this.mixerProtocol.toMixer.PFL_OFF.oscMessage,
                 channelIndex+1,
-                this.store.channels[0].channel[channelIndex].outputLevel
+                this.mixerProtocol.toMixer.PFL_OFF.value
             );
         }
     }

diff --git a/src/utils/OscMixerConnection.ts b/src/utils/OscMixerConnection.ts
@@ -270,17 +270,17 @@ export class OscMixerConnection {
     updatePflState(channelIndex: number) {
         if (this.store.channels[0].channel[channelIndex].pflOn = true) {
             this.sendOutMessage(
-                this.mixerProtocol.toMixer.PFL_ON,
+                this.mixerProtocol.toMixer.PFL_ON.oscMessage,
                 channelIndex+1,
-                this.store.channels[0].channel[channelIndex].pflOn,
-                "f"
+                this.mixerProtocol.toMixer.PFL_ON.value,
+                this.mixerProtocol.toMixer.PFL_ON.type
             );
         } else {
             this.sendOutMessage(
-                this.mixerProtocol.toMixer.PFL_OFF,
+                this.mixerProtocol.toMixer.PFL_OFF.oscMessage,
                 channelIndex+1,
-                this.store.channels[0].channel[channelIndex].pflOn,
-                "f"
+                this.mixerProtocol.toMixer.PFL_OFF.value,
+                this.mixerProtocol.toMixer.PFL_OFF.type
             );
         }
     }