Changeset 88283 in vbox for trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp

Timestamp:

Mar 24, 2021 7:00:13 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143494

Message:

Audio: Cleaned up the alsa and pulse audio play methods. Two doxygen fixes. [tweaks] bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp

@@ -798 +798 @@
                     if (cFramesWritten == -EPIPE)
                     {
-                        /* underrun occurred */
+                        /* Underrun occurred. */
                         rc = alsaStreamRecover(pStreamALSA->phPCM);
-                        if (RT_SUCCESS(rc))
-                            LogFlowFunc(("Recovered from playback (iTry=%u)\n", iTry));
-                        else
+                        if (RT_FAILURE(rc))
                             break;
+                        LogFlowFunc(("Recovered from playback (iTry=%u)\n", iTry));
                     }
                     else
                     {
-                        /* an suspended event occurred, needs resuming. */
+                        /* An suspended event occurred, needs resuming. */
                         rc = alsaStreamResume(pStreamALSA->phPCM);
-                        if (RT_SUCCESS(rc))
-                            LogFlowFunc(("Resumed suspended output stream (iTry=%u)\n", iTry));
-                        else
+                        if (RT_FAILURE(rc))
                         {
                             LogRel(("ALSA: Failed to resume output stream (iTry=%u, rc=%Rrc)\n", iTry, rc));
                             break;
                         }
+                        LogFlowFunc(("Resumed suspended output stream (iTry=%u)\n", iTry));
                     }
 
@@ -827 +825 @@
                     }
                     LogFunc(("snd_pcm_writei w/ cbToWrite=%u -> %ld [cFramesAvail=%ld, iTry=%d]\n", cbToWrite, cFramesWritten, cFramesAvail, iTry));
-                } /* For number of tries. */
-
-                /* Make sure we return with an error. */
+                }
+
+                /* Make sure we return with an error status. */
                 if (RT_SUCCESS_NP(rc))
                 {