Changeset 68085 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jul 21, 2017 12:52:58 PM (8 years ago)

Author:

vboxsync

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

117124

Message:

Build fix.

Location:

trunk/src/VBox/Main/src-client

Files:

• DrvAudioVRDE.cpp (modified) (6 diffs)
• DrvAudioVideoRec.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

@@ -220 +220 @@
  */
 static DECLCALLBACK(int) drvAudioVRDEStreamCapture(PPDMIHOSTAUDIO pInterface,
-                                                   PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+                                                   PPDMAUDIOBACKENDSTREAM pStream, void *pvBuf, uint32_t cxBuf, uint32_t *pcxRead)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
-    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
-    /* pcbRead is optional. */
+    AssertReturn(cxBuf,         VERR_INVALID_PARAMETER);
+    /* pcxRead is optional. */
 
     PVRDESTREAM pStreamVRDE = (PVRDESTREAM)pStream;
@@ -236 +236 @@
         void *pvData;
 
-        RTCircBufAcquireReadBlock(pStreamVRDE->In.pCircBuf, cbBuf, &pvData, &cbData);
+        RTCircBufAcquireReadBlock(pStreamVRDE->In.pCircBuf, cxBuf, &pvData, &cbData);
 
         if (cbData)
@@ -244 +244 @@
     }
 
-    if (pcbRead)
-        *pcbRead = (uint32_t)cbData;
+    if (pcxRead)
+        *pcxRead = (uint32_t)cbData;
 
     return VINF_SUCCESS;
@@ -255 +255 @@
  */
 static DECLCALLBACK(int) drvAudioVRDEStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+                                                const void *pvBuf, uint32_t cxBuf, uint32_t *pcxWritten)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
-    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
-    /* pcbWritten is optional. */
+    AssertReturn(cxBuf,         VERR_INVALID_PARAMETER);
+    /* pcxWritten is optional. */
 
     PDRVAUDIOVRDE pDrv        = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
@@ -271 +271 @@
     /* Note: We get the number of *samples* in cbBuf
      *       (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout) on stream creation. */
-    uint32_t csLive           = cbBuf;
+    uint32_t csLive           = cxBuf;
 
     PPDMAUDIOPCMPROPS pProps  = &pStreamVRDE->pCfg->Props;
@@ -328 +328 @@
         /* Return samples instead of bytes here
          * (since we specified PDMAUDIOSTREAMLAYOUT_RAW as the audio data layout). */
-        if (pcbWritten)
-            *pcbWritten = csWritten;
+        if (pcxWritten)
+            *pcxWritten = csWritten;
     }
 

trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp

@@ -508 +508 @@
  */
 static DECLCALLBACK(int) drvAudioVideoRecStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                       void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
-{
-    RT_NOREF(pInterface, pStream, pvBuf, cbBuf);
-
-    if (pcbRead)
-        *pcbRead = 0;
+                                                       void *pvBuf, uint32_t cxBuf, uint32_t *pcxRead)
+{
+    RT_NOREF(pInterface, pStream, pvBuf, cxBuf);
+
+    if (pcxRead)
+        *pcxRead = 0;
 
     return VINF_SUCCESS;
@@ -523 +523 @@
  */
 static DECLCALLBACK(int) drvAudioVideoRecStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                    const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+                                                    const void *pvBuf, uint32_t cxBuf, uint32_t *pcxWritten)
 {
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf,      VERR_INVALID_POINTER);
-    AssertReturn(cbBuf,         VERR_INVALID_PARAMETER);
-    /* pcbWritten is optional. */
+    AssertReturn(cxBuf,         VERR_INVALID_PARAMETER);
+    /* pcxWritten is optional. */
 
     PDRVAUDIOVIDEOREC pThis     = PDMIHOSTAUDIO_2_DRVAUDIOVIDEOREC(pInterface);
@@ -551 +551 @@
     size_t cbCircBuf;
 
-    uint32_t cbToWrite = cbBuf;
+    uint32_t cbToWrite = cxBuf;
 
     /*
@@ -692 +692 @@
      * encoder actually did process those.
      */
-    if (pcbWritten)
-        *pcbWritten = cbWrittenTotal;
+    if (pcxWritten)
+        *pcxWritten = cbWrittenTotal;
 
     LogFlowFunc(("csReadTotal=%RU32, rc=%Rrc\n", cbWrittenTotal, rc));