feat: load mixer preset - prepared protocols with loadPresetCommand.m…

…ixerMessage
olzzon · Jun 5, 2020 · 4ffbf3c · 4ffbf3c
1 parent 53581c3
commit 4ffbf3c
Show file tree

Hide file tree

Showing 24 changed files with 373 additions and 199 deletions.
diff --git a/server/constants/MixerProtocolInterface.ts b/server/constants/MixerProtocolInterface.ts
@@ -2,6 +2,7 @@ export interface IMixerProtocolGeneric {
     protocol: string
     label: string
     presetFileExtension: string
+    loadPresetCommand: Array<IMixerMessageProtocol>
     FADE_DISPATCH_RESOLUTION: number
     fader: {
         min: number

diff --git a/server/constants/mixerProtocols/DmxIs.ts b/server/constants/mixerProtocols/DmxIs.ts
@@ -4,6 +4,7 @@ export const DMXIS: IMixerProtocol = {
     protocol: 'OSC',
     label: 'DMXIS Light Controller Protocol',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false, //some OSC protocols needs channels to be 01, 02 etc.
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/LawoMC2.ts b/server/constants/mixerProtocols/LawoMC2.ts
@@ -4,6 +4,7 @@ export const LawoMC2: IMixerProtocol = {
     protocol: 'EMBER',
     label: 'Lawo MC2 - NOT IMPLEMENTED',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false, //some OSC protocols needs channels to be 01, 02 etc.
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/LawoRelayVrx4.ts b/server/constants/mixerProtocols/LawoRelayVrx4.ts
@@ -4,6 +4,7 @@ export const LawoRelayVrx4: IMixerProtocol = {
     protocol: 'EMBER',
     label: 'Lawo Relay VRX4 - client',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 15,
     leadingZeros: false, //some OSC protocols needs channels to be 01, 02 etc.
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/LawoRuby.ts b/server/constants/mixerProtocols/LawoRuby.ts
@@ -4,6 +4,7 @@ export const LawoRuby: IMixerProtocol = {
     protocol: 'EMBER',
     label: 'Lawo Ruby',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 15,
     leadingZeros: false, //some OSC protocols needs channels to be 01, 02 etc.
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/SSLsystemT.ts b/server/constants/mixerProtocols/SSLsystemT.ts
@@ -4,6 +4,7 @@ export const SSLSystemT: IMixerProtocol = {
     protocol: 'SSL',
     label: 'SSL System T',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false,
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/StuderOnAirEmber.ts b/server/constants/mixerProtocols/StuderOnAirEmber.ts
@@ -4,6 +4,7 @@ export const StuderOnAirMaster: IMixerProtocol = {
     protocol: 'STUDER',
     label: 'Studer OnAir 3000',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false, //some OSC protocols needs channels to be 01, 02 etc.
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/ardourMaster.ts b/server/constants/mixerProtocols/ardourMaster.ts
@@ -4,6 +4,7 @@ export const ArdourMaster: IMixerProtocol = {
     protocol: 'OSC',
     label: 'Ardour DAW - Master Mode',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false,
     pingCommand: [

diff --git a/server/constants/mixerProtocols/behringerXrMaster.ts b/server/constants/mixerProtocols/behringerXrMaster.ts
@@ -4,6 +4,7 @@ export const BehringerXrMaster: IMixerProtocol = {
     protocol: 'OSC',
     label: 'Behringer XR-series / Midas MR-series',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: true,
     pingCommand: [

diff --git a/server/constants/mixerProtocols/casparCGMaster.ts b/server/constants/mixerProtocols/casparCGMaster.ts
@@ -105,6 +105,7 @@ let CasparCGMasterObject: ICasparCGMixerGeometry = {
     protocol: 'CasparCG',
     label: `CasparCG Audio Mixer`,
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     studio: 'studio0',
     leadingZeros: false,

diff --git a/server/constants/mixerProtocols/genericMidi.ts b/server/constants/mixerProtocols/genericMidi.ts
@@ -4,6 +4,7 @@ export const GenericMidi: IMixerProtocol = {
     protocol: 'MIDI',
     label: 'Generic Midi',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false,
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/midasMaster.ts b/server/constants/mixerProtocols/midasMaster.ts
@@ -3,7 +3,8 @@ import { IMixerProtocol, emptyMixerMessage } from '../MixerProtocolInterface'
 export const MidasMaster: IMixerProtocol = {
     protocol: 'OSC',
     label: 'Midas M32 / Behringer X32 Master Mode',
-    presetFileExtension: '',
+    presetFileExtension: 'X32',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: true,
     pingCommand: [

diff --git a/server/constants/mixerProtocols/reaperMaster.ts b/server/constants/mixerProtocols/reaperMaster.ts
@@ -4,6 +4,7 @@ export const ReaperMaster: IMixerProtocol = {
     protocol: 'OSC',
     label: 'Reaper DAW Master mode(reaper.fm)',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false, //some OSC protocols needs channels to be 01, 02 etc.
     pingCommand: [emptyMixerMessage()],

diff --git a/server/constants/mixerProtocols/yamahaQLCL.ts b/server/constants/mixerProtocols/yamahaQLCL.ts
@@ -4,6 +4,7 @@ export const YamahaQLCL: IMixerProtocol = {
     protocol: 'QLCL',
     label: 'Yamaha QL/CL',
     presetFileExtension: '',
+    loadPresetCommand: [emptyMixerMessage()],
     FADE_DISPATCH_RESOLUTION: 5,
     leadingZeros: false,
     pingCommand: [emptyMixerMessage()],

diff --git a/server/utils/MixerConnection.ts b/server/utils/MixerConnection.ts
@@ -84,12 +84,11 @@ export class MixerGenericConnection {
     }
 
     getPresetFileExtention(): string {
-        console.log('TODO: File extension should be handled pr. mixer type')
-        return 'x32'
+        return this.mixerProtocol.presetFileExtension
     }
 
     loadMixerPreset(presetName: string) {
-        logger.info('Loading Preset :' + presetName)
+        this.mixerConnection.loadMixerPreset(presetName)
     }
 
     checkForAutoResetThreshold(channel: number) {

diff --git a/server/utils/SettingsStorage.ts b/server/utils/SettingsStorage.ts
@@ -127,7 +127,10 @@ export const getSnapShotList = () => {
     return files
 }
 
-export const getMixerPresetList = (fileExtension: string) => {
+export const getMixerPresetList = (fileExtension: string): string[] => {
+    if (fileExtension === '') {
+        return []
+    }
     const files = fs
         .readdirSync(path.resolve('storage'))
         .filter((file: string) => {