Changeset 89482 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jun 3, 2021 12:56:20 PM (4 years ago)

Author:

vboxsync

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

144838

Message:

DrvHostAudioPulseAudio: Cleaned up function prefix and struct names. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp (modified) (97 diffs)

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

@@ -50 +50 @@
 *   Defines                                                                                                                      *
 *********************************************************************************************************************************/
-/** Max number of errors reported by drvHostAudioPaError per instance.
+/** Max number of errors reported by drvHstAudPaError per instance.
  * @todo Make this configurable thru driver config. */
 #define VBOX_PULSEAUDIO_MAX_LOG_REL_ERRORS  99
 
 
-/** @name PULSEAUDIOENUMCBFLAGS_XXX
+/** @name DRVHSTAUDPAENUMCB_F_XXX
  * @{ */
 /** No flags specified. */
-#define PULSEAUDIOENUMCBFLAGS_NONE          0
+#define DRVHSTAUDPAENUMCB_F_NONE            0
 /** (Release) log found devices. */
-#define PULSEAUDIOENUMCBFLAGS_LOG           RT_BIT(0)
+#define DRVHSTAUDPAENUMCB_F_LOG             RT_BIT(0)
 /** Only do default devices. */
-#define PULSEAUDIOENUMCBFLAGS_DEFAULT_ONLY  RT_BIT(1)
+#define DRVHSTAUDPAENUMCB_F_DEFAULT_ONLY    RT_BIT(1)
 /** @} */
 
@@ -70 +70 @@
 *********************************************************************************************************************************/
 /** Pointer to the instance data for a pulse audio host audio driver. */
-typedef struct DRVHOSTPULSEAUDIO *PDRVHOSTPULSEAUDIO;
+typedef struct DRVHSTAUDPA *PDRVHSTAUDPA;
 
 
@@ -76 +76 @@
  * Callback context for the server init context state changed callback.
  */
-typedef struct PULSEAUDIOSTATECHGCTX
+typedef struct DRVHSTAUDPASTATECHGCTX
 {
     /** The event semaphore. */
@@ -82 +82 @@
     /** The returned context state. */
     pa_context_state_t volatile enmCtxState;
-} PULSEAUDIOSTATECHGCTX;
+} DRVHSTAUDPASTATECHGCTX;
 /** Pointer to a server init context state changed callback context. */
-typedef PULSEAUDIOSTATECHGCTX *PPULSEAUDIOSTATECHGCTX;
+typedef DRVHSTAUDPASTATECHGCTX *PDRVHSTAUDPASTATECHGCTX;
 
 
@@ -90 +90 @@
  * Enumeration callback context used by the pfnGetConfig code.
  */
-typedef struct PULSEAUDIOENUMCBCTX
+typedef struct DRVHSTAUDPAENUMCBCTX
 {
     /** Pointer to PulseAudio's threaded main loop. */
     pa_threaded_mainloop   *pMainLoop;
-    /** Enumeration flags, PULSEAUDIOENUMCBFLAGS_XXX. */
+    /** Enumeration flags, DRVHSTAUDPAENUMCB_F_XXX. */
     uint32_t                fFlags;
     /** VBox status code for the operation.
@@ -106 +106 @@
     /** The device enumeration to fill, NULL if pfnGetConfig context.   */
     PPDMAUDIOHOSTENUM       pDeviceEnum;
-} PULSEAUDIOENUMCBCTX;
+} DRVHSTAUDPAENUMCBCTX;
 /** Pointer to an enumeration callback context. */
-typedef PULSEAUDIOENUMCBCTX *PPULSEAUDIOENUMCBCTX;
+typedef DRVHSTAUDPAENUMCBCTX *PDRVHSTAUDPAENUMCBCTX;
 
 
@@ -114 +114 @@
  * Pulse audio device enumeration entry.
  */
-typedef struct PULSEAUDIODEVENTRY
+typedef struct DRVHSTAUDPADEVENTRY
 {
     /** The part we share with others. */
@@ -123 +123 @@
     RT_FLEXIBLE_ARRAY_EXTENSION
     char                    szPulseName[RT_FLEXIBLE_ARRAY];
-} PULSEAUDIODEVENTRY;
+} DRVHSTAUDPADEVENTRY;
 /** Pointer to a pulse audio device enumeration entry. */
-typedef PULSEAUDIODEVENTRY *PPULSEAUDIODEVENTRY;
+typedef DRVHSTAUDPADEVENTRY *PDRVHSTAUDPADEVENTRY;
 
 
@@ -131 +131 @@
  * Pulse audio stream data.
  */
-typedef struct PULSEAUDIOSTREAM
+typedef struct DRVHSTAUDPASTREAM
 {
     /** Common part. */
@@ -138 +138 @@
     PDMAUDIOSTREAMCFG       Cfg;
     /** Pointer to driver instance. */
-    PDRVHOSTPULSEAUDIO      pDrv;
+    PDRVHSTAUDPA      pDrv;
     /** Pointer to opaque PulseAudio stream. */
     pa_stream              *pStream;
@@ -177 +177 @@
     /** Pulse playback and buffer metrics. */
     pa_buffer_attr          BufAttr;
-} PULSEAUDIOSTREAM;
+} DRVHSTAUDPASTREAM;
 /** Pointer to pulse audio stream data. */
-typedef PULSEAUDIOSTREAM *PPULSEAUDIOSTREAM;
+typedef DRVHSTAUDPASTREAM *PDRVHSTAUDPASTREAM;
 
 
@@ -186 +186 @@
  * @implements PDMIAUDIOCONNECTOR
  */
-typedef struct DRVHOSTPULSEAUDIO
+typedef struct DRVHSTAUDPA
 {
     /** Pointer to the driver instance structure. */
@@ -209 +209 @@
     char                    szStreamName[64];
     /** Don't want to put this on the stack... */
-    PULSEAUDIOSTATECHGCTX   InitStateChgCtx;
+    DRVHSTAUDPASTATECHGCTX   InitStateChgCtx;
     /** Pointer to host audio interface. */
     PDMIHOSTAUDIO           IHostAudio;
-} DRVHOSTPULSEAUDIO;
+} DRVHSTAUDPA;
 
 
@@ -244 +244 @@
  * @param   rcPa    The error code to convert.
  */
