reconnect midi after a disconnect

Author: dogatech

fe/package.json

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

fe/src/midi-manager.js

@@ -63,12 +63,16 @@ class MidiManager {
     }
   }
 
-  async disconnect() {
+  disconnect() {
     this._midiInput.removeListener();
     this._midiInput = null;
     this._channelCallbacks = [];
   }
 
+  isConnected() {
+    return !!this._midiInput;
+  }
+
   _setupListeners() {
     if (this._midiInput) {
       Object.entries(this._channelCallbacks).forEach(([channel, chanCb]) => {

fe/src/search-toolbar.js

@@ -89,7 +89,6 @@ class SearchToolbar extends AlertsMixin(BpmMixin(QueryMixin(SearchMixin(SearchOp
 
   connectedCallback() {
     super.connectedCallback();
-    this.registerMidiCallbacks();
     window.addEventListener('register-midi-callbacks', this.registerMidiCallbacks.bind(this));
   }
 
@@ -433,6 +432,8 @@ class SearchToolbar extends AlertsMixin(BpmMixin(QueryMixin(SearchMixin(SearchOp
   }
 
   connectToMidiController(e) {
+    const event = new CustomEvent('register-midi-callbacks', {});
+    window.dispatchEvent(event);
     midiManager.connect(this.settings.getString('midi.controllerName'));
   }
 

fe/src/settings-edit.js

@@ -366,9 +366,11 @@ class SettingsEdit extends SettingsMixin(LitElement) {
     this.puti('virtualdj.port', Number(this.shadowRoot.getElementById('virtualdjPort').value));
     this.settings.save();
     // reset midi
-    midiManager.removeListeners();
-    const event = new CustomEvent('register-midi-callbacks', {});
-    window.dispatchEvent(event);
+    if (midiManager.isConnected()) {
+      midiManager.removeListeners();
+      const event = new CustomEvent('register-midi-callbacks', {});
+      window.dispatchEvent(event);
+    }
     this.exit();
   }
 

fe/src/song-list.js

@@ -126,7 +126,6 @@ class SongList extends AlertsMixin(
     window.addEventListener('keydown', this.keydownHandler.bind(this));
     window.addEventListener('song-list-pos', this.getNextOrPrevSong.bind(this));
     window.addEventListener('register-midi-callbacks', this.registerMidiCallbacks.bind(this));
-    this.registerMidiCallbacks();
   }
 
   firstUpdated() {

fe/src/vdj-waveform.js

@@ -88,7 +88,6 @@ class VDJWaveform extends AlertsMixin(SettingsMixin(LitElement)) {
     window.addEventListener('enable-stem-waveforms', e => {
       if (this.settings.getBool('virtualdj.active') && e.detail) {
         this.startUpdating();
-        this.registerMidiCallbacks();
       } else {
         this.stopUpdating();
         this.stopDisplayTimeUpdate();