Index: trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp
===================================================================
--- trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp	(revision 88022)
+++ trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp	(revision 88023)
@@ -621,5 +621,5 @@
  * @param   enmFmt              Audio format to retrieve value for.
  */
-bool DrvAudioHlpAudFmtIsSigned(PDMAUDIOFMT enmFmt)
+bool PDMAudioFormatIsSigned(PDMAUDIOFMT enmFmt)
 {
     switch (enmFmt)
@@ -650,5 +650,5 @@
  * @param   enmFmt              Audio format to retrieve value for.
  */
-uint8_t DrvAudioHlpAudFmtToBits(PDMAUDIOFMT enmFmt)
+uint8_t PDMAudioFormatGetBits(PDMAUDIOFMT enmFmt)
 {
     switch (enmFmt)
@@ -742,5 +742,5 @@
  * @param   pCfg                Stream configuration to initialize.
  */
-void DrvAudioHlpStreamCfgInit(PPDMAUDIOSTREAMCFG pCfg)
+void PDMAudioStrmCfgInit(PPDMAUDIOSTREAMCFG pCfg)
 {
     AssertPtrReturnVoid(pCfg);
@@ -758,10 +758,10 @@
  * @param   pProps      PCM properties to use.
  */
-int DrvAudioHlpStreamCfgInitFromPcmProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
+int PDMAudioStrmCfgInitWithProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pProps, VERR_INVALID_POINTER);
     AssertPtrReturn(pCfg,   VERR_INVALID_POINTER);
 
-    DrvAudioHlpStreamCfgInit(pCfg);
+    PDMAudioStrmCfgInit(pCfg);
 
     memcpy(&pCfg->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
@@ -798,5 +798,5 @@
  * @param   pProps  PCM properties to match with.
  */
-bool DrvAudioHlpStreamCfgMatchesPcmProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
+bool PDMAudioStrmCfgMatchesProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
 {
     AssertPtrReturn(pCfg, false);
@@ -809,5 +809,5 @@
  * @param   pCfg                Audio stream configuration to free.
  */
-void DrvAudioHlpStreamCfgFree(PPDMAUDIOSTREAMCFG pCfg)
+void PDMAudioStrmCfgFree(PPDMAUDIOSTREAMCFG pCfg)
 {
     if (pCfg)
@@ -825,5 +825,5 @@
  * @param   pSrcCfg             Source stream configuration to copy to destination.
  */
-int DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg)
+int PDMAudioStrmCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg)
 {
     AssertPtrReturn(pDstCfg, VERR_INVALID_POINTER);
@@ -845,10 +845,10 @@
 /**
  * Duplicates an audio stream configuration.
- * Must be free'd with DrvAudioHlpStreamCfgFree().
+ * Must be free'd with PDMAudioStrmCfgFree().
  *
  * @return  Duplicates audio stream configuration on success, or NULL on failure.
  * @param   pCfg                    Audio stream configuration to duplicate.
  */
-PPDMAUDIOSTREAMCFG DrvAudioHlpStreamCfgDup(PCPDMAUDIOSTREAMCFG pCfg)
+PPDMAUDIOSTREAMCFG PDMAudioStrmCfgDup(PCPDMAUDIOSTREAMCFG pCfg)
 {
     AssertPtrReturn(pCfg, NULL);
@@ -866,8 +866,8 @@
         return NULL;
 
-    int rc2 = DrvAudioHlpStreamCfgCopy(pDst, pCfg);
+    int rc2 = PDMAudioStrmCfgCopy(pDst, pCfg);
     if (RT_FAILURE(rc2))
     {
-        DrvAudioHlpStreamCfgFree(pDst);
+        PDMAudioStrmCfgFree(pDst);
         pDst = NULL;
     }
@@ -882,12 +882,9 @@
  * @param   pCfg                Stream configuration to log.
  */
-void DrvAudioHlpStreamCfgPrint(PCPDMAUDIOSTREAMCFG pCfg)
-{
-    if (!pCfg)
-        return;
-
-    LogFunc(("szName=%s, enmDir=%RU32 (uHz=%RU32, cBits=%RU8%s, cChannels=%RU8)\n",
-             pCfg->szName, pCfg->enmDir,
-             pCfg->Props.uHz, pCfg->Props.cbSample * 8, pCfg->Props.fSigned ? "S" : "U", pCfg->Props.cChannels));
+void PDMAudioStrmCfgLog(PCPDMAUDIOSTREAMCFG pCfg)
+{
+    if (pCfg)
+        LogFunc(("szName=%s enmDir=%RU32 uHz=%RU32 cBits=%RU8%s cChannels=%RU8\n", pCfg->szName, pCfg->enmDir,
+                 pCfg->Props.uHz, pCfg->Props.cbSample * 8, pCfg->Props.fSigned ? "S" : "U", pCfg->Props.cChannels));
 }
 
@@ -999,5 +996,5 @@
 uint32_t PDMAudioPropsGetBitrate(PCPDMAUDIOPCMPROPS pProps)
 {
-    return DrvAudioHlpCalcBitrate(pProps->cbSample * 8, pProps->uHz, pProps->cChannels);
+    return pProps->cbSample * pProps->cChannels * pProps->uHz * 8;
 }
 
