Changeset 88027 in vbox

Timestamp:

Mar 8, 2021 6:55:08 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Preparing to move some of the DrvAudio.h stuff into PDM. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (5 diffs)
• DevIchAc97.cpp (modified) (1 diff)
• DrvAudio.h (modified) (1 diff)
• DrvAudioCommon.cpp (modified) (3 diffs)
• DrvHostDSound.cpp (modified) (3 diffs)
• DrvHostPulseAudio.cpp (modified) (2 diffs)
• HDACodec.cpp (modified) (1 diff)

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

@@ -2427 +2427 @@
 
         AssertPtr(pSink->pMixSink);
-        LogFlowFunc(("Sink=%s, Mixer control=%s\n", pSink->pMixSink->pszName, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl)));
+        LogFlowFunc(("Sink=%s, Mixer control=%s\n", pSink->pMixSink->pszName, PDMAudioMixerCtlGetName(enmMixerCtl)));
     }
     else
@@ -2503 +2503 @@
         rc = VERR_NOT_FOUND;
 
-    LogFunc(("Mixer control=%s, rc=%Rrc\n", DrvAudioHlpAudMixerCtlToStr(enmMixerCtl), rc));
+    LogFunc(("Mixer control=%s, rc=%Rrc\n", PDMAudioMixerCtlGetName(enmMixerCtl), rc));
     return rc;
 }
@@ -2516 +2516 @@
     PHDASTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PHDASTATE);
     PHDASTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATER3);
-    LogFunc(("enmMixerCtl=%s, uSD=%RU8, uChannel=%RU8\n", DrvAudioHlpAudMixerCtlToStr(enmMixerCtl), uSD, uChannel));
+    LogFunc(("enmMixerCtl=%s, uSD=%RU8, uChannel=%RU8\n", PDMAudioMixerCtlGetName(enmMixerCtl), uSD, uChannel));
 
     if (uSD == 0) /* Stream number 0 is reserved. */
     {
-        Log2Func(("Invalid SDn (%RU8) number for mixer control '%s', ignoring\n", uSD, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl)));
+        Log2Func(("Invalid SDn (%RU8) number for mixer control '%s', ignoring\n", uSD, PDMAudioMixerCtlGetName(enmMixerCtl)));
         return VINF_SUCCESS;
     }
@@ -2583 +2583 @@
         {
             LogRel2(("HDA: Setting sink '%s' to stream #%RU8 (channel %RU8), mixer control=%s\n",
-                     pSink->pMixSink->pszName, uSD, uChannel, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl)));
+                     pSink->pMixSink->pszName, uSD, uChannel, PDMAudioMixerCtlGetName(enmMixerCtl)));
 
             PHDASTREAMR3 pStreamR3     = &pThisCC->aStreams[uSD];
@@ -2604 +2604 @@
     if (RT_FAILURE(rc))
         LogRel(("HDA: Converter control for stream #%RU8 (channel %RU8) / mixer control '%s' failed with %Rrc, skipping\n",
-                uSD, uChannel, DrvAudioHlpAudMixerCtlToStr(enmMixerCtl), rc));
+                uSD, uChannel, PDMAudioMixerCtlGetName(enmMixerCtl), rc));
 
     LogFlowFuncLeaveRC(rc);

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

@@ -2618 +2618 @@
     ls = ichac97R3RecSourceToIdx(als);
 
-    LogRel(("AC97: Record select to left=%s, right=%s\n", DrvAudioHlpRecSrcToStr(ars), DrvAudioHlpRecSrcToStr(als)));
+    LogRel(("AC97: Record select to left=%s, right=%s\n", PDMAudioRecSrcGetName(ars), PDMAudioRecSrcGetName(als)));
 
     ichac97MixerSet(pThis, AC97_Record_Select, rs | (ls << 8));

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

@@ -279 +279 @@
 /** @name Audio string-ify methods.
  * @{ */
-const char *DrvAudioHlpAudMixerCtlToStr(PDMAUDIOMIXERCTL enmMixerCtl);
-const char *DrvAudioHlpPlaybackDstToStr(const PDMAUDIOPLAYBACKDST enmPlaybackDst);
-const char *DrvAudioHlpRecSrcToStr(const PDMAUDIORECSRC enmRecSource);
+const char *PDMAudioMixerCtlGetName(PDMAUDIOMIXERCTL enmMixerCtl);
+const char *PDMAudioPlaybackDstGetName(const PDMAUDIOPLAYBACKDST enmPlaybackDst);
+const char *PDMAudioRecSrcGetName(const PDMAUDIORECSRC enmRecSource);
 PDMAUDIOFMT DrvAudioHlpStrToAudFmt(const char *pszFmt);
 char *DrvAudioHlpAudDevFlagsToStrA(uint32_t fFlags);

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

