feat: multiple mixers - Aux working for first mixer.

olzzon · Oct 9, 2020 · 37c0ab8 · 37c0ab8
1 parent 32a4abb
commit 37c0ab8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/server/MainThreadHandler.ts b/server/MainThreadHandler.ts
@@ -259,6 +259,7 @@ export class MainThreadHandlers {
                 )
                 store.dispatch(
                     storeSetAuxLevel(
+                        0,
                         payload.channel,
                         payload.auxIndex,
                         payload.level

diff --git a/server/reducers/channelActions.ts b/server/reducers/channelActions.ts
@@ -22,12 +22,14 @@ export const storeSetOutputLevel = (
 }
 
 export const storeSetAuxLevel = (
+    mixerIndex: number,
     channel: number,
     auxIndex: number,
     level: number
 ) => {
     return {
         type: SET_AUX_LEVEL,
+        mixerIndex: mixerIndex,
         channel: channel,
         auxIndex: auxIndex,
         level: level,

diff --git a/server/reducers/channelsReducer.ts b/server/reducers/channelsReducer.ts
@@ -126,9 +126,9 @@ export const channels = (
             ].assignedFader = action.faderNumber
             return nextState
         case SET_AUX_LEVEL:
-            nextState[0].chConnection[0].channel[action.channel].auxLevel[
-                action.auxIndex
-            ] = parseFloat(action.level)
+            nextState[0].chConnection[action.mixerIndex].channel[
+                action.channel
+            ].auxLevel[action.auxIndex] = parseFloat(action.level)
             return nextState
         case SET_PRIVATE:
             if (!nextState[0].chConnection[0].channel[action.channel].private) {

diff --git a/server/utils/mixerConnections/OscMixerConnection.ts b/server/utils/mixerConnections/OscMixerConnection.ts
@@ -293,7 +293,12 @@ export class OscMixerConnection {
                                 message.args[0]
                         )
                         store.dispatch(
-                            storeSetAuxLevel(ch - 1, auxIndex, message.args[0])
+                            storeSetAuxLevel(
+                                this.mixerIndex,
+                                ch - 1,
+                                auxIndex,
+                                message.args[0]
+                            )
                         )
                         global.mainThreadHandler.updateFullClientStore()
                         if (remoteConnections) {

diff --git a/server/utils/mixerConnections/StuderVistaMixerConnection.ts b/server/utils/mixerConnections/StuderVistaMixerConnection.ts
@@ -255,7 +255,14 @@ export class StuderVistaMixerConnection {
             channelTypeIndex
         )
 
-        store.dispatch(storeSetAuxLevel(channelArrayIndex, auxIndex, value))
+        store.dispatch(
+            storeSetAuxLevel(
+                this.mixerIndex,
+                channelArrayIndex,
+                auxIndex,
+                value
+            )
+        )
 
         global.mainThreadHandler.updateFullClientStore()
         remoteConnections.updateRemoteAuxPanels()

diff --git a/server/utils/remoteConnections/SkaarhojRemoteConnection.ts b/server/utils/remoteConnections/SkaarhojRemoteConnection.ts
@@ -195,7 +195,7 @@ export class SkaarhojRemoteConnection {
                 ' Level : ' +
                 level
         )
-        store.dispatch(storeSetAuxLevel(chIndex, auxSendIndex, level))
+        store.dispatch(storeSetAuxLevel(0, chIndex, auxSendIndex, level))
         mixerGenericConnection.updateAuxLevel(chIndex, auxSendIndex + 1)
         global.mainThreadHandler.updateFullClientStore()
         this.updateRemoteAuxPanel(panelNumber)