Made OpenAL audio exporting multithreaded

Author: RaphiMC

src/main/java/net/raphimc/noteblocktool/audio/soundsystem/impl/OpenALSoundSystem.java

@@ -36,6 +36,7 @@
 public class OpenALSoundSystem extends SoundSystem {
 
     private static OpenALSoundSystem instance;
+    private static final ThreadLocal<OpenALSoundSystem> tlsInstance = ThreadLocal.withInitial(() -> null);
 
     public static OpenALSoundSystem createPlayback(final Map<String, byte[]> soundData, final int maxSounds) {
         if (instance != null) {
@@ -46,11 +47,11 @@ public static OpenALSoundSystem createPlayback(final Map<String, byte[]> soundDa
     }
 
     public static OpenALSoundSystem createCapture(final Map<String, byte[]> soundData, final int maxSounds, final AudioFormat captureAudioFormat) {
-        if (instance != null) {
+        if (tlsInstance.get() != null) {
             throw new IllegalStateException("OpenAL sound system already initialized");
         }
-        instance = new OpenALSoundSystem(soundData, maxSounds, captureAudioFormat);
-        return instance;
+        tlsInstance.set(new OpenALSoundSystem(soundData, maxSounds, captureAudioFormat));
+        return tlsInstance.get();
     }
 
 
@@ -105,10 +106,13 @@ private OpenALSoundSystem(final Map<String, byte[]> soundData, final int maxSoun
         if (captureAudioFormat != null && !alcCapabilities.ALC_SOFT_loopback) {
             throw new RuntimeException("ALC_SOFT_loopback is not supported");
         }
+        if (captureAudioFormat != null && !alcCapabilities.ALC_EXT_thread_local_context) {
+            throw new RuntimeException("ALC_EXT_thread_local_context is not supported");
+        }
 
         this.context = ALC10.alcCreateContext(this.device, attributes);
         this.checkALCError("Failed to create context");
-        if (!ALC10.alcMakeContextCurrent(this.context)) {
+        if (captureAudioFormat != null ? !EXTThreadLocalContext.alcSetThreadContext(this.context) : !ALC10.alcMakeContextCurrent(this.context)) {
             throw new RuntimeException("Failed to make context current");
         }
 
@@ -223,7 +227,11 @@ public synchronized void close() {
         this.soundBuffers.clear();
         this.playingSources.clear();
         if (this.context != 0L) {
-            ALC10.alcMakeContextCurrent(0);
+            if (this.captureAudioFormat != null) {
+                EXTThreadLocalContext.alcSetThreadContext(0);
+            } else {
+                ALC10.alcMakeContextCurrent(0);
+            }
             ALC10.alcDestroyContext(this.context);
             this.context = 0L;
         }
@@ -235,7 +243,11 @@ public synchronized void close() {
             MemoryUtil.memFree(this.captureBuffer);
             this.captureBuffer = null;
         }
-        instance = null;
+        if (this.captureAudioFormat != null) {
+            tlsInstance.remove();
+        } else {
+            instance = null;
+        }
     }
 
     @Override

src/main/java/net/raphimc/noteblocktool/frames/ExportFrame.java

@@ -66,7 +66,7 @@ public class ExportFrame extends JFrame {
     private final List<ListFrame.LoadedSong> loadedSongs;
     private final JComboBox<String> format = new JComboBox<>(new String[]{"NBS", "MP3 (Using LAME encoder)", "WAV", "AIF"});
     private final JLabel soundSystemLabel = new JLabel("Sound System:");
-    private final JComboBox<String> soundSystem = new JComboBox<>(new String[]{"OpenAL (better sound quality)", "Javax (parallel capable, normalized)"});
+    private final JComboBox<String> soundSystem = new JComboBox<>(new String[]{"OpenAL (faster, better sound quality)", "Javax (normalized)"});
     private final JLabel sampleRateLabel = new JLabel("Sample Rate:");
     private final JSpinner sampleRate = new JSpinner(new SpinnerNumberModel(48000, 8000, 192000, 8000));
     private final JLabel bitDepthLabel = new JLabel("PCM Bit Depth:");
@@ -325,7 +325,7 @@ private void doExport(final File outFile) {
                 }
             } else {
                 final int threadCount;
-                if (!isAudioFile || this.soundSystem.getSelectedIndex() == 0) threadCount = 1;
+                if (!isAudioFile) threadCount = 1;
                 else threadCount = Math.min(this.loadedSongs.size(), Runtime.getRuntime().availableProcessors());
                 ThreadPoolExecutor threadPool = (ThreadPoolExecutor) Executors.newFixedThreadPool(threadCount);
                 Queue<Runnable> uiQueue = new ConcurrentLinkedQueue<>();