fix: Studer update faders with log scale

olzzon · Apr 2, 2020 · a6e1b24 · a6e1b24
1 parent 722dc5d
commit a6e1b24
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/server/utils/mixerConnections/StuderMixerConnection.ts b/server/utils/mixerConnections/StuderMixerConnection.ts
@@ -197,7 +197,7 @@ export class StuderMixerConnection {
         let hexArray = levelMessage.split(' ')
         let buf = new Buffer(hexArray.map((val:string) => { return parseInt(val, 16) }))
         this.emberConnection._client.socket.write(buf)
-        console.log("Send HEX: " + levelMessage) 
+        logger.verbose("Send HEX: " + levelMessage) 
     }
 
     sendOutRequest(mixerMessage: string, channel: number) {
@@ -216,21 +216,27 @@ export class StuderMixerConnection {
     }
 
     updateOutLevel(channelIndex: number) {
-        let channelType = state.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = state.channels[0].channel[channelIndex].channelTypeIndex;
-        let protocol = this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_OUT_GAIN[0]
-        let level = (state.channels[0].channel[channelIndex].outputLevel - protocol.min) * (protocol.max - protocol.min)
+        let outputlevel = state.channels[0].channel[channelIndex].outputLevel
+        let level = 20 * Math.log((1.3*outputlevel)/0.775)
+        if (level < -90) {
+            level = -90
+        }
+        // console.log('Log level :', level)
+
         this.sendOutLevelMessage(
             channelTypeIndex+1,
             level,
         );
     }
 
     updateFadeIOLevel(channelIndex: number, outputLevel: number) {
-        let channelType = state.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = state.channels[0].channel[channelIndex].channelTypeIndex;
-        let protocol = this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_OUT_GAIN[0]
-        let level = (outputLevel - protocol.min) * (protocol.max - protocol.min)
+        let level = 20 * Math.log((1.3*outputLevel)/0.775)
+        if (level < -90) {
+            level = -90
+        }
+        // console.log('Log level :', level)
 
         this.sendOutLevelMessage(
             channelTypeIndex+1,

diff --git a/server/utils/mixerConnections/StuderVistaMixerConnection.ts b/server/utils/mixerConnections/StuderVistaMixerConnection.ts
@@ -181,7 +181,7 @@ export class StuderVistaMixerConnection {
             (channelVal & 0x000000ff),
         ])
 
-        //console.log('Fader value :', Math.floor(value))
+        console.log('Fader value :', Math.floor(value))
         let BERwriter = new BER.Writer()
 
         BERwriter.startSequence();
@@ -199,7 +199,7 @@ export class StuderVistaMixerConnection {
         let hexArray = levelMessage.split(' ')
         let buf = new Buffer(hexArray.map((val:string) => { return parseInt(val, 16) }))
         this.emberConnection._client.socket.write(buf)
-        //console.log("Send HEX: " + levelMessage) 
+        logger.verbose("Send HEX: " + levelMessage) 
     }
 
     sendOutRequest(mixerMessage: string, channel: number) {
@@ -218,28 +218,36 @@ export class StuderVistaMixerConnection {
     }
 
     updateOutLevel(channelIndex: number) {
-        let channelType = state.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = state.channels[0].channel[channelIndex].channelTypeIndex;
-        let protocol = this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_OUT_GAIN[0]
-        let level = state.channels[0].channel[channelIndex].outputLevel * (protocol.max - protocol.min) - Math.abs(protocol.min)
+        let outputlevel = state.channels[0].channel[channelIndex].outputLevel
+        let level = 20 * Math.log((1.3*outputlevel)/0.775)
+        if (level < -90) {
+            level = -90
+        }
+        // console.log('Log level :', level)
+
         this.sendOutLevelMessage(
             channelTypeIndex+1,
             level,
         );
     }
 
     updateFadeIOLevel(channelIndex: number, outputLevel: number) {
-        let channelType = state.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = state.channels[0].channel[channelIndex].channelTypeIndex;
-        let protocol = this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_OUT_GAIN[0]
-        let level = outputLevel * (protocol.max - protocol.min) - Math.abs(protocol.min)
+        let level = 20 * Math.log((1.3*outputLevel)/0.775)
+        if (level < -90) {
+            level = -90
+        }
+        // console.log('Log level :', level)
 
         this.sendOutLevelMessage(
             channelTypeIndex+1,
             level
         )
     }
 
+
+
     updatePflState(channelIndex: number) {
         let channelType = state.channels[0].channel[channelIndex].channelType;
         let channelTypeIndex = state.channels[0].channel[channelIndex].channelTypeIndex;