Changeset 59029 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 7, 2015 4:11:22 PM (9 years ago)

Author:

vboxsync

Message:

Audio: DrvHostDSound.cpp: Also check return values when stopping playback/capturing, update fEnabledIn.

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (11 diffs)

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

@@ -719 +719 @@
 }
 
-static void directSoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
-{
-    AssertPtrReturnVoid(pThis);
-    AssertPtrReturnVoid(pDSoundStrmOut);
+static HRESULT directSoundPlayStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAMOUT pDSoundStrmOut)
+{
+    AssertPtrReturn(pThis, E_POINTER);
+    AssertPtrReturn(pDSoundStrmOut, E_POINTER);
+
+    HRESULT hr;
 
     if (pDSoundStrmOut->pDSB != NULL)
@@ -731 +733 @@
         DSLOG(("DSound: Stopping playback\n"));
 
-        /* @todo Wait until all data in the buffer has been played. */
-        HRESULT hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
+        /** @todo Wait until all data in the buffer has been played. */
+        hr = IDirectSoundBuffer8_Stop(pDSoundStrmOut->pDSB);
         if (SUCCEEDED(hr))
             dsoundPlayClearSamples(pDSoundStrmOut);
@@ -738 +740 @@
             DSLOGREL(("DSound: Stop playback %Rhrc\n", hr));
     }
+    else
+        hr = E_UNEXPECTED;
+
+    return hr;
 }
 
@@ -1013 +1019 @@
 }
 
-static void directSoundCaptureStop(PDSOUNDSTREAMIN pDSoundStrmIn)
-{
-    AssertPtrReturnVoid(pDSoundStrmIn);
+static HRESULT directSoundCaptureStop(PDSOUNDSTREAMIN pDSoundStrmIn)
+{
+    AssertPtrReturn(pDSoundStrmIn, E_POINTER);
+
+    HRESULT hr;
 
     if (pDSoundStrmIn->pDSCB)
@@ -1021 +1029 @@
         DSLOG(("DSound: Stopping capture\n"));
 
-        HRESULT hr = IDirectSoundCaptureBuffer_Stop(pDSoundStrmIn->pDSCB);
+        hr = IDirectSoundCaptureBuffer_Stop(pDSoundStrmIn->pDSCB);
         if (FAILED(hr))
             DSLOGREL(("DSound: Capture buffer stop %Rhrc\n", hr));
     }
+    else
+        hr = E_UNEXPECTED;
+
+    return hr;
 }
 
@@ -1221 +1233 @@
 
     int rc = VINF_SUCCESS;
+
+    HRESULT hr;
     switch (enmStreamCmd)
     {
@@ -1227 +1241 @@
             DSLOG(("DSound: Playback PDMAUDIOSTREAMCMD_ENABLE\n"));
             /* Try to start playback. If it fails, then reopen and try again. */
-            HRESULT hr = directSoundPlayStart(pDSoundStrmOut);
+            hr = directSoundPlayStart(pDSoundStrmOut);
             if (FAILED(hr))
             {
@@ -1246 +1260 @@
         {
             DSLOG(("DSound: Playback PDMAUDIOSTREAMCMD_DISABLE\n"));
-            directSoundPlayStop(pThis, pDSoundStrmOut);
+            hr = directSoundPlayStop(pThis, pDSoundStrmOut);
+            if (SUCCEEDED(hr))
+                pThis->fEnabledOut = false;
             break;
         }
@@ -1466 +1482 @@
     int rc = VINF_SUCCESS;
 
+    HRESULT hr;
     switch (enmStreamCmd)
     {
@@ -1471 +1488 @@
         {
             /* Try to start capture. If it fails, then reopen and try again. */
-            HRESULT hr = directSoundCaptureStart(pThis, pDSoundStrmIn);
+            hr = directSoundCaptureStart(pThis, pDSoundStrmIn);
             if (FAILED(hr))
             {
@@ -1489 +1506 @@
         case PDMAUDIOSTREAMCMD_DISABLE:
         {
-            directSoundCaptureStop(pDSoundStrmIn);
+            hr = directSoundCaptureStop(pDSoundStrmIn);
+            if (SUCCEEDED(hr))
+                pThis->fEnabledIn = false;
             break;
         }