Changeset 68599 in vbox

Timestamp:

Sep 1, 2017 12:16:50 PM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvHostDSound.cpp: Integrated r117818 from 5.1 into trunk.

File:

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

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

@@ -206 +206 @@
 *********************************************************************************************************************************/
 static HRESULT  directSoundPlayRestore(PDRVHOSTDSOUND pThis, LPDIRECTSOUNDBUFFER8 pDSB);
+static HRESULT  directSoundCaptureStop(PDSOUNDSTREAM pStreamDS);
+
 static void     dsoundDeviceRemove(PDSOUNDDEV pDev);
 static int      dsoundDevicesEnumerate(PDRVHOSTDSOUND pThis, PPDMAUDIOBACKENDCFG pCfg);
@@ -1033 +1035 @@
     if (pStreamDS->In.pDSCB)
     {
-        hr = IDirectSoundCaptureBuffer_Stop(pStreamDS->In.pDSCB);
+        hr = directSoundCaptureStop(pStreamDS);
         if (SUCCEEDED(hr))
         {
@@ -1193 +1195 @@
 
 
-static HRESULT directSoundCaptureStop(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS)
-{
-    AssertPtrReturn(pThis,     E_POINTER);
+static HRESULT directSoundCaptureStop(PDSOUNDSTREAM pStreamDS)
+{
     AssertPtrReturn(pStreamDS, E_POINTER);
 
-    RT_NOREF(pThis);
-
     HRESULT hr = S_OK;
 
@@ -1209 +1208 @@
 
             hr = IDirectSoundCaptureBuffer_Stop(pStreamDS->In.pDSCB);
-            if (FAILED(hr))
-                DSLOGREL(("DSound: Stopping capture buffer failed with %Rhrc\n", hr));
-
-            pStreamDS->fEnabled = false;
-        }
-    }
-
-    LogFlowFunc(("Returning %Rhrc\n", hr));
+            if (SUCCEEDED(hr))
+                pStreamDS->fEnabled = false;
+        }
+    }
+
+    if (FAILED(hr))
+        DSLOGREL(("DSound: Stopping capture buffer failed with %Rhrc\n", hr));
+
     return hr;
 }
@@ -1779 +1778 @@
         case PDMAUDIOSTREAMCMD_PAUSE:
         {
-            hr = directSoundCaptureStop(pThis, pStreamDS);
+            hr = directSoundCaptureStop(pStreamDS);
             if (FAILED(hr))
                 rc = VERR_NOT_SUPPORTED;