-static int drvHostAudioPaErrorToVBox(int rcPa)
+static int drvHstAudPaErrorToVBox(int rcPa)
 {
     /** @todo Implement some PulseAudio -> VBox mapping here. */
@@ -260 +260 @@
  * @param   ...         Format string arguments.
  */
-static int drvHostAudioPaError(PDRVHOSTPULSEAUDIO pThis, const char *pszFormat, ...)
+static int drvHstAudPaError(PDRVHSTAUDPA pThis, const char *pszFormat, ...)
 {
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
@@ -266 +266 @@
 
     int const rcPa   = pa_context_errno(pThis->pContext);
-    int const rcVBox = drvHostAudioPaErrorToVBox(rcPa);
+    int const rcVBox = drvHstAudPaErrorToVBox(rcPa);
 
     if (   pThis->cLogErrors < VBOX_PULSEAUDIO_MAX_LOG_REL_ERRORS
@@ -288 +288 @@
  * mainloop might not have been entered yet.
  */
-static void drvHostAudioPaSignalWaiter(PDRVHOSTPULSEAUDIO pThis)
+static void drvHstAudPaSignalWaiter(PDRVHSTAUDPA pThis)
 {
     if (pThis)
@@ -301 +301 @@
  * Wrapper around pa_threaded_mainloop_wait().
  */
-static void drvHostAudioPaMainloopWait(PDRVHOSTPULSEAUDIO pThis)
+static void drvHstAudPaMainloopWait(PDRVHSTAUDPA pThis)
 {
     /** @todo r=bird: explain this logic. */
@@ -313 +313 @@
  * Pulse audio callback for context status changes, init variant.
  */
-static void drvHostAudioPaCtxCallbackStateChanged(pa_context *pCtx, void *pvUser)
+static void drvHstAudPaCtxCallbackStateChanged(pa_context *pCtx, void *pvUser)
 {
     AssertPtrReturnVoid(pCtx);
 
-    PDRVHOSTPULSEAUDIO pThis = (PDRVHOSTPULSEAUDIO)pvUser;
+    PDRVHSTAUDPA pThis = (PDRVHSTAUDPA)pvUser;
     AssertPtrReturnVoid(pThis);
 
@@ -325 +325 @@
         case PA_CONTEXT_TERMINATED:
         case PA_CONTEXT_FAILED:
-            drvHostAudioPaSignalWaiter(pThis);
+            drvHstAudPaSignalWaiter(pThis);
             break;
 
@@ -339 +339 @@
  * This will consume the pOperation reference.
  */
-static int drvHostAudioPaWaitForEx(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOperation, RTMSINTERVAL cMsTimeout)
+static int drvHstAudPaWaitForEx(PDRVHSTAUDPA pThis, pa_operation *pOperation, RTMSINTERVAL cMsTimeout)
 {
     AssertPtrReturn(pOperation, VERR_INVALID_POINTER);
@@ -348 +348 @@
     {
         if (!pThis->fAbortLoop) /** @todo r=bird: I do _not_ get the logic behind this fAbortLoop mechanism, it looks more
-                                 * than a little mixed up and too much generalized see drvHostAudioPaSignalWaiter. */
+                                 * than a little mixed up and too much generalized see drvHstAudPaSignalWaiter. */
         {
             AssertPtr(pThis->pMainLoop);
@@ -384 +384 @@
 
 
-static int drvHostAudioPaWaitFor(PDRVHOSTPULSEAUDIO pThis, pa_operation *pOP)
-{
-    return drvHostAudioPaWaitForEx(pThis, pOP, 10 * RT_MS_1SEC);
+static int drvHstAudPaWaitFor(PDRVHSTAUDPA pThis, pa_operation *pOP)
+{
+    return drvHstAudPaWaitForEx(pThis, pOP, 10 * RT_MS_1SEC);
 }
 
@@ -396 +396 @@
 
 /**
- * Worker for drvHostAudioPaEnumSourceCallback() and
- * drvHostAudioPaEnumSinkCallback() that adds an entry to the enumeration
+ * Worker for drvHstAudPaEnumSourceCallback() and
+ * drvHstAudPaEnumSinkCallback() that adds an entry to the enumeration
  * result.
  */
-static void drvHostAudioPaEnumAddDevice(PPULSEAUDIOENUMCBCTX pCbCtx, PDMAUDIODIR enmDir, const char *pszName,
+static void drvHstAudPaEnumAddDevice(PDRVHSTAUDPAENUMCBCTX pCbCtx, PDMAUDIODIR enmDir, const char *pszName,
                                         const char *pszDesc, uint8_t cChannelsInput, uint8_t cChannelsOutput,
                                         const char *pszDefaultName)
 {
-    size_t const cchName = strlen(pszName);
-    PPULSEAUDIODEVENTRY pDev = (PPULSEAUDIODEVENTRY)PDMAudioHostDevAlloc(RT_UOFFSETOF(PULSEAUDIODEVENTRY, szPulseName)
-                                                                         + RT_ALIGN_Z(cchName + 1, 16));
+    size_t const         cchName = strlen(pszName);
+    PDRVHSTAUDPADEVENTRY pDev    = (PDRVHSTAUDPADEVENTRY)PDMAudioHostDevAlloc(RT_UOFFSETOF(DRVHSTAUDPADEVENTRY, szPulseName)
+                                                                            + RT_ALIGN_Z(cchName + 1, 16));
     if (pDev != NULL)
     {
@@ -434 +434 @@
  * Enumeration callback - source info.
  *
- * @param   pCtx        The context (DRVHOSTPULSEAUDIO::pContext).
+ * @param   pCtx        The context (DRVHSTAUDPA::pContext).
  * @param   pInfo       The info.  NULL when @a eol is not zero.
  * @param   eol         Error-or-last indicator or something like that:
@@ -440 +440 @@
  *                          -  1: End of list, no info.
  *                          - -1: Error callback, no info.
- * @param   pvUserData  Pointer to our PULSEAUDIOENUMCBCTX structure.
- */
-static void drvHostAudioPaEnumSourceCallback(pa_context *pCtx, const pa_source_info *pInfo, int eol, void *pvUserData)
+ * @param   pvUserData  Pointer to our DRVHSTAUDPAENUMCBCTX structure.
+ */
+static void drvHstAudPaEnumSourceCallback(pa_context *pCtx, const pa_source_info *pInfo, int eol, void *pvUserData)
 {
     LogFlowFunc(("pCtx=%p pInfo=%p eol=%d pvUserData=%p\n", pCtx, pInfo, eol, pvUserData));
-    PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
+    PDRVHSTAUDPAENUMCBCTX pCbCtx = (PDRVHSTAUDPAENUMCBCTX)pvUserData;
     AssertPtrReturnVoid(pCbCtx);
     Assert((pInfo == NULL) == (eol != 0));
@@ -455 +455 @@
                  pInfo->index, pInfo->sample_spec.rate, pInfo->sample_spec.channels, pInfo->sample_spec.format,
                  pInfo->name, pInfo->description, pInfo->driver, pInfo->flags));
-        drvHostAudioPaEnumAddDevice(pCbCtx, PDMAUDIODIR_IN, pInfo->name, pInfo->description,
+        drvHstAudPaEnumAddDevice(pCbCtx, PDMAUDIODIR_IN, pInfo->name, pInfo->description,
                                     pInfo->sample_spec.channels, 0 /*cChannelsOutput*/, pCbCtx->pszDefaultSource);
     }
@@ -470 +470 @@
  * Enumeration callback - sink info.
  *
- * @param   pCtx        The context (DRVHOSTPULSEAUDIO::pContext).
+ * @param   pCtx        The context (DRVHSTAUDPA::pContext).
  * @param   pInfo       The info.  NULL when @a eol is not zero.
  * @param   eol         Error-or-last indicator or something like that:
@@ -476 +476 @@
  *                          -  1: End of list, no info.
  *                          - -1: Error callback, no info.
- * @param   pvUserData  Pointer to our PULSEAUDIOENUMCBCTX structure.
- */
-static void drvHostAudioPaEnumSinkCallback(pa_context *pCtx, const pa_sink_info *pInfo, int eol, void *pvUserData)
+ * @param   pvUserData  Pointer to our DRVHSTAUDPAENUMCBCTX structure.
+ */
+static void drvHstAudPaEnumSinkCallback(pa_context *pCtx, const pa_sink_info *pInfo, int eol, void *pvUserData)
 {
     LogFlowFunc(("pCtx=%p pInfo=%p eol=%d pvUserData=%p\n", pCtx, pInfo, eol, pvUserData));
-    PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
+    PDRVHSTAUDPAENUMCBCTX pCbCtx = (PDRVHSTAUDPAENUMCBCTX)pvUserData;
     AssertPtrReturnVoid(pCbCtx);
     Assert((pInfo == NULL) == (eol != 0));
@@ -491 +491 @@
                  pInfo->index, pInfo->sample_spec.rate, pInfo->sample_spec.channels, pInfo->sample_spec.format,
                  pInfo->name, pInfo->description, pInfo->driver, pInfo->flags));
-        drvHostAudioPaEnumAddDevice(pCbCtx, PDMAUDIODIR_OUT, pInfo->name, pInfo->description,
+        drvHstAudPaEnumAddDevice(pCbCtx, PDMAUDIODIR_OUT, pInfo->name, pInfo->description,
                                     0 /*cChannelsInput*/, pInfo->sample_spec.channels, pCbCtx->pszDefaultSink);
     }
@@ -508 +508 @@
  * Copy down the default names.
  */
-static void drvHostAudioPaEnumServerCallback(pa_context *pCtx, const pa_server_info *pInfo, void *pvUserData)
+static void drvHstAudPaEnumServerCallback(pa_context *pCtx, const pa_server_info *pInfo, void *pvUserData)
 {
     LogFlowFunc(("pCtx=%p pInfo=%p pvUserData=%p\n", pCtx, pInfo, pvUserData));
-    PPULSEAUDIOENUMCBCTX pCbCtx = (PPULSEAUDIOENUMCBCTX)pvUserData;
+    PDRVHSTAUDPAENUMCBCTX pCbCtx = (PDRVHSTAUDPAENUMCBCTX)pvUserData;
     AssertPtrReturnVoid(pCbCtx);
     RT_NOREF(pCtx);
@@ -551 +551 @@
  * @note Called with the PA main loop locked.
  */
-static int drvHostAudioPaEnumerate(PDRVHOSTPULSEAUDIO pThis, uint32_t fEnum, PPDMAUDIOHOSTENUM pDeviceEnum)
-{
-    PULSEAUDIOENUMCBCTX CbCtx        = { pThis->pMainLoop, fEnum, VERR_AUDIO_ENUMERATION_FAILED, NULL, NULL, pDeviceEnum };
-    bool const          fLog         = (fEnum & PULSEAUDIOENUMCBFLAGS_LOG);
-    bool const          fOnlyDefault = (fEnum & PULSEAUDIOENUMCBFLAGS_DEFAULT_ONLY);
-    int                 rc;
+static int drvHstAudPaEnumerate(PDRVHSTAUDPA pThis, uint32_t fEnum, PPDMAUDIOHOSTENUM pDeviceEnum)
+{
+    DRVHSTAUDPAENUMCBCTX CbCtx        = { pThis->pMainLoop, fEnum, VERR_AUDIO_ENUMERATION_FAILED, NULL, NULL, pDeviceEnum };
+    bool const           fLog         = (fEnum & DRVHSTAUDPAENUMCB_F_LOG);
+    bool const           fOnlyDefault = (fEnum & DRVHSTAUDPAENUMCB_F_DEFAULT_ONLY);
+    int                  rc;
 
     /*
@@ -564 +564 @@
     LogRel(("PulseAudio: Retrieving server information ...\n"));
     CbCtx.rcEnum = VERR_AUDIO_ENUMERATION_FAILED;
-    pa_operation *paOpServerInfo = pa_context_get_server_info(pThis->pContext, drvHostAudioPaEnumServerCallback, &CbCtx);
+    pa_operation *paOpServerInfo = pa_context_get_server_info(pThis->pContext, drvHstAudPaEnumServerCallback, &CbCtx);
     if (paOpServerInfo)
-        rc = drvHostAudioPaWaitFor(pThis, paOpServerInfo);
+        rc = drvHstAudPaWaitFor(pThis, paOpServerInfo);
     else
     {
@@ -593 +593 @@
         CbCtx.rcEnum = VERR_AUDIO_ENUMERATION_FAILED;
         if (!fOnlyDefault)
-            rc = drvHostAudioPaWaitFor(pThis,
-                                       pa_context_get_sink_info_list(pThis->pContext, drvHostAudioPaEnumSinkCallback, &CbCtx));
+            rc = drvHstAudPaWaitFor(pThis,
+                                       pa_context_get_sink_info_list(pThis->pContext, drvHstAudPaEnumSinkCallback, &CbCtx));
         else
-            rc = drvHostAudioPaWaitFor(pThis, pa_context_get_sink_info_by_name(pThis->pContext, CbCtx.pszDefaultSink,
-                                                                               drvHostAudioPaEnumSinkCallback, &CbCtx));
+            rc = drvHstAudPaWaitFor(pThis, pa_context_get_sink_info_by_name(pThis->pContext, CbCtx.pszDefaultSink,
+                                                                               drvHstAudPaEnumSinkCallback, &CbCtx));
         if (RT_SUCCESS(rc))
             rc = CbCtx.rcEnum;
@@ -617 +617 @@
         int rc2;
         if (!fOnlyDefault)
-            rc2 = drvHostAudioPaWaitFor(pThis, pa_context_get_source_info_list(pThis->pContext,
-                                                                               drvHostAudioPaEnumSourceCallback, &CbCtx));
+            rc2 = drvHstAudPaWaitFor(pThis, pa_context_get_source_info_list(pThis->pContext,
+                                                                               drvHstAudPaEnumSourceCallback, &CbCtx));
         else
-            rc2 = drvHostAudioPaWaitFor(pThis, pa_context_get_source_info_by_name(pThis->pContext, CbCtx.pszDefaultSource,
-                                                                                  drvHostAudioPaEnumSourceCallback, &CbCtx));
+            rc2 = drvHstAudPaWaitFor(pThis, pa_context_get_source_info_by_name(pThis->pContext, CbCtx.pszDefaultSource,
+                                                                                  drvHstAudPaEnumSourceCallback, &CbCtx));
         if (RT_SUCCESS(rc2))
             rc2 = CbCtx.rcEnum;
@@ -643 +643 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
-{
-    PDRVHOSTPULSEAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
+static DECLCALLBACK(int) drvHstAudPaHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
+{
+    PDRVHSTAUDPA pThis = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
 
@@ -652 +652 @@
      */
     RTStrCopy(pBackendCfg->szName, sizeof(pBackendCfg->szName), "PulseAudio");
-    pBackendCfg->cbStream       = sizeof(PULSEAUDIOSTREAM);
+    pBackendCfg->cbStream       = sizeof(DRVHSTAUDPASTREAM);
     pBackendCfg->fFlags         = 0;
     pBackendCfg->cMaxStreamsOut = UINT32_MAX;
@@ -664 +664 @@
     PDMAudioHostEnumInit(&DeviceEnum);
     pa_threaded_mainloop_lock(pThis->pMainLoop);
-    int rc = drvHostAudioPaEnumerate(pThis, PULSEAUDIOENUMCBFLAGS_DEFAULT_ONLY | PULSEAUDIOENUMCBFLAGS_LOG, &DeviceEnum);
+    int rc = drvHstAudPaEnumerate(pThis, DRVHSTAUDPAENUMCB_F_DEFAULT_ONLY | DRVHSTAUDPAENUMCB_F_LOG, &DeviceEnum);
     pa_threaded_mainloop_unlock(pThis->pMainLoop);
     AssertRCReturn(rc, rc);
@@ -679 +679 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetDevices}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_GetDevices(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHOSTENUM pDeviceEnum)
-{
-    PDRVHOSTPULSEAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
+static DECLCALLBACK(int) drvHstAudPaHA_GetDevices(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHOSTENUM pDeviceEnum)
+{
+    PDRVHSTAUDPA pThis = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
     AssertPtrReturn(pDeviceEnum, VERR_INVALID_POINTER);
     PDMAudioHostEnumInit(pDeviceEnum);
@@ -687 +687 @@
     /* Refine it or something (currently only some LogRel2 stuff): */
     pa_threaded_mainloop_lock(pThis->pMainLoop);
-    int rc = drvHostAudioPaEnumerate(pThis, PULSEAUDIOENUMCBFLAGS_NONE, pDeviceEnum);
+    int rc = drvHstAudPaEnumerate(pThis, DRVHSTAUDPAENUMCB_F_NONE, pDeviceEnum);
     pa_threaded_mainloop_unlock(pThis->pMainLoop);
     return rc;
@@ -696 +696 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHostAudioPaHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
+static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHstAudPaHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
 {
     RT_NOREF(pInterface, enmDir);
@@ -706 +706 @@
  * Stream status changed.
  */
-static void drvHostAudioPaStreamStateChangedCallback(pa_stream *pStream, void *pvUser)
+static void drvHstAudPaStreamStateChangedCallback(pa_stream *pStream, void *pvUser)
 {
     AssertPtrReturnVoid(pStream);
 
-    PDRVHOSTPULSEAUDIO pThis = (PDRVHOSTPULSEAUDIO)pvUser;
+    PDRVHSTAUDPA pThis = (PDRVHSTAUDPA)pvUser;
     AssertPtrReturnVoid(pThis);
 
@@ -718 +718 @@
         case PA_STREAM_FAILED:
         case PA_STREAM_TERMINATED:
-            drvHostAudioPaSignalWaiter(pThis);
+            drvHstAudPaSignalWaiter(pThis);
             break;
 
@@ -731 +731 @@
  * Debug PA callback: Need data to output.
  */
-static void drvHostAudioPaStreamReqWriteDebugCallback(pa_stream *pStream, size_t cbLen, void *pvContext)
+static void drvHstAudPaStreamReqWriteDebugCallback(pa_stream *pStream, size_t cbLen, void *pvContext)
 {
     RT_NOREF(cbLen, pvContext);
@@ -745 +745 @@
  * Debug PA callback: Underflow.  This may happen when draing/corking.
  */
-static void drvHostAudioPaStreamUnderflowDebugCallback(pa_stream *pStream, void *pvContext)
-{
-    PPULSEAUDIOSTREAM pStrm = (PPULSEAUDIOSTREAM)pvContext;
+static void drvHstAudPaStreamUnderflowDebugCallback(pa_stream *pStream, void *pvContext)
+{
+    PDRVHSTAUDPASTREAM pStrm = (PDRVHSTAUDPASTREAM)pvContext;
     AssertPtrReturnVoid(pStrm);
 
@@ -794 +794 @@
  * Debug PA callback: Overflow.  This may happen when draing/corking.
  */
-static void drvHostAudioPaStreamOverflowDebugCallback(pa_stream *pStream, void *pvContext)
+static void drvHstAudPaStreamOverflowDebugCallback(pa_stream *pStream, void *pvContext)
 {
     RT_NOREF(pStream, pvContext);
@@ -811 +811 @@
  * @param   pProps      The PDM audio source properties.
  */
-static pa_sample_format_t drvHostAudioPaPropsToPulse(PCPDMAUDIOPCMPROPS pProps)
+static pa_sample_format_t drvHstAudPaPropsToPulse(PCPDMAUDIOPCMPROPS pProps)
 {
     switch (PDMAudioPropsSampleSize(pProps))
@@ -849 +849 @@
  * @param   uHz         The frequency.
  */
-static int drvHostAudioPaToAudioProps(PPDMAUDIOPCMPROPS pProps, pa_sample_format_t enmPulseFmt, uint8_t cChannels, uint32_t uHz)
+static int drvHstAudPaToAudioProps(PPDMAUDIOPCMPROPS pProps, pa_sample_format_t enmPulseFmt, uint8_t cChannels, uint32_t uHz)
 {
     AssertReturn(cChannels > 0, VERR_INVALID_PARAMETER);
@@ -901 +901 @@
  * @note    Caller owns the mainloop lock.
  */
-static int drvHostAudioPaStreamCreateLocked(PDRVHOSTPULSEAUDIO pThis, PPULSEAUDIOSTREAM pStreamPA,
-                                            const char *pszName, PPDMAUDIOSTREAMCFG pCfgAcq)
+static int drvHstAudPaStreamCreateLocked(PDRVHSTAUDPA pThis, PDRVHSTAUDPASTREAM pStreamPA,
+                                         const char *pszName, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     /*
@@ -919 +919 @@
      */
 #ifdef DEBUG
-    pa_stream_set_write_callback(       pStream, drvHostAudioPaStreamReqWriteDebugCallback,  pStreamPA);
-    pa_stream_set_underflow_callback(   pStream, drvHostAudioPaStreamUnderflowDebugCallback, pStreamPA);
+    pa_stream_set_write_callback(       pStream, drvHstAudPaStreamReqWriteDebugCallback,  pStreamPA);
+    pa_stream_set_underflow_callback(   pStream, drvHstAudPaStreamUnderflowDebugCallback, pStreamPA);
     if (pCfgAcq->enmDir == PDMAUDIODIR_OUT)
-        pa_stream_set_overflow_callback(pStream, drvHostAudioPaStreamOverflowDebugCallback,  pStreamPA);
+        pa_stream_set_overflow_callback(pStream, drvHstAudPaStreamOverflowDebugCallback,  pStreamPA);
 #endif
-    pa_stream_set_state_callback(       pStream, drvHostAudioPaStreamStateChangedCallback,   pThis);
+    pa_stream_set_state_callback(       pStream, drvHstAudPaStreamStateChangedCallback,   pThis);
 
     /*
@@ -960 +960 @@
                && PA_STREAM_IS_GOOD(enmStreamState)
                && RTTimeNanoTS() - nsStart < RT_NS_10SEC /* not really timed */ )
-            drvHostAudioPaMainloopWait(pThis);
+            drvHstAudPaMainloopWait(pThis);
         if (enmStreamState == PA_STREAM_READY)
         {
@@ -984 +984 @@
                  *       modified since the caller converted it from pCfgReq.
                  */
-                rc = drvHostAudioPaToAudioProps(&pCfgAcq->Props, pStreamPA->SampleSpec.format,
+                rc = drvHstAudPaToAudioProps(&pCfgAcq->Props, pStreamPA->SampleSpec.format,
                                                 pStreamPA->SampleSpec.channels, pStreamPA->SampleSpec.rate);
                 if (RT_SUCCESS(rc))
@@ -1093 +1093 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
-{
-    PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudPaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                    PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     AssertPtrReturn(pStreamPA, VERR_INVALID_POINTER);
     AssertPtrReturn(pCfgReq, VERR_INVALID_POINTER);
@@ -1116 +1116 @@
     pStreamPA->SampleSpec.rate     = PDMAudioPropsHz(&pCfgReq->Props);
     pStreamPA->SampleSpec.channels = PDMAudioPropsChannels(&pCfgReq->Props);
-    pStreamPA->SampleSpec.format   = drvHostAudioPaPropsToPulse(&pCfgReq->Props);
+    pStreamPA->SampleSpec.format   = drvHstAudPaPropsToPulse(&pCfgReq->Props);
 
     /*
@@ -1186 +1186 @@
          */
         pa_threaded_mainloop_lock(pThis->pMainLoop);
-        rc = drvHostAudioPaStreamCreateLocked(pThis, pStreamPA, szName, pCfgAcq);
+        rc = drvHstAudPaStreamCreateLocked(pThis, pStreamPA, szName, pCfgAcq);
         pa_threaded_mainloop_unlock(pThis->pMainLoop);
         if (RT_SUCCESS(rc))
@@ -1237 +1237 @@
  * @note Caller has locked the mainloop.
  */
-static void drvHostAudioPaStreamCancelAndReleaseOperations(PPULSEAUDIOSTREAM pStreamPA)
+static void drvHstAudPaStreamCancelAndReleaseOperations(PDRVHSTAUDPASTREAM pStreamPA)
 {
     if (pStreamPA->pDrainOp)
@@ -1268 +1268 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                        bool fImmediate)
-{
-    PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudPaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, bool fImmediate)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     AssertPtrReturn(pStreamPA, VERR_INVALID_POINTER);
     RT_NOREF(fImmediate);
@@ -1280 +1279 @@
         pa_threaded_mainloop_lock(pThis->pMainLoop);
 
-        drvHostAudioPaStreamCancelAndReleaseOperations(pStreamPA);
+        drvHstAudPaStreamCancelAndReleaseOperations(pStreamPA);
         pa_stream_disconnect(pStreamPA->pStream);
 
@@ -1297 +1296 @@
  * @note This is fully async, so nobody is waiting for this.
  */
-static void drvHostAudioPaStreamCorkUncorkCommon(PPULSEAUDIOSTREAM pStreamPA, int fSuccess, const char *pszOperation)
+static void drvHstAudPaStreamCorkUncorkCommon(PDRVHSTAUDPASTREAM pStreamPA, int fSuccess, const char *pszOperation)
 {
     AssertPtrReturnVoid(pStreamPA);
@@ -1303 +1302 @@
 
     if (!fSuccess)
-        drvHostAudioPaError(pStreamPA->pDrv, "%s stream '%s' failed", pszOperation, pStreamPA->Cfg.szName);
+        drvHstAudPaError(pStreamPA->pDrv, "%s stream '%s' failed", pszOperation, pStreamPA->Cfg.szName);
 
     if (pStreamPA->pCorkOp)
@@ -1316 +1315 @@
  * Completion callback used with pa_stream_cork(,false,).
  */
-static void drvHostAudioPaStreamUncorkCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
+static void drvHstAudPaStreamUncorkCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
 {
     RT_NOREF(pStream);
-    drvHostAudioPaStreamCorkUncorkCommon((PPULSEAUDIOSTREAM)pvUser, fSuccess, "Uncorking");
+    drvHstAudPaStreamCorkUncorkCommon((PDRVHSTAUDPASTREAM)pvUser, fSuccess, "Uncorking");
 }
 
@@ -1326 +1325 @@
  * Completion callback used with pa_stream_cork(,true,).
  */
-static void drvHostAudioPaStreamCorkCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
+static void drvHstAudPaStreamCorkCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
 {
     RT_NOREF(pStream);
-    drvHostAudioPaStreamCorkUncorkCommon((PPULSEAUDIOSTREAM)pvUser, fSuccess, "Corking");
+    drvHstAudPaStreamCorkUncorkCommon((PDRVHSTAUDPASTREAM)pvUser, fSuccess, "Corking");
 }
 
@@ -1336 +1335 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamEnable}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudPaHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     LogFlowFunc(("\n"));
 
@@ -1347 +1346 @@
     pa_threaded_mainloop_lock(pThis->pMainLoop);
 
-    drvHostAudioPaStreamCancelAndReleaseOperations(pStreamPA);
+    drvHstAudPaStreamCancelAndReleaseOperations(pStreamPA);
     pStreamPA->pCorkOp = pa_stream_cork(pStreamPA->pStream, 0 /*uncork it*/,
-                                        drvHostAudioPaStreamUncorkCompletionCallback, pStreamPA);
+                                        drvHstAudPaStreamUncorkCompletionCallback, pStreamPA);
     LogFlowFunc(("Uncorking '%s': %p (async)\n", pStreamPA->Cfg.szName, pStreamPA->pCorkOp));
     int const rc = pStreamPA->pCorkOp ? VINF_SUCCESS
-                 : drvHostAudioPaError(pThis, "pa_stream_cork('%s', 0 /*uncork it*/,,) failed", pStreamPA->Cfg.szName);
+                 : drvHstAudPaError(pThis, "pa_stream_cork('%s', 0 /*uncork it*/,,) failed", pStreamPA->Cfg.szName);
 
 
@@ -1365 +1364 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDisable}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudPaHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     LogFlowFunc(("\n"));
 
@@ -1409 +1408 @@
      * Cork (pause playback/capture) the stream.
      */
-    drvHostAudioPaStreamCancelAndReleaseOperations(pStreamPA);
+    drvHstAudPaStreamCancelAndReleaseOperations(pStreamPA);
     pStreamPA->pCorkOp = pa_stream_cork(pStreamPA->pStream, 1 /* cork it */,
-                                        drvHostAudioPaStreamCorkCompletionCallback, pStreamPA);
+                                        drvHstAudPaStreamCorkCompletionCallback, pStreamPA);
     LogFlowFunc(("Corking '%s': %p (async)\n", pStreamPA->Cfg.szName, pStreamPA->pCorkOp));
     int const rc = pStreamPA->pCorkOp ? VINF_SUCCESS
-                 : drvHostAudioPaError(pThis, "pa_stream_cork('%s', 1 /*cork*/,,) failed", pStreamPA->Cfg.szName);
+                 : drvHstAudPaError(pThis, "pa_stream_cork('%s', 1 /*cork*/,,) failed", pStreamPA->Cfg.szName);
 
     pa_threaded_mainloop_unlock(pThis->pMainLoop);
@@ -1425 +1424 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamPause}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudPaHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     /* Same as disable. */
-    return drvHostAudioPaHA_StreamDisable(pInterface, pStream);
+    return drvHstAudPaHA_StreamDisable(pInterface, pStream);
 }
 
@@ -1435 +1434 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamResume}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHstAudPaHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     /* Same as enable. */
-    return drvHostAudioPaHA_StreamEnable(pInterface, pStream);
+    return drvHstAudPaHA_StreamEnable(pInterface, pStream);
 }
 
@@ -1446 +1445 @@
  * @note This is fully async, so nobody is waiting for this.
  */
-static void drvHostAudioPaStreamDrainCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
-{
-    PPULSEAUDIOSTREAM pStreamPA = (PPULSEAUDIOSTREAM)pvUser;
+static void drvHstAudPaStreamDrainCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
+{
+    PDRVHSTAUDPASTREAM pStreamPA = (PDRVHSTAUDPASTREAM)pvUser;
     AssertPtrReturnVoid(pStreamPA);
     Assert(pStreamPA->pStream == pStream);
@@ -1454 +1453 @@
 
     if (!fSuccess)
-        drvHostAudioPaError(pStreamPA->pDrv, "Draining stream '%s' failed", pStreamPA->Cfg.szName);
+        drvHstAudPaError(pStreamPA->pDrv, "Draining stream '%s' failed", pStreamPA->Cfg.szName);
 
     /* Now cork the stream (doing it unconditionally atm). */
@@ -1465 +1464 @@
     }
 
-    pStreamPA->pCorkOp = pa_stream_cork(pStream, 1 /* cork it*/, drvHostAudioPaStreamCorkCompletionCallback, pStreamPA);
+    pStreamPA->pCorkOp = pa_stream_cork(pStream, 1 /* cork it*/, drvHstAudPaStreamCorkCompletionCallback, pStreamPA);
     if (pStreamPA->pCorkOp)
         LogFlowFunc(("Started cork operation %p of %s (following drain)\n", pStreamPA->pCorkOp, pStreamPA->Cfg.szName));
     else
-        drvHostAudioPaError(pStreamPA->pDrv, "pa_stream_cork failed on '%s' (following drain)", pStreamPA->Cfg.szName);
+        drvHstAudPaError(pStreamPA->pDrv, "pa_stream_cork failed on '%s' (following drain)", pStreamPA->Cfg.szName);
 }
 
@@ -1476 +1475 @@
  * Callback used with pa_stream_tigger(), starts draining.
  */
-static void drvHostAudioPaStreamTriggerCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
-{
-    PPULSEAUDIOSTREAM pStreamPA = (PPULSEAUDIOSTREAM)pvUser;
+static void drvHstAudPaStreamTriggerCompletionCallback(pa_stream *pStream, int fSuccess, void *pvUser)
+{
+    PDRVHSTAUDPASTREAM pStreamPA = (PDRVHSTAUDPASTREAM)pvUser;
     AssertPtrReturnVoid(pStreamPA);
     RT_NOREF(pStream);
@@ -1484 +1483 @@
 
     if (!fSuccess)
-        drvHostAudioPaError(pStreamPA->pDrv, "Forcing playback before drainig '%s' failed", pStreamPA->Cfg.szName);
+        drvHstAudPaError(pStreamPA->pDrv, "Forcing playback before drainig '%s' failed", pStreamPA->Cfg.szName);
 
     if (pStreamPA->pTriggerOp)
@@ -1497 +1496 @@
  * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDrain}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudPaHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     AssertReturn(pStreamPA->Cfg.enmDir == PDMAUDIODIR_OUT, VERR_INVALID_PARAMETER);
     LogFlowFunc(("\n"));
@@ -1539 +1538 @@
             pa_operation_unref(pStreamPA->pTriggerOp);
         }
-        pStreamPA->pTriggerOp = pa_stream_trigger(pStreamPA->pStream, drvHostAudioPaStreamTriggerCompletionCallback, pStreamPA);
+        pStreamPA->pTriggerOp = pa_stream_trigger(pStreamPA->pStream, drvHstAudPaStreamTriggerCompletionCallback, pStreamPA);
         if (pStreamPA->pTriggerOp)
             LogFlowFunc(("Started tigger operation %p on %s\n", pStreamPA->pTriggerOp, pStreamPA->Cfg.szName));
         else
-            rc = drvHostAudioPaError(pStreamPA->pDrv, "pa_stream_trigger failed on '%s'", pStreamPA->Cfg.szName);
+            rc = drvHstAudPaError(pStreamPA->pDrv, "pa_stream_trigger failed on '%s'", pStreamPA->Cfg.szName);
     }
 
@@ -1549 +1548 @@
      * Initiate the draining (async), will cork the stream when it completes.
      */
-    pStreamPA->pDrainOp = pa_stream_drain(pStreamPA->pStream, drvHostAudioPaStreamDrainCompletionCallback, pStreamPA);
+    pStreamPA->pDrainOp = pa_stream_drain(pStreamPA->pStream, drvHstAudPaStreamDrainCompletionCallback, pStreamPA);
     if (pStreamPA->pDrainOp)
         LogFlowFunc(("Started drain operation %p of %s\n", pStreamPA->pDrainOp, pStreamPA->Cfg.szName));
     else
-        rc = drvHostAudioPaError(pStreamPA->pDrv, "pa_stream_drain failed on '%s'", pStreamPA->Cfg.szName);
+        rc = drvHstAudPaError(pStreamPA->pDrv, "pa_stream_drain failed on '%s'", pStreamPA->Cfg.szName);
 
     pa_threaded_mainloop_unlock(pThis->pMainLoop);
@@ -1564 +1563 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamControl(PPDMIHOSTAUDIO pInterface,
-                                                        PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvHstAudPaHA_StreamControl(PPDMIHOSTAUDIO pInterface,
+                                                     PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     /** @todo r=bird: I'd like to get rid of this pfnStreamControl method,
@@ -1574 +1573 @@
     {
         case PDMAUDIOSTREAMCMD_ENABLE:
-            return drvHostAudioPaHA_StreamEnable(pInterface, pStream);
+            return drvHstAudPaHA_StreamEnable(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_DISABLE:
-            return drvHostAudioPaHA_StreamDisable(pInterface, pStream);
+            return drvHstAudPaHA_StreamDisable(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_PAUSE:
-            return drvHostAudioPaHA_StreamPause(pInterface, pStream);
+            return drvHstAudPaHA_StreamPause(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_RESUME:
-            return drvHostAudioPaHA_StreamResume(pInterface, pStream);
+            return drvHstAudPaHA_StreamResume(pInterface, pStream);
         case PDMAUDIOSTREAMCMD_DRAIN:
-            return drvHostAudioPaHA_StreamDrain(pInterface, pStream);
+            return drvHstAudPaHA_StreamDrain(pInterface, pStream);
 
         case PDMAUDIOSTREAMCMD_END:
@@ -1597 +1596 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetReadable}
  */
-static DECLCALLBACK(uint32_t) drvHostAudioPaHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDRVHOSTPULSEAUDIO  pThis      = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM   pStreamPA  = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(uint32_t) drvHstAudPaHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDRVHSTAUDPA        pThis      = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA  = (PDRVHSTAUDPASTREAM)pStream;
     uint32_t            cbReadable = 0;
     if (pStreamPA->Cfg.enmDir == PDMAUDIODIR_IN)
@@ -1613 +1612 @@
                 cbReadable = (uint32_t)cbReadablePa;
             else
-                drvHostAudioPaError(pThis, "pa_stream_readable_size failed on '%s'", pStreamPA->Cfg.szName);
+                drvHstAudPaError(pThis, "pa_stream_readable_size failed on '%s'", pStreamPA->Cfg.szName);
         }
         else
@@ -1628 +1627 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
  */
-static DECLCALLBACK(uint32_t) drvHostAudioPaHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDRVHOSTPULSEAUDIO  pThis      = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM   pStreamPA  = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(uint32_t) drvHstAudPaHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDRVHSTAUDPA        pThis      = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA  = (PDRVHSTAUDPASTREAM)pStream;
     uint32_t            cbWritable = 0;
     if (pStreamPA->Cfg.enmDir == PDMAUDIODIR_OUT)
@@ -1644 +1643 @@
                 cbWritable = cbWritablePa <= UINT32_MAX ? (uint32_t)cbWritablePa : UINT32_MAX;
             else
-                drvHostAudioPaError(pThis, "pa_stream_writable_size failed on '%s'", pStreamPA->Cfg.szName);
+                drvHstAudPaError(pThis, "pa_stream_writable_size failed on '%s'", pStreamPA->Cfg.szName);
         }
         else
@@ -1660 +1659 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetState}
  */
-static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHostAudioPaHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
-                                                                             PPDMAUDIOBACKENDSTREAM pStream)
-{
-    PDRVHOSTPULSEAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
+static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHstAudPaHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
+                                                                          PPDMAUDIOBACKENDSTREAM pStream)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
     AssertPtrReturn(pStream, PDMHOSTAUDIOSTREAMSTATE_INVALID);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     AssertPtrReturn(pStreamPA, PDMHOSTAUDIOSTREAMSTATE_INVALID);
 
@@ -1706 +1705 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                     const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
-{
-    PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudPaHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                  const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     AssertPtrReturn(pStreamPA, VERR_INVALID_POINTER);
     AssertPtrReturn(pcbWritten, VERR_INVALID_POINTER);
@@ -1755 +1754 @@
             else
             {
-                rc = drvHostAudioPaError(pStreamPA->pDrv, "Failed to write to output stream");
+                rc = drvHstAudPaError(pStreamPA->pDrv, "Failed to write to output stream");
                 break;
             }
@@ -1762 +1761 @@
         {
             if (cbWriteable == (size_t)-1)
-                rc = drvHostAudioPaError(pStreamPA->pDrv, "pa_stream_writable_size failed on '%s'", pStreamPA->Cfg.szName);
+                rc = drvHstAudPaError(pStreamPA->pDrv, "pa_stream_writable_size failed on '%s'", pStreamPA->Cfg.szName);
             break;
         }
@@ -1785 +1784 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostAudioPaHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                        void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
-{
-    PDRVHOSTPULSEAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTPULSEAUDIO, IHostAudio);
-    PPULSEAUDIOSTREAM  pStreamPA = (PPULSEAUDIOSTREAM)pStream;
+static DECLCALLBACK(int) drvHstAudPaHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                     void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+{
+    PDRVHSTAUDPA        pThis     = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio);
+    PDRVHSTAUDPASTREAM  pStreamPA = (PDRVHSTAUDPASTREAM)pStream;
     AssertPtrReturn(pStreamPA, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
@@ -1906 +1905 @@
             else
             {
-                rc = drvHostAudioPaError(pStreamPA->pDrv, "pa_stream_peek failed on '%s' (%d)", pStreamPA->Cfg.szName, rcPa);
+                rc = drvHstAudPaError(pStreamPA->pDrv, "pa_stream_peek failed on '%s' (%d)", pStreamPA->Cfg.szName, rcPa);
                 pStreamPA->pbPeekBuf  = NULL;
                 pStreamPA->cbPeekBuf  = 0;
@@ -1915 +1914 @@
         {
             if (cbAvail != (size_t)-1)
-                rc = drvHostAudioPaError(pStreamPA->pDrv, "pa_stream_readable_size failed on '%s'", pStreamPA->Cfg.szName);
+                rc = drvHstAudPaError(pStreamPA->pDrv, "pa_stream_readable_size failed on '%s'", pStreamPA->Cfg.szName);
             break;
         }
@@ -1942 +1941 @@
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvHostAudioPaQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+static DECLCALLBACK(void *) drvHstAudPaQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     AssertPtrReturn(pInterface, NULL);
     AssertPtrReturn(pszIID, NULL);
 
-    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
-    PDRVHOSTPULSEAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPULSEAUDIO);
+    PPDMDRVINS   pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
+    PDRVHSTAUDPA pThis   = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDPA);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHOSTAUDIO, &pThis->IHostAudio);
@@ -1965 +1964 @@
  * @copydoc FNPDMDRVDESTRUCT
  */
-static DECLCALLBACK(void) drvHostAudioPaDestruct(PPDMDRVINS pDrvIns)
+static DECLCALLBACK(void) drvHstAudPaDestruct(PPDMDRVINS pDrvIns)
 {
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
-    PDRVHOSTPULSEAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPULSEAUDIO);
+    PDRVHSTAUDPA pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDPA);
     LogFlowFuncEnter();
 
@@ -1995 +1994 @@
  *
  * Signalls our event semaphore so we can do a timed wait from
- * drvHostAudioPaConstruct().
- */
-static void drvHostAudioPaCtxCallbackStateChangedInit(pa_context *pCtx, void *pvUser)
+ * drvHstAudPaConstruct().
+ */
+static void drvHstAudPaCtxCallbackStateChangedInit(pa_context *pCtx, void *pvUser)
 {
     AssertPtrReturnVoid(pCtx);
-    PPULSEAUDIOSTATECHGCTX pStateChgCtx = (PPULSEAUDIOSTATECHGCTX)pvUser;
+    PDRVHSTAUDPASTATECHGCTX pStateChgCtx = (PDRVHSTAUDPASTATECHGCTX)pvUser;
     pa_context_state_t     enmCtxState  = pa_context_get_state(pCtx);
     switch (enmCtxState)
@@ -2023 +2022 @@
  * @copydoc FNPDMDRVCONSTRUCT
  */
-static DECLCALLBACK(int) drvHostAudioPaConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
+static DECLCALLBACK(int) drvHstAudPaConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
     RT_NOREF(pCfg, fFlags);
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-    PDRVHOSTPULSEAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTPULSEAUDIO);
+    PDRVHSTAUDPA pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDPA);
     LogRel(("Audio: Initializing PulseAudio driver\n"));
 
@@ -2035 +2034 @@
     pThis->pDrvIns                   = pDrvIns;
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface = drvHostAudioPaQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface = drvHstAudPaQueryInterface;
     /* IHostAudio */
-    pThis->IHostAudio.pfnGetConfig                  = drvHostAudioPaHA_GetConfig;
-    pThis->IHostAudio.pfnGetDevices                 = drvHostAudioPaHA_GetDevices;
+    pThis->IHostAudio.pfnGetConfig                  = drvHstAudPaHA_GetConfig;
+    pThis->IHostAudio.pfnGetDevices                 = drvHstAudPaHA_GetDevices;
     pThis->IHostAudio.pfnSetDevice                  = NULL;
-    pThis->IHostAudio.pfnGetStatus                  = drvHostAudioPaHA_GetStatus;
+    pThis->IHostAudio.pfnGetStatus                  = drvHstAudPaHA_GetStatus;
     pThis->IHostAudio.pfnDoOnWorkerThread           = NULL;
     pThis->IHostAudio.pfnStreamConfigHint           = NULL;
-    pThis->IHostAudio.pfnStreamCreate               = drvHostAudioPaHA_StreamCreate;
+    pThis->IHostAudio.pfnStreamCreate               = drvHstAudPaHA_StreamCreate;
     pThis->IHostAudio.pfnStreamInitAsync            = NULL;
-    pThis->IHostAudio.pfnStreamDestroy              = drvHostAudioPaHA_StreamDestroy;
+    pThis->IHostAudio.pfnStreamDestroy              = drvHstAudPaHA_StreamDestroy;
     pThis->IHostAudio.pfnStreamNotifyDeviceChanged  = NULL;
-    pThis->IHostAudio.pfnStreamControl              = drvHostAudioPaHA_StreamControl;
-    pThis->IHostAudio.pfnStreamGetReadable          = drvHostAudioPaHA_StreamGetReadable;
-    pThis->IHostAudio.pfnStreamGetWritable          = drvHostAudioPaHA_StreamGetWritable;
+    pThis->IHostAudio.pfnStreamControl              = drvHstAudPaHA_StreamControl;
+    pThis->IHostAudio.pfnStreamGetReadable          = drvHstAudPaHA_StreamGetReadable;
+    pThis->IHostAudio.pfnStreamGetWritable          = drvHstAudPaHA_StreamGetWritable;
     pThis->IHostAudio.pfnStreamGetPending           = NULL;
-    pThis->IHostAudio.pfnStreamGetState             = drvHostAudioPaHA_StreamGetState;
-    pThis->IHostAudio.pfnStreamPlay                 = drvHostAudioPaHA_StreamPlay;
-    pThis->IHostAudio.pfnStreamCapture              = drvHostAudioPaHA_StreamCapture;
+    pThis->IHostAudio.pfnStreamGetState             = drvHstAudPaHA_StreamGetState;
+    pThis->IHostAudio.pfnStreamPlay                 = drvHstAudPaHA_StreamPlay;
+    pThis->IHostAudio.pfnStreamCapture              = drvHstAudPaHA_StreamCapture;
 
     /*
@@ -2109 +2108 @@
 
     pa_threaded_mainloop_lock(pThis->pMainLoop);
-    pa_context_set_state_callback(pThis->pContext, drvHostAudioPaCtxCallbackStateChangedInit, &pThis->InitStateChgCtx);
+    pa_context_set_state_callback(pThis->pContext, drvHstAudPaCtxCallbackStateChangedInit, &pThis->InitStateChgCtx);
     if (!pa_context_connect(pThis->pContext, NULL /* pszServer */, PA_CONTEXT_NOFLAGS, NULL))
     {
@@ -2121 +2120 @@
                 /* Install the main state changed callback to know if something happens to our acquired context. */
                 pa_threaded_mainloop_lock(pThis->pMainLoop);
-                pa_context_set_state_callback(pThis->pContext, drvHostAudioPaCtxCallbackStateChanged, pThis /* pvUserData */);
+                pa_context_set_state_callback(pThis->pContext, drvHstAudPaCtxCallbackStateChanged, pThis /* pvUserData */);
                 pa_threaded_mainloop_unlock(pThis->pMainLoop);
             }
@@ -2172 +2171 @@
     ~0U,
     /* cbInstance */
-    sizeof(DRVHOSTPULSEAUDIO),
+    sizeof(DRVHSTAUDPA),
     /* pfnConstruct */
-    drvHostAudioPaConstruct,
+    drvHstAudPaConstruct,
     /* pfnDestruct */
-    drvHostAudioPaDestruct,
+    drvHstAudPaDestruct,
     /* pfnRelocate */
     NULL,