Fixed several race conditions

Author: RaphiMC

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

@@ -29,10 +29,10 @@
 import javax.sound.sampled.AudioSystem;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 public class BassSoundSystem extends SoundSystem {
 
@@ -51,11 +51,15 @@ public static BassSoundSystem createPlayback(final int maxSounds) {
 
 
     private final Map<String, Integer> soundSamples = new HashMap<>();
-    private final List<Integer> playingChannels = new CopyOnWriteArrayList<>();
+    private final List<Integer> playingChannels = new ArrayList<>();
     private Thread shutdownHook;
 
     @SuppressWarnings("FieldCanBeLocal")
-    private final BassLibrary.SYNCPROC channelFreeSync = (handle, channel, data, user) -> this.playingChannels.remove((Integer) channel);
+    private final BassLibrary.SYNCPROC channelFreeSync = (handle, channel, data, user) -> {
+        synchronized (this) {
+            this.playingChannels.remove((Integer) channel);
+        }
+    };
 
     private BassSoundSystem(final int maxSounds) {
         super(maxSounds);
@@ -93,14 +97,12 @@ private BassSoundSystem(final int maxSounds) {
     }
 
     @Override
-    public void playSound(final String sound, final float pitch, final float volume, final float panning) {
+    public synchronized void playSound(final String sound, final float pitch, final float volume, final float panning) {
         if (!this.soundSamples.containsKey(sound)) return;
 
         if (this.playingChannels.size() >= this.maxSounds) {
             if (!BassLibrary.INSTANCE.BASS_ChannelFree(this.playingChannels.remove(0))) {
-                if (BassLibrary.INSTANCE.BASS_ErrorGetCode() != BassLibrary.BASS_ERROR_HANDLE) {
-                    this.checkError("Could not free audio channel");
-                }
+                this.checkError("Could not free audio channel", BassLibrary.BASS_ERROR_HANDLE);
             }
         }
 
@@ -126,15 +128,13 @@ public void playSound(final String sound, final float pitch, final float volume,
             this.checkError("Could not set audio channel end sync");
         }
         if (!BassLibrary.INSTANCE.BASS_ChannelStart(channel)) {
-            if (BassLibrary.INSTANCE.BASS_ErrorGetCode() != BassLibrary.BASS_ERROR_START) {
-                this.checkError("Could not play audio channel");
-            }
+            this.checkError("Could not play audio channel");
         }
         this.playingChannels.add(channel);
     }
 
     @Override
-    public void stopSounds() {
+    public synchronized void stopSounds() {
         if (!BassLibrary.INSTANCE.BASS_Stop()) {
             this.checkError("Could not stop sound system");
         }
@@ -145,7 +145,7 @@ public void stopSounds() {
     }
 
     @Override
-    public void close() {
+    public synchronized void close() {
         if (this.shutdownHook != null) {
             Runtime.getRuntime().removeShutdownHook(this.shutdownHook);
             this.shutdownHook = null;
@@ -159,12 +159,12 @@ public void close() {
     }
 
     @Override
-    public String getStatusLine() {
+    public synchronized String getStatusLine() {
         return "Sounds: " + this.playingChannels.size() + " / " + this.maxSounds + ", BASS CPU Load: " + (int) BassLibrary.INSTANCE.BASS_GetCPU() + "%";
     }
 
     @Override
-    public void setMasterVolume(final float volume) {
+    public synchronized void setMasterVolume(final float volume) {
         if (!BassLibrary.INSTANCE.BASS_SetConfig(BassLibrary.BASS_CONFIG_GVOL_STREAM, (int) (volume * 10000))) {
             this.checkError("Could not set master volume");
         }
@@ -192,9 +192,14 @@ private int loadAudioFile(final InputStream inputStream) {
         }
     }
 
-    private void checkError(final String message) {
+    private void checkError(final String message, final int... allowedErrors) {
         final int error = BassLibrary.INSTANCE.BASS_ErrorGetCode();
         if (error != BassLibrary.BASS_OK) {
+            for (int ignoreError : allowedErrors) {
+                if (error == ignoreError) {
+                    return;
+                }
+            }
             throw new RuntimeException("BASS error: " + message + " (" + error + ")");
         }
     }

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

@@ -25,17 +25,17 @@
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.SourceDataLine;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 public class JavaxSoundSystem extends SoundSystem {
 
     private static final AudioFormat FORMAT = new AudioFormat(44100, 16, 2, true, false);
 
     protected final Map<String, int[]> sounds;
-    protected final List<SoundInstance> playingSounds = new CopyOnWriteArrayList<>();
+    protected final List<SoundInstance> playingSounds = new ArrayList<>();
     protected final int samplesPerTick;
     protected final SourceDataLine dataLine;
     protected float masterVolume = 1F;
@@ -58,7 +58,7 @@ public JavaxSoundSystem(final int maxSounds, final float playbackSpeed) {
     }
 
     @Override
-    public void playSound(final String sound, final float pitch, final float volume, final float panning) {
+    public synchronized void playSound(final String sound, final float pitch, final float volume, final float panning) {
         if (!this.sounds.containsKey(sound)) return;
 
         if (this.playingSounds.size() >= this.maxSounds) {
@@ -69,7 +69,7 @@ public void playSound(final String sound, final float pitch, final float volume,
     }
 
     @Override
-    public void writeSamples() {
+    public synchronized void writeSamples() {
         final long[] samples = new long[this.samplesPerTick];
         for (SoundInstance playingSound : this.playingSounds) {
             playingSound.render();
@@ -80,24 +80,24 @@ public void writeSamples() {
     }
 
     @Override
-    public void stopSounds() {
+    public synchronized void stopSounds() {
         this.dataLine.flush();
         this.playingSounds.clear();
         this.volumeDividers = null;
     }
 
     @Override
-    public void close() {
+    public synchronized void close() {
         this.dataLine.stop();
     }
 
     @Override
-    public String getStatusLine() {
+    public synchronized String getStatusLine() {
         return "Sounds: " + this.playingSounds.size() + " / " + this.maxSounds;
     }
 
     @Override
-    public void setMasterVolume(final float volume) {
+    public synchronized void setMasterVolume(final float volume) {
         this.masterVolume = volume;
     }
 

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

@@ -78,17 +78,15 @@ public MultithreadedJavaxSoundSystem(final int maxSounds, final float playbackSp
     }
 
     @Override
-    public void writeSamples() {
-        final long[] samples = new long[this.samplesPerTick];
-        for (SoundInstance playingSound : this.playingSounds) {
-            this.soundsToRender.add(playingSound);
-            this.syncLock.incrementAndGet();
-        }
+    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
         }
 
+        final long[] samples = new long[this.samplesPerTick];
         for (long[] threadSamples : this.threadSamples) {
             for (int i = 0; i < samples.length; i++) {
                 samples[i] += threadSamples[i];
@@ -100,13 +98,13 @@ public void writeSamples() {
     }
 
     @Override
-    public void close() {
+    public synchronized void close() {
         this.threadPool.shutdownNow();
         super.close();
     }
 
     @Override
-    public String getStatusLine() {
+    public synchronized String getStatusLine() {
         return super.getStatusLine() + ", " + this.threadPool.getActiveCount() + " threads";
     }