xrSound/SoundRender_TargetA.cpp: Refactored update() function

Co-Authored-By: kcat <kcat@users.noreply.github.com>
Co-Authored-By: Mr. KRodin <krodinn@users.noreply.github.com>

Author: ForserX

src/xrSound/SoundRender_TargetA.cpp

@@ -97,42 +97,47 @@ void CSoundRender_TargetA::update()
 {
     inherited::update();
 
-    ALint processed;
-    // Get status
-    A_CHK(alGetSourcei(pSource, AL_BUFFERS_PROCESSED, &processed));
+    ALint processed, state;
+    ALenum error;
 
-    if (processed > 0)
+    /* Get relevant source info */
+    alGetSourcei(pSource, AL_SOURCE_STATE, &state);
+    alGetSourcei(pSource, AL_BUFFERS_PROCESSED, &processed);
+    if ((error = alGetError()) != AL_NO_ERROR)
     {
-        while (processed)
+        Msg("! %s:: source state check failed (0x%d)", __FUNCTION__, error);
+        return;
+    }
+
+    while (processed > 0)
+    {
+        ALuint BufferID;
+        A_CHK(alSourceUnqueueBuffers(pSource, 1, &BufferID));
+        fill_block(BufferID);
+        A_CHK(alSourceQueueBuffers(pSource, 1, &BufferID));
+        processed--;
+        if ((error = alGetError()) != AL_NO_ERROR)
         {
-            ALuint BufferID;
-            A_CHK(alSourceUnqueueBuffers(pSource, 1, &BufferID));
-            fill_block(BufferID);
-            A_CHK(alSourceQueueBuffers(pSource, 1, &BufferID));
-            --processed;
+            Msg("! %s:: buffering data failed (0x%d)", __FUNCTION__, error);
+            return;
         }
-
-        // kcat: If there's a long enough freeze and the sources underrun, they go to an AL_STOPPED state.
-        // That update function will correctly see this and remove/refill/requeue the buffers, but doesn't restart the source
-        // (that's in the separate else block that didn't run this time).Because the source remains AL_STOPPED,
-        // the next update will still see all the buffers marked as processed and remove / refill / requeue them again.
-        // It keeps doing this and never actually restarts the source after an underrun.
-        ALint state;
-        A_CHK(alGetSourcei(pSource, AL_SOURCE_STATE, &state));
-        if (state == AL_STOPPED)
-            A_CHK(alSourcePlay(pSource));
-        //
     }
-    else
+
+    /* Make sure the source hasn't underrun */
+    if (state != AL_PLAYING && state != AL_PAUSED)
     {
-        // processed == 0
-        // check play status -- if stopped then queue is not being filled fast enough
-        ALint state;
-        A_CHK(alGetSourcei(pSource, AL_SOURCE_STATE, &state));
-        if (state != AL_PLAYING)
+        ALint queued;
+
+        /* If no buffers are queued, playback is finished */
+        alGetSourcei(pSource, AL_BUFFERS_QUEUED, &queued);
+        if (queued == 0)
+            return;
+
+        alSourcePlay(pSource);
+        if ((error = alGetError()) != AL_NO_ERROR)
         {
-            //Log("Queuing underrun detected.");
-            A_CHK(alSourcePlay(pSource));
+            Msg("! %s:: restarting playback failed (0x%d)", __FUNCTION__, error);
+            return;
         }
     }
 }