add constant to volume adjustment

Author: dogatech

be/src/SoulSifterSettings.cpp

@@ -59,6 +59,7 @@ namespace soulsifter {
     //ptree.put("midi.pauseAudio", "");
     ptree.put("midi.volume.exponentialFactor", "0.25");
     ptree.put("midi.volume.linearFactor", "1.125");
+    ptree.put("midi.volume.constantFactor", "0");
     //ptree.put("midi.volume.value", "");
     ptree.put("search.energyGap", 1);
     ptree.put("search.includeUnknownKeys", true);

fe/package.json

@@ -2,7 +2,7 @@
   "name": "SoulSifter",
   "version": "1.10.0",
   "description": "DJ & music organization app.",
-  "build": 4220,
+  "build": 4221,
   "main": "main.js",
   "scripts": {
     "fe:build": "vite build",

fe/src/search-toolbar.js

@@ -412,12 +412,13 @@ class SearchToolbar extends AlertsMixin(BpmMixin(QueryMixin(SearchMixin(SearchOp
         this.settings.getString('midi.volume.value'),
         e => {
           const value = e.rawValue >= 1 ? e.rawValue / 127 : e.rawValue;
-          let exp = Number(this.settings.getString('midi.volume.exponentialFactor'));
-          let linear = Number(this.settings.getString('midi.volume.linearFactor'));
+          const exp = Number(this.settings.getString('midi.volume.exponentialFactor'));
+          const linear = Number(this.settings.getString('midi.volume.linearFactor'));
+          const b = Number(this.settings.getString('midi.volume.constantFactor'));
           // 0.93*x^1/2.5 looks to match the closest curve,
           // but osx prob has its own curve that we have to compensate for
           // https://www.desmos.com/calculator/pwfyfk6yb2
-          let y = Math.pow(value, exp) * linear;
+          let y = Math.pow(value, exp) * linear + b;
           console.log(`Setting volume to ${y} from value ${value}`);
           let vol = Math.max(Math.min(y, 1), 0);
           this.volume = vol * 100;

fe/src/settings-edit.js

@@ -75,6 +75,7 @@ class SettingsEdit extends SettingsMixin(LitElement) {
               <div class="fields">
                 <md-filled-text-field label="Midi volume exp scale" .value=${this.midiVolumeExponentialFactor} id="midiVolumeExponentialFactor"></md-filled-text-field>
                 <md-filled-text-field label="Midi volume linear scale" .value=${this.midiVolumeLinearFactor} id="midiVolumeLinearFactor"></md-filled-text-field>
+                <md-filled-text-field label="Midi volume linear scale" .value=${this.midiVolumeConstantFactor} id="midiVolumeConstantFactor"></md-filled-text-field>
                 <md-filled-text-field label="Volume" .value=${this.midiVolumeValue} id="midiVolumeValue" allowedPattern="${rawMidiPattern}"></md-filled-text-field>
                 <br>
                 <md-filled-text-field label="Preview Start Time (in %)" .value=${this.songListPreviewStartPercent} id="songListPreviewStartPercent"></md-filled-text-field>
@@ -187,6 +188,7 @@ class SettingsEdit extends SettingsMixin(LitElement) {
     this.midiLoadLeft = this.settings.getString('midi.loadLeft');
     this.midiLoadRight = this.settings.getString('midi.loadRight');
     this.midiPauseAudio = this.settings.getString('midi.pauseAudio');
+    this.midiVolumeConstantFactor = this.settings.getString('midi.volume.constantFactor');
     this.midiVolumeExponentialFactor = this.settings.getString('midi.volume.exponentialFactor');
     this.midiVolumeLinearFactor = this.settings.getString('midi.volume.linearFactor');
     this.midiVolumeValue = this.settings.getString('midi.volume.value');
@@ -333,6 +335,7 @@ class SettingsEdit extends SettingsMixin(LitElement) {
     this.puts('midi.loadLeft', this.shadowRoot.getElementById('midiLoadLeft').value);
     this.puts('midi.loadRight', this.shadowRoot.getElementById('midiLoadRight').value);
     this.puts('midi.pauseAudio', this.shadowRoot.getElementById('midiPauseAudio').value);
+    this.puts('midi.volume.constantFactor', this.shadowRoot.getElementById('midiVolumeConstantFactor').value);
     this.puts('midi.volume.exponentialFactor', this.shadowRoot.getElementById('midiVolumeExponentialFactor').value);
     this.puts('midi.volume.linearFactor', this.shadowRoot.getElementById('midiVolumeLinearFactor').value);
     this.puts('midi.volume.value', this.shadowRoot.getElementById('midiVolumeValue').value);