feat: added protocol latency in settings. So setting "fadeActive" to …

…false waits until last response from protocol.
olzzon · Aug 20, 2019 · 6d949ed · 6d949ed
1 parent 12f89b0
commit 6d949ed
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
@@ -349,6 +349,12 @@ class Settings extends React.PureComponent<IAppProps & Store, IState> {
                     <input name="devicePort" type="text" value={this.state.settings.devicePort} onChange={this.handleChange} />
                 </label>
                 <br/>
+                <label className="settings-input-field">
+                    PROTOCOL LATENCY :
+                    <input name="protocolLatency" type="text" value={this.state.settings.protocolLatency} onChange={this.handleChange} />
+                </label>
+                <br/>
+                <br/>
                 <label className="settings-input-field">
                     SHOW PFL CONTROLS:
                     <input

diff --git a/src/reducers/settingsReducer.ts b/src/reducers/settingsReducer.ts
@@ -10,6 +10,7 @@ export interface ISettings {
     localOscPort: number,
     deviceIp: string,
     devicePort: number,
+    protocolLatency: number,
     enableRemoteFader: boolean,
     mixerMidiInputPort: string,
     mixerMidiOutputPort: string,
@@ -32,6 +33,7 @@ const defaultSettingsReducerState: Array<ISettings> = [
         localOscPort: 1234,
         deviceIp: "0.0.0.0",
         devicePort: 10024,
+        protocolLatency: 20,
         enableRemoteFader: false,
         mixerMidiInputPort: "",
         mixerMidiOutputPort: "",

diff --git a/src/utils/MixerConnection.ts b/src/utils/MixerConnection.ts
@@ -78,6 +78,17 @@ export class MixerGenericConnection {
         }
     }
 
+    delayedFadeActiveDisable (channelIndex: number) {
+        let delayedTimer = setTimeout( ()=>{
+            window.storeRedux.dispatch({
+                type:'FADE_ACTIVE',
+                channel: channelIndex,
+                active: false
+            })
+        },
+        this.store.settings[0].protocolLatency)
+    }
+
     fadeInOut (channelIndex: number, fadeTime: number){
         //Clear Old timer or set Fade to active:
         if (this.store.channels[0].channel[channelIndex].fadeActive) {
@@ -132,11 +143,7 @@ export class MixerGenericConnection {
                         channel: channelIndex,
                         level: outputLevel
                     });
-                    window.storeRedux.dispatch({
-                        type:'FADE_ACTIVE',
-                        channel: channelIndex,
-                        active: false
-                    });
+                    this.delayedFadeActiveDisable(channelIndex);
                     return true;
                 }
             }, FADE_INOUT_SPEED);
@@ -165,11 +172,7 @@ export class MixerGenericConnection {
                         channel: channelIndex,
                         level: outputLevel
                     });
-                    window.storeRedux.dispatch({
-                        type:'FADE_ACTIVE',
-                        channel: channelIndex,
-                        active: false
-                    });
+                    this.delayedFadeActiveDisable(channelIndex);
                     return true;
                 }
 
@@ -207,11 +210,7 @@ export class MixerGenericConnection {
                     channel: channelIndex,
                     level: outputLevel
                 });
-                window.storeRedux.dispatch({
-                    type:'FADE_ACTIVE',
-                    channel: channelIndex,
-                    active: false
-                });
+                this.delayedFadeActiveDisable(channelIndex);
                 return true;
             }
 

diff --git a/src/utils/OscMixerConnection.ts b/src/utils/OscMixerConnection.ts
@@ -224,7 +224,7 @@ export class OscMixerConnection {
     updatePflState(channelIndex: number) {
         let channelType = this.store.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = this.store.channels[0].channel[channelIndex].channelTypeIndex;
-        if (this.store.channels[0].channel[channelIndex].pflOn === true) {
+        if (this.store.faders[0].fader[channelIndex].pflOn === true) {
             this.sendOutMessage(
                 this.mixerProtocol.channelTypes[channelType].toMixer.PFL_ON[0].mixerMessage,
                 channelTypeIndex+1,
@@ -255,7 +255,7 @@ export class OscMixerConnection {
     updateChannelName(channelIndex: number) {
         let channelType = this.store.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = this.store.channels[0].channel[channelIndex].channelTypeIndex;
-        let channelName = this.store.channels[0].channel[channelIndex].label;
+        let channelName = this.store.faders[0].fader[channelIndex].label;
         this.sendOutMessage(
             this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_NAME[0].mixerMessage,
             channelTypeIndex+1,