Fix openAL's issue with unqueueing buffers

rwengine/src/audio/Sound.cpp

@@ -3,7 +3,7 @@
 #include "audio/SoundBuffer.hpp"
 
 Sound::~Sound() {
-    if (buffer) {
+    if (buffer && buffer->state == SoundBuffer::State::Playing) {
         stop();
     }
 }

rwengine/src/audio/SoundBuffer.hpp

@@ -28,12 +28,13 @@ struct SoundBuffer {
     void setMaxDistance(float maxDist);
 
     enum class State {
+        Created = 0,
         Stopped,
         Playing
     };
 
     ALuint source;
-    State state = State::Stopped;
+    State state = State::Created;
 private:
     ALuint buffer;
 };

rwengine/src/audio/SoundBufferStreamed.cpp

@@ -18,8 +18,16 @@ SoundBufferStreamed::SoundBufferStreamed() {
 }
 
 SoundBufferStreamed::~SoundBufferStreamed() {
-    alCheck(
-        alSourceUnqueueBuffers(source, kNrBuffersStreaming, buffers.data()));
+    std::lock_guard<std::mutex> lock(soundSource->mutex);
+
+    if (state == State::Created) {  // We should only clear queue
+        alSourcei(source, AL_BUFFER, 0);
+    } else {
+        auto nrBuffersToUnqueue = std::min(kNrBuffersStreaming, buffersUsed);
+        alCheck(
+            alSourceUnqueueBuffers(source, nrBuffersToUnqueue, buffers.data()));
+    }
+
     alCheck(alDeleteBuffers(kNrBuffersStreaming, buffers.data()));
 }
 
@@ -44,9 +52,10 @@ bool SoundBufferStreamed::bufferData(SoundSource &soundSource) {
             static_cast<ALsizei>(sizeOfNextChunk * sizeof(int16_t)),
             soundSource.sampleRate));
         streamedData++;
+        buffersUsed++;
     }
 
-    alCheck(alSourceQueueBuffers(source, kNrBuffersStreaming, buffers.data()));
+    alCheck(alSourceQueueBuffers(source, buffersUsed, buffers.data()));
 
     this->soundSource = &soundSource;
 
@@ -110,6 +119,7 @@ void SoundBufferStreamed::updateBuffers() {
                         sizeOfNextChunk * sizeof(int16_t),
                         soundSource->sampleRate));
                     streamedData++;
+                    buffersUsed++;
                     alCheck(alSourceQueueBuffers(source, 1, &bufid));
                 }
             }

rwengine/src/audio/SoundBufferStreamed.hpp

@@ -24,6 +24,7 @@ private:
     SoundSource* soundSource = nullptr;
     void updateBuffers();
     unsigned int streamedData = 0;
+    unsigned int buffersUsed = 0;
     std::array<ALuint, kNrBuffersStreaming> buffers;
     std::future<void> bufferingThread;
 };

tests/test_AudioLoading.cpp

@@ -7,9 +7,11 @@ BOOST_AUTO_TEST_SUITE(AudioLoadingTests, DATA_TEST_PREDICATE)
 
 // @todo Shfil119 implement
 // This test requires assets
-BOOST_AUTO_TEST_CASE(testBufferIsPlaying) {
+struct F {
     SoundManager manager{Global::get().e};
+};
 
+BOOST_FIXTURE_TEST_CASE(testBufferIsPlaying, F) {
     auto audioPath =
         Global::get().e->data->index.findFilePath("audio/A1_a.wav");
 
@@ -33,9 +35,7 @@ BOOST_AUTO_TEST_CASE(testBufferIsPlaying) {
     BOOST_REQUIRE(sound.isStopped() == true);
 }
 
-BOOST_AUTO_TEST_CASE(testDecodingFramesOfMusic) {
-    SoundManager manager{Global::get().e};
-
+BOOST_FIXTURE_TEST_CASE(testDecodingFramesOfMusic, F) {
     auto audioPath =
         Global::get().e->data->index.findFilePath("audio/A1_a.wav");
 
@@ -45,9 +45,7 @@ BOOST_AUTO_TEST_CASE(testDecodingFramesOfMusic) {
     BOOST_REQUIRE(sound.source->decodedFrames > 0);
 }
 
-BOOST_AUTO_TEST_CASE(testDecodingFramesOfSfx) {
-    SoundManager manager{Global::get().e};
-
+BOOST_FIXTURE_TEST_CASE(testDecodingFramesOfSfx, F) {
     manager.createSfxInstance(157);  // Callahan Bridge fire
 
     auto& sound = manager.getSfxSourceRef(157);