fix: moved channelTypes to IMixerProtocolGeneric as it´s need when in…

…itialising the App for total number of channels chore: Added empty channelTypes in CasparCG for now. fix: number of channels is based on totalNumber of channels in channelTypes
olzzon · Jun 27, 2019 · 33400f3 · 33400f3
1 parent b733529
commit 33400f3
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -11,6 +11,8 @@ import { loadSnapshotState, saveSnapshotState } from '../utils/SettingsStorage';
 import { MixerGenericConnection } from '../utils/MixerConnection';
 import { AutomationConnection } from '../utils/AutomationConnection';
 import { HuiMidiRemoteConnection } from '../utils/HuiMidiRemoteConnection';
+import { MixerProtocolPresets } from '../constants/MixerProtocolPresets';
+
 import { Store, AnyAction } from 'redux';
 import { ISettings } from '../reducers/settingsReducer';
 import { IChannels } from '../reducers/channelsReducer';
@@ -30,7 +32,12 @@ 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].numberOfChannelsInType[0]);
+        let totalNumberOfChannels = 0;
+        let selectedProtocol = MixerProtocolPresets[this.props.store.settings[0].mixerProtocol];
+        selectedProtocol.channelTypes.forEach((item, index) => {
+            totalNumberOfChannels =+ this.props.store.settings[0].numberOfChannelsInType[index];
+        });
+        loadSnapshotState(this.props.store.channels[0], totalNumberOfChannels);
     }
 
     public shouldComponentUpdate(nextProps: IAppProps) {

diff --git a/src/constants/MixerProtocolPresets.ts b/src/constants/MixerProtocolPresets.ts
@@ -22,15 +22,15 @@ export interface IMixerProtocolGeneric {
         max: number,
         zero: number,
         test: number,
-    }
+    },
+    channelTypes: Array<IChannelTypes>
 }
 
 export interface IMixerProtocol extends IMixerProtocolGeneric{
     leadingZeros: boolean,
     pingCommand: Array<IMixerMessageProtocol>,
     pingTime: number,
     initializeCommands: Array<IMixerMessageProtocol>,
-    channelTypes: Array<IChannelTypes>
 }
 
 export interface IChannelTypes {

diff --git a/src/constants/mixerProtocols/casparCGMaster.ts b/src/constants/mixerProtocols/casparCGMaster.ts
@@ -44,7 +44,37 @@ if (geometry) {
 			test: 0.6,
 		},
 		channelLabels: geometry.channelLabels,
-		sourceOptions: geometry.sourceOptions
+        sourceOptions: geometry.sourceOptions,
+        //CHANNELTYES ARE NOT IMPLEMENTED.
+        //THIS IS JUST TO AVOID ERRORS AS
+        //channelTypes are moved to IMixerProtocolGeneric
+        channelTypes: [{
+            channelTypeName: 'Channels',
+            channelTypeColor: '#2f2f2f',
+            fromMixer: {
+                CHANNEL_FADER_LEVEL: ['none'],
+                CHANNEL_OUT_GAIN: ['none'],
+                CHANNEL_VU: ['none'],
+                CHANNEL_NAME: 'none',
+                PFL: ['todo'],
+                AUX_SEND: ['none'],
+            },
+            toMixer: {
+                CHANNEL_FADER_LEVEL: ['none'],
+                CHANNEL_OUT_GAIN: ['none'],
+                PFL_ON: [{
+                    mixerMessage: "none",
+                    value: 1,
+                    type: "i"
+                }],
+                PFL_OFF: [{
+                    mixerMessage: "none",
+                    value: 0,
+                    type: "i"
+                }],
+                AUX_SEND: ['none'],
+            },
+        }]
 	}
 }