Fix javax.sound.midi initialization

kshoji · May 5, 2024 · 64517f9 · 64517f9
1 parent 0dc598f
commit 64517f9
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/BLE-MIDI-library/src/main/java/jp/kshoji/javax/sound/midi/BleMidiSystem.java b/BLE-MIDI-library/src/main/java/jp/kshoji/javax/sound/midi/BleMidiSystem.java
@@ -17,7 +17,7 @@
 import jp.kshoji.javax.sound.midi.ble.BleMidiSynthesizer;
 
 /**
- * {@link jp.kshoji.javax.sound.midi.MidiSystem} initializer for BLE MIDI
+ * {@link jp.kshoji.javax.sound.midi.MidiSystem} for BLE MIDI
  *
  * @author K.Shoji
  */
@@ -35,7 +35,7 @@ public final class BleMidiSystem implements OnMidiDeviceAttachedListener, OnMidi
      * @param context the context
      */
     public BleMidiSystem(@NonNull final Context context) {
-        this.context = context.getApplicationContext();
+        this.context = context;
     }
 
     /**
@@ -79,10 +79,19 @@ public void terminate() {
         synchronized (midiDeviceMap) {
             for (final BleMidiDevice bleMidiDevice : midiDeviceMap.values()) {
                 bleMidiDevice.close();
+                MidiSystem.removeMidiDevice(bleMidiDevice);
             }
 
             midiDeviceMap.clear();
         }
+
+        synchronized (midiSynthesizerMap) {
+            for (final BleMidiSynthesizer bleMidiSynthesizer : midiSynthesizerMap.values()) {
+                bleMidiSynthesizer.close();
+                MidiSystem.removeSynthesizer(bleMidiSynthesizer);
+            }
+            midiSynthesizerMap.clear();
+        }
     }
 
     /**