Merge pull request #83 from kshoji/feature/fix-javax-sound-midi-20240506

Update MidiSynthesizer.setReceiver method
kshoji · May 5, 2024 · 3e954df · 3e954df
2 parents 45ecd09 + 01459f8
commit 3e954df
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/MIDIDriver/build.gradle b/MIDIDriver/build.gradle
@@ -25,6 +25,11 @@ android {
         targetSdkVersion 34
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     namespace "jp.kshoji.driver.midi"
 
     sourceSets {

diff --git a/MIDIDriver/src/jp/kshoji/javax/sound/midi/UsbMidiSystem.java b/MIDIDriver/src/jp/kshoji/javax/sound/midi/UsbMidiSystem.java
@@ -56,13 +56,22 @@ public void initialize() {
      */
     public void terminate() {
         synchronized (midiDeviceMap) {
-            for (final Map.Entry<String, UsbMidiDevice> midiDeviceEntry  : midiDeviceMap.entrySet()) {
-                midiDeviceEntry.getValue().close();
+            for (final UsbMidiDevice midiDevice :  midiDeviceMap.values()) {
+                midiDevice.close();
+                MidiSystem.removeMidiDevice(midiDevice);
             }
 
             midiDeviceMap.clear();
         }
 
+        synchronized (midiSynthesizerMap) {
+            for (final UsbMidiSynthesizer usbMidiSynthesizer : midiSynthesizerMap.values()) {
+                usbMidiSynthesizer.close();
+                MidiSystem.removeSynthesizer(usbMidiSynthesizer);
+            }
+            midiSynthesizerMap.clear();
+        }
+
         if (deviceConnectionWatcher != null) {
             deviceConnectionWatcher.stop();
             deviceConnectionWatcher = null;
@@ -131,6 +140,7 @@ public void onMidiOutputDeviceAttached(@NonNull final MidiOutputDevice midiOutpu
                 try {
                     existingSynthesizer.setReceiver(addedDevice.getReceiver());
                 } catch (final MidiUnavailableException ignored) {
+                    existingSynthesizer.setReceiver(null);
                 }
             }
         }

diff --git a/MIDIDriver/src/jp/kshoji/javax/sound/midi/usb/UsbMidiSynthesizer.java b/MIDIDriver/src/jp/kshoji/javax/sound/midi/usb/UsbMidiSynthesizer.java
@@ -40,19 +40,7 @@ public UsbMidiSynthesizer(final UsbMidiDevice usbMidiDevice) {
         } catch (final MidiUnavailableException ignored) {
         }
 
-        if (receiver == null) {
-            // empty
-            channels = new MidiChannel[0];
-            voiceStatuses = new VoiceStatus[0];
-        } else {
-            // 16 channels
-            voiceStatuses = new VoiceStatus[16];
-            channels = new MidiChannel[16];
-            for (int channel = 0; channel < 16; channel++) {
-                voiceStatuses[channel] = new VoiceStatus();
-                channels[channel] = new MidiChannelImpl(channel, receiver, voiceStatuses[channel]);
-            }
-        }
+        setReceiver(receiver);
     }
 
     @NonNull
@@ -196,12 +184,18 @@ public List<Transmitter> getTransmitters() {
     }
 
     public void setReceiver(final Receiver receiver) {
-        // 16 channels
-        voiceStatuses = new VoiceStatus[16];
-        channels = new MidiChannel[16];
-        for (int channel = 0; channel < 16; channel++) {
-            voiceStatuses[channel] = new VoiceStatus();
-            channels[channel] = new MidiChannelImpl(channel, receiver, voiceStatuses[channel]);
+        if (receiver == null) {
+            // empty
+            channels = new MidiChannel[0];
+            voiceStatuses = new VoiceStatus[0];
+        } else {
+            // 16 channels
+            voiceStatuses = new VoiceStatus[16];
+            channels = new MidiChannel[16];
+            for (int channel = 0; channel < 16; channel++) {
+                voiceStatuses[channel] = new VoiceStatus();
+                channels[channel] = new MidiChannelImpl(channel, receiver, voiceStatuses[channel]);
+            }
         }
     }
 }