Handle audio buffer overruns better

Author: RaphiMC

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

@@ -77,20 +77,27 @@ public synchronized void writeSamples() {
             playingSound.render(mutationBuffer);
             playingSound.write(samples, outputBuffer);
         }
-        this.dataLine.write(this.writeNormalized(samples), 0, samples.length * 2);
         this.playingSounds.removeIf(SoundInstance::isFinished);
+
+        if (this.dataLine.available() < samples.length * 2) {
+            // In case of buffer overrun, flush the queued samples
+            this.dataLine.flush();
+        }
+        this.dataLine.write(this.writeNormalized(samples), 0, samples.length * 2);
     }
 
     @Override
     public synchronized void stopSounds() {
+        this.dataLine.stop();
         this.dataLine.flush();
+        this.dataLine.start();
         this.playingSounds.clear();
         this.volumeDividers = null;
     }
 
     @Override
     public synchronized void close() {
-        this.dataLine.stop();
+        this.dataLine.close();
     }
 
     @Override

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

@@ -92,10 +92,10 @@ public MultithreadedJavaxSoundSystem(final int maxSounds, final float playbackSp
     public synchronized void writeSamples() {
         this.soundsToRender.addAll(this.playingSounds);
         this.syncLock.set(this.playingSounds.size());
-
         while (this.syncLock.get() != 0 && !Thread.currentThread().isInterrupted()) {
             // Wait for all sounds to be rendered and merged
         }
+        this.playingSounds.removeIf(SoundInstance::isFinished);
 
         final long[] samples = new long[this.samplesPerTick];
         for (long[] threadSamples : this.threadSamples) {
@@ -104,8 +104,11 @@ public synchronized void writeSamples() {
             }
             Arrays.fill(threadSamples, 0);
         }
+        if (this.dataLine.available() < samples.length * 2) {
+            // In case of buffer overrun, flush the queued samples
+            this.dataLine.flush();
+        }
         this.dataLine.write(this.writeNormalized(samples), 0, samples.length * 2);
-        this.playingSounds.removeIf(SoundInstance::isFinished);
     }
 
     @Override