feat: fader -> channel routing. implementing faders reducer in channe…

…l component
olzzon · Aug 19, 2019 · 85a1705 · 85a1705
1 parent 93af7b1
commit 85a1705
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/components/Channel.tsx b/src/components/Channel.tsx
@@ -268,15 +268,15 @@ class Channel extends React.Component<IChannelProps & IChannelInjectProps & Stor
 
 const mapStateToProps = (state: any, props: any): IChannelInjectProps => {
     return {
-        pgmOn: state.channels[0].channel[props.channelIndex].pgmOn,
-        pstOn: state.channels[0].channel[props.channelIndex].pstOn,
-        pflOn: state.channels[0].channel[props.channelIndex].pflOn,
-        showChannel: state.channels[0].channel[props.channelIndex].showChannel,
-        faderLevel: state.channels[0].channel[props.channelIndex].faderLevel,
+        pgmOn: state.faders[0].fader[props.channelIndex].pgmOn,
+        pstOn: state.faders[0].fader[props.channelIndex].pstOn,
+        pflOn: state.faders[0].fader[props.channelIndex].pflOn,
+        showChannel: state.faders[0].fader[props.channelIndex].showChannel,
+        faderLevel: state.faders[0].fader[props.channelIndex].faderLevel,
         channelType: state.channels[0].channel[props.channelIndex].channelType,
         channelTypeIndex: state.channels[0].channel[props.channelIndex].channelTypeIndex,
-        label: state.channels[0].channel[props.channelIndex].label,
-        snapOn: state.channels[0].channel[props.channelIndex].snapOn.map((item: number) => {return item}),
+        label: state.faders[0].fader[props.channelIndex].label,
+        snapOn: state.faders[0].fader[props.channelIndex].snapOn.map((item: number) => {return item}),
         mixerProtocol: state.settings[0].mixerProtocol,
         showSnaps: state.settings[0].showSnaps,
         showPfl: state.settings[0].showPfl

diff --git a/src/reducers/fadersReducer.ts b/src/reducers/fadersReducer.ts
@@ -41,13 +41,13 @@ const defaultFadersReducerState = (numberOfTypeChannels: Array<number>) => {
                 vuVal: 0.0
             });
             for (let y=0; y < DEFAULTS.NUMBER_OF_SNAPS; y++) {
-                defaultObj[0].fader[totalNumberOfFaders].snapOn.push(false);
+                defaultObj[0].fader[index].snapOn.push(false);
             }
         }
     return defaultObj;
 };
 
-export const channels = ((state = defaultFadersReducerState([1]), action: any): Array<IFaders> => {
+export const faders = ((state = defaultFadersReducerState([1]), action: any): Array<IFaders> => {
 
     let nextState = [{
         vuMeters: [...state[0].vuMeters],

diff --git a/src/reducers/indexReducer.ts b/src/reducers/indexReducer.ts
@@ -1,14 +1,17 @@
 import { combineReducers } from 'redux';
 import { IChannels, channels} from './channelsReducer';
 import { ISettings, settings } from './settingsReducer';
+import {  IFaders, faders,  } from './fadersReducer';
 
 export interface IStore {
     settings: Array<ISettings>,
-    channels: Array<IChannels>
+    channels: Array<IChannels>,
+    faders: Array<IFaders>
 };
 
 const indexReducer = combineReducers({
     channels,
+    faders,
     settings
 });