Fix audio source collision

Robust.Client/Audio/AudioManager.Public.cs

@@ -149,9 +149,8 @@ public AudioStream LoadAudioOggVorbis(Stream stream, string? name = null)
 
         _checkAlError();
 
-        var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
         var length = TimeSpan.FromSeconds(vorbis.TotalSamples / (double) vorbis.SampleRate);
+        var handle = RegisterBuffer(buffer);
         return new AudioStream(this, buffer, handle, length, (int) vorbis.Channels, name, vorbis.Title, vorbis.Artist);
     }
 
@@ -208,9 +207,8 @@ public AudioStream LoadAudioWav(Stream stream, string? name = null)
 
         _checkAlError();
 
-        var handle = new ClydeHandle(_audioSampleBuffers.Count);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
         var length = TimeSpan.FromSeconds(wav.Data.Length / (double) wav.BlockAlign / wav.SampleRate);
+        var handle = RegisterBuffer(buffer);
         return new AudioStream(this, buffer, handle, length, wav.NumChannels, name);
     }
 
@@ -238,9 +236,8 @@ public AudioStream LoadAudioRaw(ReadOnlySpan<short> samples, int channels, int s
 
         _checkAlError();
 
-        var handle = new ClydeHandle(_audioSampleBuffers.Count);
         var length = TimeSpan.FromSeconds((double) samples.Length / channels / sampleRate);
-        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
+        var handle = RegisterBuffer(buffer);
         return new AudioStream(this, buffer, handle, length, channels, name);
     }
 
@@ -331,6 +328,12 @@ internal void RemoveBufferedAudioSource(int handle)
 
     public IAudioSource? CreateAudioSource(AudioStream stream)
     {
+        if (!_audioSampleBuffers.TryGetValue(stream.BufferId, out var sample))
+        {
+            OpenALSawmill.Error($"Audio stream '{stream.Name}' has no backing buffer, skipping.");
+            return null;
+        }
+
         var source = AL.GenSource();
 
         if (!AL.IsSource(source))
@@ -339,9 +342,7 @@ internal void RemoveBufferedAudioSource(int handle)
             return null;
         }
 
-        // ReSharper disable once PossibleInvalidOperationException
-        // TODO: This really shouldn't be indexing based on the ClydeHandle...
-        AL.Source(source, ALSourcei.Buffer, _audioSampleBuffers[stream.BufferId].BufferHandle);
+        AL.Source(source, ALSourcei.Buffer, sample.BufferHandle);
 
         var audioSource = new AudioSource(this, source, stream);
         _audioSources.Add(source, new WeakReference<BaseAudioSource>(audioSource));

Robust.Client/Audio/AudioManager.cs

@@ -48,6 +48,7 @@ internal sealed partial class AudioManager : IAudioInternal
     private float _masterFadeElapsed = MasterFadeDuration;
     private float _masterFadeStartGain = 1f;
     private float _masterFadeTargetGain = 1f;
+    private int _nextClydeHandle;
 
     public bool HasAlDeviceExtension(string extension) => _alcDeviceExtensions.Contains(extension);
     public bool HasAlContextExtension(string extension) => _alContextExtensions.Contains(extension);
@@ -303,6 +304,15 @@ internal bool IsMainThread()
         return Thread.CurrentThread == _gameThread;
     }
 
+    private ClydeHandle RegisterBuffer(int buffer)
+    {
+        if (buffer == 0)
+            throw new InvalidOperationException("AL.GenBuffer returned 0 - no current OpenAL context.");
+
+        _audioSampleBuffers.Add(buffer, new LoadedAudioSample(buffer));
+        return new ClydeHandle(Interlocked.Increment(ref _nextClydeHandle));
+    }
+
     private static void RemoveEfx((int sourceHandle, int filterHandle) handles)
     {
         if (handles.filterHandle != 0)