feat: ChannelTypes: Changed numberOfChannels to numberOfChannelsInTyp…

…e (current ussage is [0])
olzzon · Jun 27, 2019 · 114538d · 114538d
1 parent 995b99e
commit 114538d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -30,7 +30,7 @@ class App extends React.Component<IAppProps> {
         (window as any).automationConnection = new AutomationConnection();
         (window as any).huiRemoteConnection = new HuiMidiRemoteConnection();
         this.snapShopStoreTimer();
-        loadSnapshotState(this.props.store.channels[0], this.props.store.settings[0].numberOfChannels);
+        loadSnapshotState(this.props.store.channels[0], this.props.store.settings[0].numberOfChannelsInType[0]);
     }
 
     public shouldComponentUpdate(nextProps: IAppProps) {

diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
@@ -250,7 +250,7 @@ class Settings extends React.PureComponent<IAppProps & Store, IState> {
                 <br/>
                 <label className="settings-input-field">
                     NUMBER OF CHANNELS :
-                    <input name="numberOfChannels" type="text" value={this.state.settings.numberOfChannels} onChange={this.handleChange} />
+                    <input name="numberOfChannels" type="text" value={this.state.settings.numberOfChannelsInType[0]} onChange={this.handleChange} />
                 </label>
                 <br/>
                 <label className="settings-input-field">

diff --git a/src/reducers/settingsReducer.ts b/src/reducers/settingsReducer.ts
@@ -13,7 +13,7 @@ export interface ISettings {
     enableRemoteFader: boolean,
     remoteFaderMidiInputPort: string,
     remoteFaderMidiOutputPort: string,
-    numberOfChannels: number,
+    numberOfChannelsInType: Array<number>,
     numberOfSnaps: number,
     fadeTime: number
     showPfl: boolean
@@ -33,7 +33,7 @@ const defaultSettingsReducerState: Array<ISettings> = [
         enableRemoteFader: false,
         remoteFaderMidiInputPort: "",
         remoteFaderMidiOutputPort: "",
-        numberOfChannels: 8,
+        numberOfChannelsInType: [8],
         numberOfSnaps: DEFAULTS.NUMBER_OF_SNAPS,
         fadeTime: 100, //Time in ms
         showPfl: false

diff --git a/src/utils/EmberMixerConnection.ts b/src/utils/EmberMixerConnection.ts
@@ -53,7 +53,7 @@ export class EmberMixerConnection {
         let node: any;
         console.log("Ember Connected");
 
-        for (let ch=1; ch <= this.store.settings[0].numberOfChannels ; ch++) {
+        for (let ch=1; ch <= this.store.settings[0].numberOfChannelsInType[0] ; ch++) {
             this.emberConnection.getNodeByPath(this.mixerProtocol.channelTypes[0].fromMixer.CHANNEL_FADER_LEVEL.replace("{channel}", String(ch)))
             .then((node: any) => {
                 this.emberConnection.subscribe(node, (() => {

diff --git a/src/utils/productSpecific/behringer.ts b/src/utils/productSpecific/behringer.ts
@@ -9,7 +9,7 @@ export const behringerMeter = (message: any) => {
     let uint8bytes = Uint8Array.from(message[0]);
     let dataview = new DataView(uint8bytes.buffer);
 
-    for (let i=0; i < store.settings[0].numberOfChannels; i++) {
+    for (let i=0; i < store.settings[0].numberOfChannelsInType[0]; i++) {
         window.storeRedux.dispatch({
             type:'SET_VU_LEVEL',
             channel: i,

diff --git a/src/utils/productSpecific/midas.ts b/src/utils/productSpecific/midas.ts
@@ -8,7 +8,7 @@ export const midasMeter = (message: any) => {
     let dataview = new DataView(uint8bytes.buffer);
     //console.log(dataview);
     let vuMeters = [];
-    let numberOfChannels = store.settings[0].numberOfChannels;
+    let numberOfChannels = store.settings[0].numberOfChannelsInType[0];
 
     for (let i=0; i < numberOfChannels; i++) {
         vuMeters.push({vuVal : dataview.getFloat32(4*i+headerData , true)});