add safety midi checks with previews

Author: dogatech

be/src/SoulSifterSettings.cpp

@@ -52,6 +52,9 @@ namespace soulsifter {
     //ptree.put("midi.audioOutput.leftName", "");
     //ptree.put("midi.audioOutput.right", "");
     //ptree.put("midi.audioOutput.rightName", "");
+    //ptree.put("midi.audioOutput.safety.crossFader", "");
+    //ptree.put("midi.audioOutput.safety.leftFader", "");
+    //ptree.put("midi.audioOutput.safety.rightFader", "");
     //ptree.put("midi.browse", "");
     //ptree.put("midi.controllerName", "");
     //ptree.put("midi.loadLeft", "");

fe/package.json

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

fe/src/settings-edit.js

@@ -84,6 +84,9 @@ class SettingsEdit extends SettingsMixin(LitElement) {
                 <md-filled-text-field label="Audio source 1 name" .value=${this.midiAudioOutputLeftName} id="midiAudioOutputLeftName"></md-filled-text-field>
                 <md-filled-text-field label="Audio source 2 midi" .value=${this.midiAudioOutputRight} id="midiAudioOutputRight"></md-filled-text-field>
                 <md-filled-text-field label="Audio source 2 name" .value=${this.midiAudioOutputRightName} id="midiAudioOutputRightName"></md-filled-text-field>
+                <md-filled-text-field label="Safty cross fader midi" .value=${this.midiAudioOutputSafetyCrossFader} id="midiAudioOutputSafetyCrossFader"></md-filled-text-field>
+                <md-filled-text-field label="Safty volume fader 1 midi" .value=${this.midiAudioOutputSafetyLeftFader} id="midiAudioOutputSafetyLeftFader"></md-filled-text-field>
+                <md-filled-text-field label="Safty volume fader 2 midi" .value=${this.midiAudioOutputSafetyRightFader} id="midiAudioOutputSafetyRightFader"></md-filled-text-field>
               </div>
               <div class="fields">
                 <label>Midi for VDJ stem responsiveness</label>
@@ -183,6 +186,9 @@ class SettingsEdit extends SettingsMixin(LitElement) {
     this.midiAudioOutputLeftName = this.settings.getString('midi.audioOutput.leftName');
     this.midiAudioOutputRight = this.settings.getString('midi.audioOutput.right');
     this.midiAudioOutputRightName = this.settings.getString('midi.audioOutput.rightName');
+    this.midiAudioOutputSafetyCrossFader = this.settings.getString('midi.audioOutput.safety.crossFader');
+    this.midiAudioOutputSafetyLeftFader = this.settings.getString('midi.audioOutput.safety.leftFader');
+    this.midiAudioOutputSafetyRightFader = this.settings.getString('midi.audioOutput.safety.rightFader');
     this.midiBrowse = this.settings.getString('midi.browse');
     this.midiControllerName = this.settings.getString('midi.controllerName');
     this.midiLoadLeft = this.settings.getString('midi.loadLeft');
@@ -330,6 +336,9 @@ class SettingsEdit extends SettingsMixin(LitElement) {
     this.puts('midi.audioOutput.leftName', this.shadowRoot.getElementById('midiAudioOutputLeftName').value);
     this.puts('midi.audioOutput.right', this.shadowRoot.getElementById('midiAudioOutputRight').value);
     this.puts('midi.audioOutput.rightName', this.shadowRoot.getElementById('midiAudioOutputRightName').value);
+    this.puts('midi.audioOutput.safety.crossFader', this.shadowRoot.getElementById('midiAudioOutputSafetyCrossFader').value);
+    this.puts('midi.audioOutput.safety.leftFader', this.shadowRoot.getElementById('midiAudioOutputSafetyLeftFader').value);
+    this.puts('midi.audioOutput.safety.rightFader', this.shadowRoot.getElementById('midiAudioOutputSafetyRightFader').value);
     this.puts('midi.browse', this.shadowRoot.getElementById('midiBrowse').value);
     this.puts('midi.controllerName', this.shadowRoot.getElementById('midiControllerName').value);
     this.puts('midi.loadLeft', this.shadowRoot.getElementById('midiLoadLeft').value);

fe/src/song-list.js

@@ -484,6 +484,24 @@ class SongList extends AlertsMixin(
           }
         }
     );
+    midiManager.registerInput(
+        this.settings.getString('midi.audioOutput.safety.crossFader'),
+        e => {
+          this._audioOutputCrossFader = e.rawValue;
+        }
+    );
+    midiManager.registerInput(
+        this.settings.getString('midi.audioOutput.safety.leftFader'),
+        e => {
+          this._audioOutputLeftFader = e.rawValue;
+        }
+    );
+    midiManager.registerInput(
+        this.settings.getString('midi.audioOutput.safety.rightFader'),
+        e => {
+          this._audioOutputRightFader = e.rawValue;
+        }
+    );
     midiManager.registerInput(
         this.settings.getString('midi.loadLeft'),  // 70
         e => {
@@ -549,13 +567,25 @@ class SongList extends AlertsMixin(
             this.scrollTo({top: newScrollTop, behavior: 'instant'});
             console.info(`targetTop: ${targetTop}, moveTop ${moveTop}  newScrollTop: ${newScrollTop}, stop ${selectedRect.top} `);
           }
-          const startPct = this.settings.getInt('songList.previewStartPercent') / 100;
-          let event = new CustomEvent('audio-preview-song', {
-              bubbles: true,
-              composed: true,
-              detail: { song: this.midiSelectedListItem.song, pct: startPct, player: this.midiSelectedListItem }
-          });
-          setTimeout(() => this.dispatchEvent(event), 200);  // wait for audio output to switch
+          if (( // does not have separate audio channels, so no safety checks required
+                !this.settings.getString('midi.audioOutput.leftName') &&
+                !this.settings.getString('midi.audioOutput.rightName')
+              ) || (  // left channel safety check
+                this._audioOutput == this.settings.getString('midi.audioOutput.leftName')
+                && (this._audioOutputLeftFader == 0 || this._audioOutputCrossFader == 0x7F)
+              ) || (  // right channel safety check
+                this._audioOutput == this.settings.getString('midi.audioOutput.rightName')
+                && (this._audioOutputRightFader == 0 || this._audioOutputCrossFader == 0)
+              )
+            ) {
+            const startPct = this.settings.getInt('songList.previewStartPercent') / 100;
+            let event = new CustomEvent('audio-preview-song', {
+                bubbles: true,
+                composed: true,
+                detail: { song: this.midiSelectedListItem.song, pct: startPct, player: this.midiSelectedListItem }
+            });
+            setTimeout(() => this.dispatchEvent(event), 200);  // wait for audio output to switch
+          }
         }
     );
   }