fix: CI build errors

olzzon · Dec 28, 2019 · d98475f · d98475f
1 parent 77d529a
commit d98475f
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 9 deletions.
diff --git a/server/MainApp.ts b/server/MainApp.ts
@@ -10,7 +10,6 @@ const path = require('path')
 export class MainApp {
     numberOfChannels: number[] = []
     settingsPath: string = ''
-    store: any
 
     constructor() {
         console.log('SETTINGS UP STATE')

diff --git a/server/utils/CasparCGConnection.ts b/server/utils/CasparCGConnection.ts
@@ -24,7 +24,6 @@ const OSC_PATH_PRODUCER_FILE_NAME = /\/channel\/(\d+)\/stage\/layer\/(\d+)\/file
 const OSC_PATH_PRODUCER_CHANNEL_LAYOUT = /\/channel\/(\d+)\/stage\/layer\/(\d+)\/producer\/channel_layout/
 
 export class CasparCGConnection {
-    store: IStore;
     mixerProtocol: ICasparCGMixerGeometry;
     connection: any;
     oscClient: any;

diff --git a/server/utils/EmberMixerConnection.ts b/server/utils/EmberMixerConnection.ts
@@ -11,7 +11,6 @@ import {
 
 
 export class EmberMixerConnection {
-    store: IStore;
     mixerProtocol: IMixerProtocol;
     emberConnection: any;
     deviceRoot: any;

diff --git a/server/utils/HuiMidiRemoteConnection.ts b/server/utils/HuiMidiRemoteConnection.ts
@@ -156,7 +156,7 @@ export class HuiMidiRemoteConnection {
         );
         this.midiOutput.sendControlChange(
             44,
-            1 + (64*state.faders[0].fader[channelIndex].pgmOn),
+            1 + (64*(state.faders[0].fader[channelIndex].pgmOn ? 1 : 0)),
             1
         );
 

diff --git a/server/utils/MidiMixerConnection.ts b/server/utils/MidiMixerConnection.ts
@@ -171,7 +171,7 @@ return true;
 
     updatePflState(channelIndex: number) {
 
-        if (state.channels[0].channel[channelIndex].pflOn = true) {
+        if (state.faders[0].fader[channelIndex].pflOn === true) {
             this.sendOutMessage(
                 this.mixerProtocol.channelTypes[0].toMixer.PFL_ON[0].mixerMessage,
                 channelIndex+1,

diff --git a/server/utils/MixerConnection.ts b/server/utils/MixerConnection.ts
@@ -115,7 +115,7 @@ export class MixerGenericConnection {
         if (state.faders[0].fader[faderIndex].pstOn) {
             level = state.faders[0].fader[faderIndex].faderLevel
         } else if (state.faders[0].fader[faderIndex].pstVoOn) {
-            level = state.faders[0].fader[faderIndex].faderLevel * (100-parseFloat(state.settings[0].voLevel))/100 
+            level = state.faders[0].fader[faderIndex].faderLevel * (100-state.settings[0].voLevel)/100 
         }
         state.channels[0].channel.map((channel: IChannel, channelIndex: number) => {
             if (faderIndex === channel.assignedFader) {
@@ -225,7 +225,7 @@ export class MixerGenericConnection {
         let targetVal = state.faders[0].fader[faderIndex].faderLevel;
 
         if (state.faders[0].fader[faderIndex].voOn) {
-            targetVal = targetVal * (100-parseFloat(state.settings[0].voLevel))/100 
+            targetVal = targetVal * (100-state.settings[0].voLevel)/100 
         }
         const step: number = (targetVal-outputLevel)/(fadeTime/FADE_INOUT_SPEED);
         const dispatchResolution: number = FADE_DISPATCH_RESOLUTION*step;

diff --git a/server/utils/QlClMixerConnection.ts b/server/utils/QlClMixerConnection.ts
@@ -16,7 +16,6 @@ import {
 
 
 export class QlClMixerConnection {
-    store: IStore;
     mixerProtocol: IMixerProtocol;
     cmdChannelIndex: number;
     scpConnection: any;

diff --git a/server/utils/SSLMixerConnection.ts b/server/utils/SSLMixerConnection.ts
@@ -15,7 +15,6 @@ import {
 import { SET_MIXER_ONLINE } from '../reducers/settingsActions';
 
 export class SSLMixerConnection {
-    store: IStore;
     mixerProtocol: IMixerProtocol;
     cmdChannelIndex: number;
     SSLConnection: any;
-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,7 @@ export class HuiMidiRemoteConnection { @@
             );
             this.midiOutput.sendControlChange(
 ,
-+ (64*state.faders[0].fader[channelIndex].pgmOn),
++ (64*(state.faders[0].fader[channelIndex].pgmOn ? 1 : 0)),
             );
@@ Expand Down @@