feat: multiple mixers - move local Ip and port to "mixers" so multipl…

…e OSC protocols can be supported
olzzon · Oct 12, 2020 · b071cca · b071cca
1 parent 858acf1
commit b071cca
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 39 deletions.
diff --git a/client/components/Settings.tsx b/client/components/Settings.tsx
@@ -121,7 +121,7 @@ class Settings extends React.PureComponent<IAppProps & Store, IState> {
         settings.mixers = []
         for (let i = 0; i < settings.numberOfMixers; i++) {
             if (settings.mixers[i] === undefined) {
-                settings.mixers.push( JSON.parse(JSON.stringify(mixers[0])))
+                settings.mixers.push(JSON.parse(JSON.stringify(mixers[0])))
             } else {
                 settings.mixers.push(mixers[i])
             }
@@ -338,6 +338,36 @@ class Settings extends React.PureComponent<IAppProps & Store, IState> {
                                     />
                                 </label>
                                 <br />
+                                <label className="settings-input-field">
+                                    LOCAL MIXER IP:
+                                    <input
+                                        name="localIp"
+                                        type="text"
+                                        value={mixer.localIp}
+                                        onChange={(event) =>
+                                            this.handleMixerChange(
+                                                event,
+                                                mixerIndex
+                                            )
+                                        }
+                                    />
+                                </label>
+                                <br />
+                                <label className="settings-input-field">
+                                    LOCAL MIXER PORT :
+                                    <input
+                                        name="localOscPort"
+                                        type="text"
+                                        value={mixer.localOscPort}
+                                        onChange={(event) =>
+                                            this.handleMixerChange(
+                                                event,
+                                                mixerIndex
+                                            )
+                                        }
+                                    />
+                                </label>
+                                <br />
                                 <label className="settings-input-field">
                                     PROTOCOL LATENCY :
                                     <input
@@ -401,27 +431,6 @@ class Settings extends React.PureComponent<IAppProps & Store, IState> {
         return (
             <div className="settings-body">
                 <div className="settings-header">GENERIC SETTINGS:</div>
-
-                <label className="settings-input-field">
-                    LOCAL MIXER IP:
-                    <input
-                        name="localIp"
-                        type="text"
-                        value={this.state.settings.localIp}
-                        onChange={this.handleChange}
-                    />
-                </label>
-                <br />
-                <label className="settings-input-field">
-                    LOCAL MIXER PORT :
-                    <input
-                        name="localOscPort"
-                        type="text"
-                        value={this.state.settings.localOscPort}
-                        onChange={this.handleChange}
-                    />
-                </label>
-                <br />
                 <label className="settings-input-field">
                     FADE TIME :
                     <input

diff --git a/server/__tests__/__mocks__/parsedEmptyStore.json b/server/__tests__/__mocks__/parsedEmptyStore.json
@@ -43,11 +43,11 @@
                     "numberOfChannelsInType": [8],
                     "numberOfAux": 0,
                     "nextSendAux": -1,
-                    "mixerOnline": false
+                    "mixerOnline": false,
+                    "localIp": "0.0.0.0",
+                    "localOscPort": 1234
                 }
             ],
-            "localIp": "0.0.0.0",
-            "localOscPort": 1234,
             "enableRemoteFader": false,
             "remoteFaderMidiInputPort": "",
             "remoteFaderMidiOutputPort": "",

diff --git a/server/__tests__/__mocks__/parsedFullStore.json b/server/__tests__/__mocks__/parsedFullStore.json
@@ -962,8 +962,6 @@
             "showMonitorOptions": -1,
             "showStorage": false,
             "mixerProtocol": "genericMidi",
-            "localIp": "0.0.0.0",
-            "localOscPort": 1234,
             "numberOfMixers": 1,
             "mixers": [
                 {
@@ -976,7 +974,9 @@
                     "numberOfChannelsInType": [8],
                     "numberOfAux": 0,
                     "nextSendAux": -1,
-                    "mixerOnline": false
+                    "mixerOnline": false,
+                    "localIp": "0.0.0.0",
+                    "localOscPort": 1234
                 }
             ],
             "enableRemoteFader": false,

diff --git a/server/__tests__/__mocks__/parsedSimpleStore.json b/server/__tests__/__mocks__/parsedSimpleStore.json
@@ -65,8 +65,6 @@
             "showMonitorOptions": -1,
             "showStorage": false,
             "mixerProtocol": "genericMidi",
-            "localIp": "0.0.0.0",
-            "localOscPort": 1234,
             "numberOfMixers": 1,
             "mixers": [
                 {
@@ -79,7 +77,9 @@
                     "numberOfChannelsInType": [8],
                     "numberOfAux": 0,
                     "nextSendAux": -1,
-                    "mixerOnline": false
+                    "mixerOnline": false,
+                    "localIp": "0.0.0.0",
+                    "localOscPort": 1234
                 }
             ],
             "enableRemoteFader": false,

diff --git a/server/reducers/settingsReducer.ts b/server/reducers/settingsReducer.ts
@@ -41,8 +41,6 @@ export interface ISettings {
     /** User config */
     numberOfMixers: number
     mixers: IMixerSettings[]
-    localIp: string
-    localOscPort: number
     enableRemoteFader: boolean
     remoteFaderMidiInputPort: string
     remoteFaderMidiOutputPort: string
@@ -74,6 +72,8 @@ export interface IMixerSettings {
     numberOfAux: number
     nextSendAux: number
     mixerOnline: boolean
+    localIp: string
+    localOscPort: number
 }
 
 const defaultSettingsReducerState: Array<ISettings> = [
@@ -98,11 +98,10 @@ const defaultSettingsReducerState: Array<ISettings> = [
                 nextSendAux: -1,
                 numberOfChannelsInType: [8],
                 mixerOnline: false,
+                localIp: '0.0.0.0',
+                localOscPort: 1234,
             },
         ],
-
-        localIp: '0.0.0.0',
-        localOscPort: 1234,
         enableRemoteFader: false,
         remoteFaderMidiInputPort: '',
         remoteFaderMidiOutputPort: '',

diff --git a/server/utils/mixerConnections/CasparCGConnection.ts b/server/utils/mixerConnections/CasparCGConnection.ts
@@ -104,7 +104,7 @@ export class CasparCGConnection {
                     state.settings[0].mixers[this.mixerIndex].devicePort + ''
                 ) + 1000
             this.oscClient = new osc.UDPPort({
-                localAddress: state.settings[0].localIp,
+                localAddress: state.settings[0].mixers[this.mixerIndex].localIp,
                 localPort: remotePort,
                 remoteAddress:
                     state.settings[0].mixers[this.mixerIndex].deviceIp,

diff --git a/server/utils/mixerConnections/OscMixerConnection.ts b/server/utils/mixerConnections/OscMixerConnection.ts
@@ -62,8 +62,10 @@ export class OscMixerConnection {
             .findIndex((ch) => ch === '{channel}')
 
         this.oscConnection = new osc.UDPPort({
-            localAddress: state.settings[0].localIp,
-            localPort: parseInt(state.settings[0].localOscPort + ''),
+            localAddress: state.settings[0].mixers[this.mixerIndex].localIp,
+            localPort: parseInt(
+                state.settings[0].mixers[this.mixerIndex].localOscPort + ''
+            ),
             remoteAddress: state.settings[0].mixers[this.mixerIndex].deviceIp,
             remotePort: parseInt(
                 state.settings[0].mixers[this.mixerIndex].devicePort + ''