@@ -500 +500 @@
  * @param   enmMixerCtl         Audio mixer control to convert.
  */
-const char *DrvAudioHlpAudMixerCtlToStr(PDMAUDIOMIXERCTL enmMixerCtl)
+const char *PDMAudioMixerCtlGetName(PDMAUDIOMIXERCTL enmMixerCtl)
 {
     switch (enmMixerCtl)
@@ -576 +576 @@
  * @param   enmPlaybackDst      Playback destination to convert.
  */
-const char *DrvAudioHlpPlaybackDstToStr(const PDMAUDIOPLAYBACKDST enmPlaybackDst)
+const char *PDMAudioPlaybackDstGetName(const PDMAUDIOPLAYBACKDST enmPlaybackDst)
 {
     switch (enmPlaybackDst)
@@ -598 +598 @@
  * @param   enmRecSrc           Recording source to convert.
  */
-const char *DrvAudioHlpRecSrcToStr(const PDMAUDIORECSRC enmRecSrc)
+const char *PDMAudioRecSrcGetName(const PDMAUDIORECSRC enmRecSrc)
 {
     switch (enmRecSrc)

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

@@ -1163 +1163 @@
         {
             DSLOG(("DSound: Guest source '%s' is using host recording device '%s'\n",
-                   DrvAudioHlpRecSrcToStr(pCfg->u.enmSrc), pDev->szName));
+                   PDMAudioRecSrcGetName(pCfg->u.enmSrc), pDev->szName));
 
             PDSOUNDDEV pDSoundDev = (PDSOUNDDEV)pDev->pvData;
@@ -1182 +1182 @@
     /* This always has to be in the release log. */
     LogRel(("DSound: Guest source '%s' is using host recording device with GUID '%s'\n",
-            DrvAudioHlpRecSrcToStr(pCfg->u.enmSrc), pszGUID ? pszGUID: "{?}"));
+            PDMAudioRecSrcGetName(pCfg->u.enmSrc), pszGUID ? pszGUID: "{?}"));
 
     if (pszGUID)
@@ -2086 +2086 @@
 {
     LogFunc(("pStreamDS=%p, pCfgReq=%p, enmRecSource=%s\n",
-             pStreamDS, pCfgReq, DrvAudioHlpRecSrcToStr(pCfgReq->u.enmSrc)));
+             pStreamDS, pCfgReq, PDMAudioRecSrcGetName(pCfgReq->u.enmSrc)));
 
     int rc = VINF_SUCCESS;

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

@@ -811 +811 @@
 
     char szName[256];
-    RTStrPrintf(szName, sizeof(szName), "VirtualBox %s [%s]", DrvAudioHlpPlaybackDstToStr(pCfgReq->u.enmDst), pThis->szStreamName);
+    RTStrPrintf(szName, sizeof(szName), "VirtualBox %s [%s]", PDMAudioPlaybackDstGetName(pCfgReq->u.enmDst), pThis->szStreamName);
 
     /* Note that the struct BufAttr is updated to the obtained values after this call! */
@@ -855 +855 @@
 
     char szName[256];
-    RTStrPrintf(szName, sizeof(szName), "VirtualBox %s [%s]", DrvAudioHlpRecSrcToStr(pCfgReq->u.enmSrc), pThis->szStreamName);
+    RTStrPrintf(szName, sizeof(szName), "VirtualBox %s [%s]", PDMAudioRecSrcGetName(pCfgReq->u.enmSrc), pThis->szStreamName);
 
     /* Note: Other members of BufAttr are ignored for record streams. */

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

@@ -898 +898 @@
 
     LogRel2(("HDA: Setting volume for mixer control '%s' to %RU8/%RU8 (%s)\n",
-             DrvAudioHlpAudMixerCtlToStr(enmMixerCtl), lVol, rVol, RT_BOOL(iMute) ? "Muted" : "Unmuted"));
+             PDMAudioMixerCtlGetName(enmMixerCtl), lVol, rVol, RT_BOOL(iMute) ? "Muted" : "Unmuted"));
 
     return pThisCC->pfnCbMixerSetVolume(pThisCC->pDevIns, enmMixerCtl, &Vol);