Cleaned up code in MultithreadedAudioMixerSoundSystem

Author: RaphiMC

build.gradle

@@ -29,7 +29,7 @@ repositories {
 
 dependencies {
     include "net.raphimc:NoteBlockLib:2.1.3"
-    include "net.raphimc:audio-mixer:1.0.0"
+    include "net.raphimc:audio-mixer:1.0.1-SNAPSHOT"
     include "com.formdev:flatlaf:3.5.1"
     include "net.lenni0451.commons:swing:1.6.0"
     include "org.lwjgl:lwjgl:3.3.4"

src/main/java/net/raphimc/noteblocktool/audio/export/impl/AudioMixerAudioExporter.java

@@ -35,8 +35,8 @@
 
 public class AudioMixerAudioExporter extends AudioExporter {
 
-    private final Map<String, int[]> sounds;
-    private final AudioMixer audioMixer;
+    protected final Map<String, int[]> sounds;
+    protected final AudioMixer audioMixer;
 
     public AudioMixerAudioExporter(final SongView<?> songView, final AudioFormat format, final float masterVolume, final Consumer<Float> progressConsumer) {
         super(songView, format, masterVolume, progressConsumer);

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

@@ -18,10 +18,9 @@
 package net.raphimc.noteblocktool.audio.soundsystem.impl;
 
 import net.raphimc.audiomixer.AudioMixer;
-import net.raphimc.audiomixer.sound.Sound;
 import net.raphimc.audiomixer.sound.source.MonoSound;
+import net.raphimc.audiomixer.sound.source.StaticStereoSound;
 
-import javax.sound.sampled.AudioFormat;
 import java.util.Map;
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
@@ -76,7 +75,7 @@ public synchronized void postTick() {
             throw new RuntimeException(e);
         }
         for (int[] threadSamples : this.threadSamples) {
-            this.audioMixer.playSound(new StaticSound(threadSamples));
+            this.audioMixer.playSound(new StaticStereoSound(threadSamples));
         }
         super.postTick();
         if (this.audioMixer.getActiveSounds() != 0) {
@@ -99,22 +98,4 @@ public synchronized String getStatusLine() {
         return "Sounds: " + mixedSounds + " / " + this.maxSounds + ", " + this.threadPool.getActiveCount() + " threads";
     }
 
-    private record StaticSound(int[] samples) implements Sound {
-
-        @Override
-        public void render(final AudioFormat audioFormat, final int[] renderedSamples, final int renderedSamplesLength) {
-            if (renderedSamplesLength != renderedSamples.length) {
-                throw new IllegalArgumentException("Rendered samples length must match the length of the rendered samples array");
-            }
-
-            System.arraycopy(this.samples, 0, renderedSamples, 0, renderedSamplesLength);
-        }
-
-        @Override
-        public boolean isFinished() {
-            return true;
-        }
-
-    }
-
 }