Changeset 107589 in vbox for trunk

Timestamp:

Jan 9, 2025 11:16:11 AM (10 days ago)

Author:

vboxsync

Message:

src/VBox/Devices/Audio/AudioMixer.cpp: Fixed warnings found by Parfait (assignment unused). This will only try re-initializing the mixing buffer peek/write state if re-initializing the stream was successful. Needs review. jiraref:VBP-1424

File:

• trunk/src/VBox/Devices/Audio/AudioMixer.cpp (modified) (1 diff)

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

@@ -2598 +2598 @@
             LogFunc(("[%s] re-init returns %Rrc and %s.\n", pMixStream->pszName, rc, PDMAudioStreamStateGetName(enmState)));
 
-            PAUDMIXSINK const pSink = pMixStream->pSink;
-            AssertPtr(pSink);
-            if (pSink->enmDir == PDMAUDIODIR_OUT)
+            if (RT_SUCCESS(rc))
             {
-                rc = AudioMixBufInitPeekState(&pSink->MixBuf, &pMixStream->PeekState, &pStream->Cfg.Props);
-                /** @todo we need to remember this, don't we? */
-                AssertLogRelRCReturn(rc, VINF_SUCCESS);
-            }
-            else
-            {
-                rc = AudioMixBufInitWriteState(&pSink->MixBuf, &pMixStream->WriteState, &pStream->Cfg.Props);
-                /** @todo we need to remember this, don't we? */
-                AssertLogRelRCReturn(rc, VINF_SUCCESS);
+                PAUDMIXSINK const pSink = pMixStream->pSink;
+                AssertPtr(pSink);
+                if (pSink->enmDir == PDMAUDIODIR_OUT)
+                {
+                    rc = AudioMixBufInitPeekState(&pSink->MixBuf, &pMixStream->PeekState, &pStream->Cfg.Props);
+                    AssertLogRelRCReturnStmt(rc, enmState = PDMAUDIOSTREAMSTATE_NOT_WORKING, VINF_SUCCESS);
+                }
+                else
+                {
+                    rc = AudioMixBufInitWriteState(&pSink->MixBuf, &pMixStream->WriteState, &pStream->Cfg.Props);
+                    AssertLogRelRCReturnStmt(rc, enmState = PDMAUDIOSTREAMSTATE_NOT_WORKING, VINF_SUCCESS);
+                }
             }
         }