Changeset 73611 in vbox

Timestamp:

Aug 10, 2018 8:51:03 AM (7 years ago)

Author:

vboxsync

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

124255

Message:

Audio: Renamed the (tweakable) per-driver CFGM options to make it easier remembering them.

Location:

trunk/src/VBox

Files:

• Devices/Audio/DrvAudio.cpp (modified) (6 diffs)
• Devices/Audio/DrvAudio.h (modified) (2 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -2183 +2183 @@
 
     /* Buffering stuff. */
-    CFGMR3QueryU32Def(pNode, "PeriodMs",     &pCfg->uPeriodMs, 0);
-    CFGMR3QueryU32Def(pNode, "BufferSizeMs", &pCfg->uBufferSizeMs, 0);
-    CFGMR3QueryU32Def(pNode, "PreBufferMs",  &pCfg->uPreBufMs, UINT32_MAX /* No custom value set */);
-
-    LogFunc(("pCfg=%p, uPeriodMs=%RU32, uBufferSizeMs=%RU32, uPreBufMs=%RU32\n",
-             pCfg, pCfg->uPeriodMs, pCfg->uBufferSizeMs, pCfg->uPreBufMs));
+    CFGMR3QueryU32Def(pNode, "PeriodSizeMs",    &pCfg->uPeriodSizeMs, 0);
+    CFGMR3QueryU32Def(pNode, "BufferSizeMs",    &pCfg->uBufferSizeMs, 0);
+    CFGMR3QueryU32Def(pNode, "PreBufferSizeMs", &pCfg->uPreBufSizeMs, UINT32_MAX /* No custom value set */);
+
+    LogFunc(("pCfg=%p, uPeriodSizeMs=%RU32, uBufferSizeMs=%RU32, uPreBufSizeMs=%RU32\n",
+             pCfg, pCfg->uPeriodSizeMs, pCfg->uBufferSizeMs, pCfg->uPreBufSizeMs));
 
     return VINF_SUCCESS;
@@ -2938 +2938 @@
      * Period size
      */
-    if (pDrvCfg->uPeriodMs)
-        pCfgReq->Backend.cfPeriod = DrvAudioHlpMilliToFrames(pDrvCfg->uPeriodMs, &pCfgReq->Props);
+    if (pDrvCfg->uPeriodSizeMs)
+        pCfgReq->Backend.cfPeriod = DrvAudioHlpMilliToFrames(pDrvCfg->uPeriodSizeMs, &pCfgReq->Props);
     else /* Set default period size. */
         pCfgReq->Backend.cfPeriod = DrvAudioHlpMilliToFrames(200 /* ms */, &pCfgReq->Props);
 
     LogRel2(("Audio: Using %s period size (%RU64ms, %RU32 frames) for stream '%s'\n",
-             pDrvCfg->uPeriodMs ? "custom" : "default", DrvAudioHlpFramesToMilli(pCfgReq->Backend.cfPeriod, &pCfgReq->Props),
+             pDrvCfg->uPeriodSizeMs ? "custom" : "default", DrvAudioHlpFramesToMilli(pCfgReq->Backend.cfPeriod, &pCfgReq->Props),
              pCfgReq->Backend.cfPeriod, pStream->szName));
 
@@ -2962 +2962 @@
      * Pre-buffering size
      */
-    if (pDrvCfg->uPreBufMs != UINT32_MAX)
-    {
-        if (!pDrvCfg->uPreBufMs) /* Pre-buffering is set to disabled. */
+    if (pDrvCfg->uPreBufSizeMs != UINT32_MAX)
+    {
+        if (!pDrvCfg->uPreBufSizeMs) /* Pre-buffering is set to disabled. */
             LogRel2(("Audio: Using custom pre-buffering (disabled) for stream '%s'\n", pStream->szName));
-        pCfgReq->Backend.cfPreBuf = DrvAudioHlpMilliToFrames(pDrvCfg->uPreBufMs, &pCfgReq->Props);
+        pCfgReq->Backend.cfPreBuf = DrvAudioHlpMilliToFrames(pDrvCfg->uPreBufSizeMs, &pCfgReq->Props);
     }
     else /* Set default pre-buffering size. */
@@ -2972 +2972 @@
 
     LogRel2(("Audio: Using %s pre-buffering size (%RU64ms, %RU32 frames) for stream '%s'\n",
-             pDrvCfg->uPreBufMs != UINT32_MAX ? "custom" : "default", DrvAudioHlpFramesToMilli(pCfgReq->Backend.cfPreBuf, &pCfgReq->Props),
+             pDrvCfg->uPreBufSizeMs != UINT32_MAX ? "custom" : "default", DrvAudioHlpFramesToMilli(pCfgReq->Backend.cfPreBuf, &pCfgReq->Props),
              pCfgReq->Backend.cfPreBuf, pStream->szName));
 
@@ -3034 +3034 @@
     }
 
-    if (   pDrvCfg->uPeriodMs
+    if (   pDrvCfg->uPeriodSizeMs
         && pCfgAcq->Backend.cfPeriod != pCfgReq->Backend.cfPeriod)
     {
@@ -3041 +3041 @@
     }
 
-    if (   pDrvCfg->uPreBufMs != UINT32_MAX
+    if (   pDrvCfg->uPreBufSizeMs != UINT32_MAX
         && pCfgAcq->Backend.cfPreBuf != pCfgReq->Backend.cfPreBuf)
     {

trunk/src/VBox/Devices/Audio/DrvAudio.h

@@ -82 +82 @@
      *  This value reflects the time in between each hardware interrupt on the
      *  backend (host) side. */
-    uint32_t             uPeriodMs;
+    uint32_t             uPeriodSizeMs;
     /** Configures the (ring) buffer size (in ms). Often is a multiple of uPeriodMs. */
     uint32_t             uBufferSizeMs;
@@ -90 +90 @@
      *  Set to 0 to disable pre-buffering completely.
      *  By default set to UINT32_MAX if not set to a custom value. */
-    uint32_t             uPreBufMs;
+    uint32_t             uPreBufSizeMs;
     /** The driver's debugging configuration. */
     struct

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

@@ -3497 +3497 @@
         }
 
-        InsertConfigInteger(pCfg, "PeriodMs",
-                            i_getAudioDriverValU32(pVirtualBox, pMachine, pszDrvName, "PeriodMs", 0 /* Default */));
+        InsertConfigInteger(pCfg, "PeriodSizeMs",
+                            i_getAudioDriverValU32(pVirtualBox, pMachine, pszDrvName, "PeriodSizeMs", 0 /* Default */));
         InsertConfigInteger(pCfg, "BufferSizeMs",
                             i_getAudioDriverValU32(pVirtualBox, pMachine, pszDrvName, "BufferSizeMs", 0 /* Default */));
-        InsertConfigInteger(pCfg, "PreBufferMs",
-                            i_getAudioDriverValU32(pVirtualBox, pMachine, pszDrvName, "PreBufferMs", UINT32_MAX /* Default */));
+        InsertConfigInteger(pCfg, "PreBufferSizeMs",
+                            i_getAudioDriverValU32(pVirtualBox, pMachine, pszDrvName, "PreBufferSizeMs", UINT32_MAX /* Default */));
 
     PCFGMNODE pLunL1;