feat: multiple-mixers implementing restore full channel store

olzzon · Oct 6, 2020 · c2e524f · c2e524f
1 parent 6fdd8be
commit c2e524f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 24 deletions.
diff --git a/server/reducers/channelsReducer.ts b/server/reducers/channelsReducer.ts
@@ -28,7 +28,7 @@ export interface IChannel {
     }
 }
 
-const defaultChannelsReducerState = (numberOfTypeChannels: Array<number>) => {
+const defaultChannelsReducerState = (numberOfChannels: any) => {
     let defaultObj: Array<IChannels> = [
         {
             chConnection: [
@@ -39,25 +39,36 @@ const defaultChannelsReducerState = (numberOfTypeChannels: Array<number>) => {
         },
     ]
 
-    let totalNumberOfChannels = 0
-    numberOfTypeChannels.forEach((numberOfChannels, typeIndex) => {
-        for (let index = 0; index < numberOfChannels; index++) {
-            defaultObj[0].chConnection[0].channel[totalNumberOfChannels] = {
-                channelType: typeIndex,
-                channelTypeIndex: index,
-                assignedFader: totalNumberOfChannels,
-                fadeActive: false,
-                outputLevel: 0.0,
-                auxLevel: [],
+    for (
+        let mixerIndex = 0;
+        mixerIndex++;
+        mixerIndex < numberOfChannels.length
+    ) {
+        let totalNumberOfChannels = 0
+        numberOfChannels[mixerIndex].nuberOfTypeChannels.forEach(
+            (channelTypeSize: any, typeIndex: number) => {
+                for (let index = 0; index < channelTypeSize; index++) {
+                    defaultObj[0].chConnection[mixerIndex].channel[
+                        totalNumberOfChannels
+                    ] = {
+                        channelType: typeIndex,
+                        channelTypeIndex: index,
+                        assignedFader: totalNumberOfChannels,
+                        fadeActive: false,
+                        outputLevel: 0.0,
+                        auxLevel: [],
+                    }
+                    totalNumberOfChannels++
+                }
             }
-            totalNumberOfChannels++
-        }
-    })
+        )
+    }
+
     return defaultObj
 }
 
 export const channels = (
-    state = defaultChannelsReducerState([1]),
+    state = defaultChannelsReducerState([{ numberOfTypeChannels: 1 }]),
     action: any
 ): Array<IChannels> => {
     let nextState = [

diff --git a/server/utils/SettingsStorage.ts b/server/utils/SettingsStorage.ts
@@ -41,7 +41,7 @@ export const saveSettings = (settings: any) => {
 export const loadSnapshotState = (
     stateSnapshot: any,
     stateChannelSnapshot: any,
-    numberOfChannels: Array<number>,
+    numberOfChannels: Array<any>,
     numberOfFaders: number,
     fileName: string,
     loadAll: boolean

diff --git a/server/utils/SnapshotHandler.ts b/server/utils/SnapshotHandler.ts
@@ -6,7 +6,7 @@ import { logger } from './logger'
 
 const path = require('path')
 export class SnapshotHandler {
-    numberOfChannels: number[] = []
+    numberOfChannels: any[] = [{ numberOfChannelInTypes: [] }]
     settingsPath: string = ''
 
     constructor() {
@@ -15,13 +15,15 @@ export class SnapshotHandler {
         this.snapShopStoreTimer()
 
         // Count total number of channels:
-        mixerProtocolPresets[
-            state.settings[0].mixers[0].mixerProtocol
-        ].channelTypes.forEach((item: any, index: number) => {
-            this.numberOfChannels.push(
-                state.settings[0].mixers[0].numberOfChannelsInType[index]
-            )
-        })
+        for (let i = 0; i++; i < state.settings[0].numberOfMixers) {
+            mixerProtocolPresets[
+                state.settings[0].mixers[i].mixerProtocol
+            ].channelTypes.forEach((item: any, index: number) => {
+                this.numberOfChannels[i].numberOfChannelInTypes.push(
+                    state.settings[0].mixers[0].numberOfChannelsInType[index]
+                )
+            })
+        }
         this.loadSnapshotSettings(path.resolve('storage', 'default.shot'), true)
 
         // ** UNCOMMENT TO DUMP A FULL STORE: