Changeset 89026 in vbox

Timestamp:

May 13, 2021 1:12:44 AM (4 years ago)

Author:

vboxsync

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

144365

Message:

DrvHostAudioCoreAudio: More cleanups; use drvHostAudioCa as function prefix. bugref:9890D

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp (modified) (66 diffs)

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

@@ -265 +265 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-DECLHIDDEN(int) coreAudioInputPermissionCheck(void); /* DrvHostAudioCoreAudioAuth.mm */
-static int drvHostCoreAudioStreamControlInternal(PCOREAUDIOSTREAM pStreamCA, PDMAUDIOSTREAMCMD enmStreamCmd);
-
-
-
-
-static void coreAudioPrintASBD(const char *pszDesc, const AudioStreamBasicDescription *pASBD)
+static int drvHostAudioCaStreamControlInternal(PCOREAUDIOSTREAM pStreamCA, PDMAUDIOSTREAMCMD enmStreamCmd);
+
+/* DrvHostAudioCoreAudioAuth.mm: */
+DECLHIDDEN(int) coreAudioInputPermissionCheck(void);
+
+
+
+
+static void drvHostAudioCaPrintASBD(const char *pszDesc, const AudioStreamBasicDescription *pASBD)
 {
     LogRel2(("CoreAudio: %s description:\n", pszDesc));
@@ -305 +307 @@
 
 
-static void coreAudioPCMPropsToASBD(PCPDMAUDIOPCMPROPS pProps, AudioStreamBasicDescription *pASBD)
+static void drvHostAudioCaPCMPropsToASBD(PCPDMAUDIOPCMPROPS pProps, AudioStreamBasicDescription *pASBD)
 {
     AssertPtrReturnVoid(pProps);
@@ -328 +330 @@
 
 #if 0 /* unused */
-static int coreAudioCFStringToCString(const CFStringRef pCFString, char **ppszString)
+static int drvHostAudioCaCFStringToCString(const CFStringRef pCFString, char **ppszString)
 {
     CFIndex cLen = CFStringGetLength(pCFString) + 1;
@@ -342 +344 @@
 }
 
-static AudioDeviceID coreAudioDeviceUIDtoID(const char* pszUID)
+static AudioDeviceID drvHostAudioCaDeviceUIDtoID(const char* pszUID)
 {
     /* Create a CFString out of our CString. */
@@ -390 +392 @@
  * @param   pASBDDst            Output (destination) stream description to use.
  */
-static int coreAudioInitConvCbCtx(PCOREAUDIOCONVCBCTX pConvCbCtx, PCOREAUDIOSTREAM pStream,
-                                  AudioStreamBasicDescription *pASBDSrc, AudioStreamBasicDescription *pASBDDst)
+static int drvHostAudioCaInitConvCbCtx(PCOREAUDIOCONVCBCTX pConvCbCtx, PCOREAUDIOSTREAM pStream,
+                                       AudioStreamBasicDescription *pASBDSrc, AudioStreamBasicDescription *pASBDDst)
 {
     AssertPtrReturn(pConvCbCtx, VERR_INVALID_POINTER);
@@ -399 +401 @@
 
 # ifdef DEBUG
-    coreAudioPrintASBD("CbCtx: Src", pASBDSrc);
-    coreAudioPrintASBD("CbCtx: Dst", pASBDDst);
+    drvHostAudioCaPrintASBD("CbCtx: Src", pASBDSrc);
+    drvHostAudioCaPrintASBD("CbCtx: Dst", pASBDDst);
 # endif
 
@@ -421 +423 @@
  * @param   pConvCbCtx          Conversion callback context to uninitialize.
  */
-static void coreAudioUninitConvCbCtx(PCOREAUDIOCONVCBCTX pConvCbCtx)
+static void drvHostAudioCaUninitConvCbCtx(PCOREAUDIOCONVCBCTX pConvCbCtx)
 {
     AssertPtrReturnVoid(pConvCbCtx);
@@ -435 +437 @@
 
 /* Callback to convert audio input data from one format to another. */
-static OSStatus coreAudioConverterCb(AudioConverterRef              inAudioConverter,
-                                     UInt32                        *ioNumberDataPackets,
-                                     AudioBufferList               *ioData,
-                                     AudioStreamPacketDescription **ppASPD,
-                                     void                          *pvUser)
+static OSStatus drvHostAudioCaConverterCb(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets,
+                                          AudioBufferList *ioData, AudioStreamPacketDescription **ppASPD, void *pvUser)
 {
     RT_NOREF(inAudioConverter);
@@ -726 +725 @@
  * @param   audioBuffer         Audio buffer to store data into.
  */
-static int coreAudioOutputQueueProcBuffer(PCOREAUDIOSTREAM pStreamCA, AudioQueueBufferRef audioBuffer)
+static int drvHostAudioCaOutputQueueProcBuffer(PCOREAUDIOSTREAM pStreamCA, AudioQueueBufferRef audioBuffer)
 {
     AssertPtr(pStreamCA);
@@ -794 +793 @@
  * @thread  queue thread.
  */
-static void coreAudioOutputQueueCb(void *pvUser, AudioQueueRef hAudioQueue, AudioQueueBufferRef audioBuffer)
+static void drvHostAudioCaOutputQueueCb(void *pvUser, AudioQueueRef hAudioQueue, AudioQueueBufferRef audioBuffer)
 {
     PCOREAUDIOSTREAM pStreamCA = (PCOREAUDIOSTREAM)pvUser;
@@ -802 +801 @@
     AssertRC(rc);
 
-    rc = coreAudioOutputQueueProcBuffer(pStreamCA, audioBuffer);
+    rc = drvHostAudioCaOutputQueueProcBuffer(pStreamCA, audioBuffer);
     if (RT_SUCCESS(rc))
         AudioQueueEnqueueBuffer(hAudioQueue, audioBuffer, 0, NULL);
@@ -818 +817 @@
  * @param   audioBuffer         Audio buffer to process input data from.
  */
-static int coreAudioInputQueueProcBuffer(PCOREAUDIOSTREAM pStreamCA, AudioQueueBufferRef audioBuffer)
+static int drvHostAudioCaInputQueueProcBuffer(PCOREAUDIOSTREAM pStreamCA, AudioQueueBufferRef audioBuffer)
 {
     PRTCIRCBUF pCircBuf = pStreamCA->pCircBuf;
@@ -873 +872 @@
  * @param   paPacketDesc        Array of packet descriptors.
  */
-static void coreAudioInputQueueCb(void *pvUser, AudioQueueRef hAudioQueue, AudioQueueBufferRef audioBuffer,
-                                  const AudioTimeStamp *pAudioTS,
-                                  UInt32 cPacketDesc, const AudioStreamPacketDescription *paPacketDesc)
+static void drvHostAudioCaInputQueueCb(void *pvUser, AudioQueueRef hAudioQueue, AudioQueueBufferRef audioBuffer,
+                                       const AudioTimeStamp *pAudioTS,
+                                       UInt32 cPacketDesc, const AudioStreamPacketDescription *paPacketDesc)
 {
     RT_NOREF(pAudioTS, cPacketDesc, paPacketDesc);
@@ -885 +884 @@
     AssertRC(rc);
 
-    rc = coreAudioInputQueueProcBuffer(pStreamCA, audioBuffer);
+    rc = drvHostAudioCaInputQueueProcBuffer(pStreamCA, audioBuffer);
     if (RT_SUCCESS(rc))
         AudioQueueEnqueueBuffer(hAudioQueue, audioBuffer, 0, NULL);
@@ -901 +900 @@
  * stream and handling its callbacks.
  */
-static DECLCALLBACK(int) coreAudioQueueThread(RTTHREAD hThreadSelf, void *pvUser)
+static DECLCALLBACK(int) drvHostAudioCaQueueThread(RTTHREAD hThreadSelf, void *pvUser)
 {
     PCOREAUDIOSTREAM           pStreamCA = (PCOREAUDIOSTREAM)pvUser;
@@ -918 +917 @@
     OSStatus orc;
     if (fIn)
-        orc = AudioQueueNewInput(&pStreamCA->asbdStream, coreAudioInputQueueCb, pStreamCA /* pvData */,
+        orc = AudioQueueNewInput(&pStreamCA->asbdStream, drvHostAudioCaInputQueueCb, pStreamCA /* pvData */,
                                  CFRunLoopGetCurrent(), kCFRunLoopDefaultMode, 0, &pStreamCA->hAudioQueue);
     else
-        orc = AudioQueueNewOutput(&pStreamCA->asbdStream, coreAudioOutputQueueCb, pStreamCA /* pvData */,
+        orc = AudioQueueNewOutput(&pStreamCA->asbdStream, drvHostAudioCaOutputQueueCb, pStreamCA /* pvData */,
                                   CFRunLoopGetCurrent(), kCFRunLoopDefaultMode, 0, &pStreamCA->hAudioQueue);
     if (orc == noErr)
@@ -993 +992 @@
  * @todo r=bird: Which use of the word 'invalidate' is this?
  */
-static int coreAudioStreamInvalidateQueue(PCOREAUDIOSTREAM pStreamCA)
+static int drvHostAudioCaStreamInvalidateQueue(PCOREAUDIOSTREAM pStreamCA)
 {
     int rc = VINF_SUCCESS;
@@ -1004 +1003 @@
         if (pStreamCA->Cfg.enmDir == PDMAUDIODIR_IN)
         {
-            int rc2 = coreAudioInputQueueProcBuffer(pStreamCA, pBuf);
+            int rc2 = drvHostAudioCaInputQueueProcBuffer(pStreamCA, pBuf);
             if (RT_SUCCESS(rc2))
                 AudioQueueEnqueueBuffer(pStreamCA->hAudioQueue, pBuf, 0 /*inNumPacketDescs*/, NULL /*inPacketDescs*/);
@@ -1011 +1010 @@
         {
             Assert(pStreamCA->Cfg.enmDir == PDMAUDIODIR_OUT);
-            int rc2 = coreAudioOutputQueueProcBuffer(pStreamCA, pBuf);
+            int rc2 = drvHostAudioCaOutputQueueProcBuffer(pStreamCA, pBuf);
             if (   RT_SUCCESS(rc2)
                 && pBuf->mAudioDataByteSize)
@@ -1032 +1031 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
  */
-static DECLCALLBACK(int) drvHostCoreAudioHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
+static DECLCALLBACK(int) drvHostAudioCaHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
 {
     PDRVHOSTCOREAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio);
@@ -1061 +1060 @@
  * @param   pDrv                Driver instance to use.
  */
-static void coreAudioDeviceDataInit(PCOREAUDIODEVICEDATA pDevData, AudioDeviceID deviceID, bool fIsInput, PDRVHOSTCOREAUDIO pDrv)
+static void drvHostAudioCaDeviceDataInit(PCOREAUDIODEVICEDATA pDevData, AudioDeviceID deviceID,
+                                         bool fIsInput, PDRVHOSTCOREAUDIO pDrv)
 {
     AssertPtrReturnVoid(pDevData);
@@ -1096 +1096 @@
  * @param   pDevEnm             Where to store the enumerated devices.
  */
-static int coreAudioDevicesEnumerate(PDRVHOSTCOREAUDIO pThis, PDMAUDIODIR enmUsage, PPDMAUDIOHOSTENUM pDevEnm)
+static int drvHostAudioCaDevicesEnumerate(PDRVHOSTCOREAUDIO pThis, PDMAUDIODIR enmUsage, PPDMAUDIOHOSTENUM pDevEnm)
 {
     AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
@@ -1105 +1105 @@
     do /* (this is not a loop, just a device for avoid gotos while trying not to shoot oneself in the foot too badly.) */
     {
+        /*
+         * First get the device ID of the default device.
+         */
         AudioDeviceID defaultDeviceID = kAudioDeviceUnknown;
-
-        /* Fetch the default audio device currently in use. */
         AudioObjectPropertyAddress PropAddrDefaultDev =
         {
@@ -1129 +1130 @@
         }
 
+        /*
+         * Get a list of all audio devices.
+         */
         AudioObjectPropertyAddress PropAddrDevList =
         {
@@ -1152 +1156 @@
         UInt16 cDevices = uSize / sizeof(AudioDeviceID);
 
+        /*
+         * Try get details on each device and try add them to the enumeration result.
+         */
         PCOREAUDIODEVICEDATA pDev = NULL;
         for (UInt16 i = 0; i < cDevices; i++)
@@ -1169 +1176 @@
 
             /* Init backend-specific device data. */
-            coreAudioDeviceDataInit(pDev, pDevIDs[i], enmUsage == PDMAUDIODIR_IN, pThis);
+            drvHostAudioCaDeviceDataInit(pDev, pDevIDs[i], enmUsage == PDMAUDIODIR_IN, pThis);
 
             /* Check if the device is valid. */
@@ -1324 +1331 @@
  * @param   deviceID              Device ID to search.
  */
-bool coreAudioDevicesHasDevice(PPDMAUDIOHOSTENUM pEnmSrc, AudioDeviceID deviceID)
+static bool drvHostAudioCaDevicesHasDevice(PPDMAUDIOHOSTENUM pEnmSrc, AudioDeviceID deviceID)
 {
     PCOREAUDIODEVICEDATA pDevSrc;
@@ -1345 +1352 @@
  * @param   pEnmDst             Where to store the device enumeration list.
  */
-int coreAudioDevicesEnumerateAll(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOHOSTENUM pEnmDst)
+static int drvHostAudioCaDevicesEnumerateAll(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOHOSTENUM pEnmDst)
 {
     PDMAUDIOHOSTENUM devEnmIn;
-    int rc = coreAudioDevicesEnumerate(pThis, PDMAUDIODIR_IN, &devEnmIn);
+    int rc = drvHostAudioCaDevicesEnumerate(pThis, PDMAUDIODIR_IN, &devEnmIn);
     if (RT_SUCCESS(rc))
     {
         PDMAUDIOHOSTENUM devEnmOut;
-        rc = coreAudioDevicesEnumerate(pThis, PDMAUDIODIR_OUT, &devEnmOut);
+        rc = drvHostAudioCaDevicesEnumerate(pThis, PDMAUDIODIR_OUT, &devEnmOut);
         if (RT_SUCCESS(rc))
         {
+
+/** @todo r=bird: This is an awfully complicated and inefficient way of doing
+ * it.   Here you could just merge the two list (walk one, remove duplicates
+ * from the other one) and skip all that duplication.
+ *
+ * Howerver, drvHostAudioCaDevicesEnumerate gets the device list twice, which is
+ * a complete waste of time.  You could easily do all the work in
+ * drvHostAudioCaDevicesEnumerate by just querying the IDs of both default
+ * devices we're interested in, saving the merging extra allocations and
+ * extra allocation.  */
+
             /*
              * Build up the final device enumeration, based on the input and output device lists
@@ -1373 +1391 @@
                 }
 
-                coreAudioDeviceDataInit(pDevDst, pDevSrcIn->deviceID, true /* fIsInput */, pThis);
+                drvHostAudioCaDeviceDataInit(pDevDst, pDevSrcIn->deviceID, true /* fIsInput */, pThis);
 
                 RTStrCopy(pDevDst->Core.szName, sizeof(pDevDst->Core.szName), pDevSrcIn->Core.szName);
@@ -1423 +1441 @@
                 RTListForEach(&devEnmOut.LstDevices, pDevSrcOut, COREAUDIODEVICEDATA, Core.ListEntry)
                 {
-                    if (coreAudioDevicesHasDevice(pEnmDst, pDevSrcOut->deviceID))
+                    if (drvHostAudioCaDevicesHasDevice(pEnmDst, pDevSrcOut->deviceID))
                         continue; /* Already in our list, skip. */
 
@@ -1433 +1451 @@
                     }
 
-                    coreAudioDeviceDataInit(pDevDst, pDevSrcOut->deviceID, false /* fIsInput */, pThis);
+                    drvHostAudioCaDeviceDataInit(pDevDst, pDevSrcOut->deviceID, false /* fIsInput */, pThis);
 
                     RTStrCopy(pDevDst->Core.szName, sizeof(pDevDst->Core.szName), pDevSrcOut->Core.szName);
@@ -1477 +1495 @@
  * @param  pDev                 Audio device to use for the registered callbacks.
  */
-static int coreAudioDeviceRegisterCallbacks(PDRVHOSTCOREAUDIO pThis, PCOREAUDIODEVICEDATA pDev)
+static int drvHostAudioCaDeviceRegisterCallbacks(PDRVHOSTCOREAUDIO pThis, PCOREAUDIODEVICEDATA pDev)
 {
     RT_NOREF(pThis);
@@ -1529 +1547 @@
  * @param  pDev                 Audio device to use for the registered callbacks.
  */
-static int coreAudioDeviceUnregisterCallbacks(PDRVHOSTCOREAUDIO pThis, PCOREAUDIODEVICEDATA pDev)
+static int drvHostAudioCaDeviceUnregisterCallbacks(PDRVHOSTCOREAUDIO pThis, PCOREAUDIODEVICEDATA pDev)
 {
     RT_NOREF(pThis);
@@ -1579 +1597 @@
  * @param   pThis               Host audio driver instance.
  */
-static int coreAudioEnumerateDevices(PDRVHOSTCOREAUDIO pThis)
+static int drvHostAudioCaEnumerateDevices(PDRVHOSTCOREAUDIO pThis)
 {
     LogFlowFuncEnter();
@@ -1588 +1606 @@
     if (pThis->pDefaultDevIn)
     {
-        coreAudioDeviceUnregisterCallbacks(pThis, pThis->pDefaultDevIn);
+        drvHostAudioCaDeviceUnregisterCallbacks(pThis, pThis->pDefaultDevIn);
         pThis->pDefaultDevIn = NULL;
     }
@@ -1594 +1612 @@
     if (pThis->pDefaultDevOut)
     {
-        coreAudioDeviceUnregisterCallbacks(pThis, pThis->pDefaultDevOut);
+        drvHostAudioCaDeviceUnregisterCallbacks(pThis, pThis->pDefaultDevOut);
         pThis->pDefaultDevOut = NULL;
     }
@@ -1602 +1620 @@
 
     /* Enumerate all devices internally. */
-    int rc = coreAudioDevicesEnumerateAll(pThis, &pThis->Devices);
+    int rc = drvHostAudioCaDevicesEnumerateAll(pThis, &pThis->Devices);
     if (RT_SUCCESS(rc))
     {
@@ -1613 +1631 @@
             LogRel2(("CoreAudio: Default capturing device is '%s'\n", pThis->pDefaultDevIn->Core.szName));
             LogFunc(("pDefaultDevIn=%p, ID=%RU32\n", pThis->pDefaultDevIn, pThis->pDefaultDevIn->deviceID));
-            rc = coreAudioDeviceRegisterCallbacks(pThis, pThis->pDefaultDevIn);
+            rc = drvHostAudioCaDeviceRegisterCallbacks(pThis, pThis->pDefaultDevIn);
         }
         else
@@ -1626 +1644 @@
             LogRel2(("CoreAudio: Default playback device is '%s'\n", pThis->pDefaultDevOut->Core.szName));
             LogFunc(("pDefaultDevOut=%p, ID=%RU32\n", pThis->pDefaultDevOut, pThis->pDefaultDevOut->deviceID));
-            rc = coreAudioDeviceRegisterCallbacks(pThis, pThis->pDefaultDevOut);
+            rc = drvHostAudioCaDeviceRegisterCallbacks(pThis, pThis->pDefaultDevOut);
         }
         else
@@ -1640 +1658 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetDevices}
  */
-static DECLCALLBACK(int) drvHostCoreAudioHA_GetDevices(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHOSTENUM pDeviceEnum)
+static DECLCALLBACK(int) drvHostAudioCaHA_GetDevices(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHOSTENUM pDeviceEnum)
 {
     PDRVHOSTCOREAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio);
@@ -1653 +1671 @@
     if (RT_SUCCESS(rc))
     {
-        rc = coreAudioEnumerateDevices(pThis);
+        rc = drvHostAudioCaEnumerateDevices(pThis);
         if (RT_SUCCESS(rc))
         {
@@ -1676 +1694 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHostCoreAudioHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
+static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvHostAudioCaHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
 {
     RT_NOREF(pInterface, enmDir);
@@ -1686 +1704 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
  */
-static DECLCALLBACK(int) drvHostCoreAudioHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                         PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+static DECLCALLBACK(int) drvHostAudioCaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     PDRVHOSTCOREAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio);
@@ -1737 +1755 @@
              */
             PDMAudioStrmCfgCopy(&pStreamCA->Cfg, pCfgReq);
-            coreAudioPCMPropsToASBD(&pCfgReq->Props, &pStreamCA->asbdStream);
+            drvHostAudioCaPCMPropsToASBD(&pCfgReq->Props, &pStreamCA->asbdStream);
             /** @todo Do some validation? */
-            coreAudioPrintASBD(  pCfgReq->enmDir == PDMAUDIODIR_IN
-                               ? "Capturing queue format"
-                               : "Playback queue format", &pStreamCA->asbdStream);
+            drvHostAudioCaPrintASBD(  pCfgReq->enmDir == PDMAUDIODIR_IN
+                                    ? "Capturing queue format"
+                                    : "Playback queue format", &pStreamCA->asbdStream);
 
             rc = RTCircBufCreate(&pStreamCA->pCircBuf,
@@ -1753 +1771 @@
                 uint32_t idxThread = ASMAtomicIncU32(&s_idxThread);
 
-                rc = RTThreadCreateF(&pStreamCA->hThread, coreAudioQueueThread, pStreamCA, 0 /*cbStack*/,
+                rc = RTThreadCreateF(&pStreamCA->hThread, drvHostAudioCaQueueThread, pStreamCA, 0 /*cbStack*/,
                                      RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "CaQue%u", idxThread);
                 if (RT_SUCCESS(rc))
@@ -1806 +1824 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
  */
-static DECLCALLBACK(int) drvHostCoreAudioHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(int) drvHostAudioCaHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -1826 +1844 @@
         /** @todo this isn't paranoid enough, the pStreamCA->hAudioQueue is
          *        owned+released by the queue thread. */
-        drvHostCoreAudioStreamControlInternal(pStreamCA, PDMAUDIOSTREAMCMD_DISABLE);
+        drvHostAudioCaStreamControlInternal(pStreamCA, PDMAUDIOSTREAMCMD_DISABLE);
 
         /*
@@ -1891 +1909 @@
 
 
-static int drvHostCoreAudioStreamControlInternal(PCOREAUDIOSTREAM pStreamCA, PDMAUDIOSTREAMCMD enmStreamCmd)
+static int drvHostAudioCaStreamControlInternal(PCOREAUDIOSTREAM pStreamCA, PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     uint32_t enmInitState = ASMAtomicReadU32(&pStreamCA->enmInitState);
@@ -1911 +1929 @@
             if (pStreamCA->Cfg.enmDir == PDMAUDIODIR_IN)
             {
-                rc = coreAudioStreamInvalidateQueue(pStreamCA);
+                rc = drvHostAudioCaStreamInvalidateQueue(pStreamCA);
                 if (RT_SUCCESS(rc))
                 {
@@ -1956 +1974 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
  */
-static DECLCALLBACK(int) drvHostCoreAudioHA_StreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                          PDMAUDIOSTREAMCMD enmStreamCmd)
+static DECLCALLBACK(int) drvHostAudioCaHA_StreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                        PDMAUDIOSTREAMCMD enmStreamCmd)
 {
     RT_NOREF(pInterface);
@@ -1963 +1981 @@
     AssertPtrReturn(pStreamCA, VERR_INVALID_POINTER);
 
-    return drvHostCoreAudioStreamControlInternal(pStreamCA, enmStreamCmd);
+    return drvHostAudioCaStreamControlInternal(pStreamCA, enmStreamCmd);
 }
 
@@ -1970 +1988 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetReadable}
  */
-static DECLCALLBACK(uint32_t) drvHostCoreAudioHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(uint32_t) drvHostAudioCaHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -1992 +2010 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
  */
-static DECLCALLBACK(uint32_t) drvHostCoreAudioHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(uint32_t) drvHostAudioCaHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -2016 +2034 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetState}
  */
-static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHostCoreAudioHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
-                                                                               PPDMAUDIOBACKENDSTREAM pStream)
+static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvHostAudioCaHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
+                                                                             PPDMAUDIOBACKENDSTREAM pStream)
 {
     RT_NOREF(pInterface);
@@ -2031 +2049 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
  */
-static DECLCALLBACK(int) drvHostCoreAudioHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                       const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
+static DECLCALLBACK(int) drvHostAudioCaHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                     const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
     PDRVHOSTCOREAUDIO pThis     = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio);
@@ -2094 +2112 @@
         && !pStreamCA->fIsRunning)
     {
-        rc = coreAudioStreamInvalidateQueue(pStreamCA);
+        rc = drvHostAudioCaStreamInvalidateQueue(pStreamCA);
         if (RT_SUCCESS(rc))
         {
@@ -2114 +2132 @@
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
-static DECLCALLBACK(int) drvHostCoreAudioHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
-                                                          void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
+static DECLCALLBACK(int) drvHostAudioCaHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
+                                                        void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
     RT_NOREF(pInterface);
@@ -2165 +2183 @@
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvHostCoreAudioQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+static DECLCALLBACK(void *) drvHostAudioCaQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS        pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
@@ -2184 +2202 @@
  * Worker for the power off and destructor callbacks.
  */
-static void drvHostCoreAudioRemoveDefaultDeviceListners(PDRVHOSTCOREAUDIO pThis)
+static void drvHostAudioCaRemoveDefaultDeviceListners(PDRVHOSTCOREAUDIO pThis)
 {
     /*
@@ -2224 +2242 @@
  * @interface_method_impl{PDMDRVREG,pfnPowerOff}
  */
-static DECLCALLBACK(void) drvHostCoreAudioPowerOff(PPDMDRVINS pDrvIns)
+static DECLCALLBACK(void) drvHostAudioCaPowerOff(PPDMDRVINS pDrvIns)
 {
     PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
-    drvHostCoreAudioRemoveDefaultDeviceListners(pThis);
+    drvHostAudioCaRemoveDefaultDeviceListners(pThis);
 }
 
@@ -2234 +2252 @@
  * @callback_method_impl{FNPDMDRVDESTRUCT}
  */
-static DECLCALLBACK(void) drvHostCoreAudioDestruct(PPDMDRVINS pDrvIns)
+static DECLCALLBACK(void) drvHostAudioCaDestruct(PPDMDRVINS pDrvIns)
 {
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
     PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
 
-    drvHostCoreAudioRemoveDefaultDeviceListners(pThis);
+    drvHostAudioCaRemoveDefaultDeviceListners(pThis);
 
     int rc2 = RTCritSectDelete(&pThis->CritSect);
@@ -2252 +2270 @@
  *      Construct a Core Audio driver instance.}
  */
-static DECLCALLBACK(int) drvHostCoreAudioConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
+static DECLCALLBACK(int) drvHostAudioCaConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
     RT_NOREF(pCfg, fFlags);
@@ -2265 +2283 @@
     PDMAudioHostEnumInit(&pThis->Devices);
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface = drvHostCoreAudioQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface = drvHostAudioCaQueryInterface;
     /* IHostAudio */
-    pThis->IHostAudio.pfnGetConfig                  = drvHostCoreAudioHA_GetConfig;
-    pThis->IHostAudio.pfnGetDevices                 = drvHostCoreAudioHA_GetDevices;
-    pThis->IHostAudio.pfnGetStatus                  = drvHostCoreAudioHA_GetStatus;
+    pThis->IHostAudio.pfnGetConfig                  = drvHostAudioCaHA_GetConfig;
+    pThis->IHostAudio.pfnGetDevices                 = drvHostAudioCaHA_GetDevices;
+    pThis->IHostAudio.pfnGetStatus                  = drvHostAudioCaHA_GetStatus;
     pThis->IHostAudio.pfnDoOnWorkerThread           = NULL;
     pThis->IHostAudio.pfnStreamConfigHint           = NULL;
-    pThis->IHostAudio.pfnStreamCreate               = drvHostCoreAudioHA_StreamCreate;
+    pThis->IHostAudio.pfnStreamCreate               = drvHostAudioCaHA_StreamCreate;
     pThis->IHostAudio.pfnStreamInitAsync            = NULL;
-    pThis->IHostAudio.pfnStreamDestroy              = drvHostCoreAudioHA_StreamDestroy;
+    pThis->IHostAudio.pfnStreamDestroy              = drvHostAudioCaHA_StreamDestroy;
     pThis->IHostAudio.pfnStreamNotifyDeviceChanged  = NULL;
-    pThis->IHostAudio.pfnStreamControl              = drvHostCoreAudioHA_StreamControl;
-    pThis->IHostAudio.pfnStreamGetReadable          = drvHostCoreAudioHA_StreamGetReadable;
-    pThis->IHostAudio.pfnStreamGetWritable          = drvHostCoreAudioHA_StreamGetWritable;
+    pThis->IHostAudio.pfnStreamControl              = drvHostAudioCaHA_StreamControl;
+    pThis->IHostAudio.pfnStreamGetReadable          = drvHostAudioCaHA_StreamGetReadable;
+    pThis->IHostAudio.pfnStreamGetWritable          = drvHostAudioCaHA_StreamGetWritable;
     pThis->IHostAudio.pfnStreamGetPending           = NULL;
-    pThis->IHostAudio.pfnStreamGetState             = drvHostCoreAudioHA_StreamGetState;
-    pThis->IHostAudio.pfnStreamPlay                 = drvHostCoreAudioHA_StreamPlay;
-    pThis->IHostAudio.pfnStreamCapture              = drvHostCoreAudioHA_StreamCapture;
+    pThis->IHostAudio.pfnStreamGetState             = drvHostAudioCaHA_StreamGetState;
+    pThis->IHostAudio.pfnStreamPlay                 = drvHostAudioCaHA_StreamPlay;
+    pThis->IHostAudio.pfnStreamCapture              = drvHostAudioCaHA_StreamCapture;
 
     int rc = RTCritSectInit(&pThis->CritSect);
@@ -2290 +2308 @@
      * Enumerate audio devices.
      */
-    rc = coreAudioEnumerateDevices(pThis);
+    rc = drvHostAudioCaEnumerateDevices(pThis);
     AssertRCReturn(rc, rc);
 
@@ -2357 +2375 @@
     sizeof(DRVHOSTCOREAUDIO),
     /* pfnConstruct */
-    drvHostCoreAudioConstruct,
+    drvHostAudioCaConstruct,
     /* pfnDestruct */
-    drvHostCoreAudioDestruct,
+    drvHostAudioCaDestruct,
     /* pfnRelocate */
     NULL,
@@ -2377 +2395 @@
     NULL,
     /* pfnPowerOff */
-    drvHostCoreAudioPowerOff,
+    drvHostAudioCaPowerOff,
     /* pfnSoftReset */
     NULL,