Changeset 88358 in vbox for trunk/src

Timestamp:

Apr 4, 2021 11:35:36 PM (4 years ago)

Author:

vboxsync

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

143605

Message:

Audio: Kicked out the unused callback registration interface aimed at the device side. This should be done using interfaces when/if needed (DrvAudio queries callback interfaces from the device, the device implements the ones it needs). bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (6 diffs)
• DrvHostAudioCoreAudio.cpp (modified) (1 diff)

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

@@ -294 +294 @@
          *  UINT32_MAX for unlimited streams. */
         uint32_t            cStreamsFree;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-        RTLISTANCHOR        lstCB;
-#endif
         /** The driver's input confguration (tweakable via CFGM). */
         DRVAUDIOCFG         Cfg;
@@ -308 +305 @@
          *  UINT32_MAX for unlimited streams. */
         uint32_t            cStreamsFree;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-        RTLISTANCHOR        lstCB;
-#endif
         /** The driver's output confguration (tweakable via CFGM). */
         DRVAUDIOCFG         Cfg;
@@ -1900 +1894 @@
 
 #ifdef VBOX_WITH_AUDIO_CALLBACKS  /** @todo r=bird: All this is non-sense that shall be replaced by a PDMIHOSTAUDIO partner interface. */
-
-/**
- * Duplicates an audio callback.
- *
- * @returns Pointer to duplicated callback, or NULL on failure.
- * @param   pCB                 Callback to duplicate.
- */
-static PPDMAUDIOCBRECORD drvAudioCallbackDuplicate(PPDMAUDIOCBRECORD pCB)
-{
-    AssertPtrReturn(pCB, NULL);
-
-    PPDMAUDIOCBRECORD pCBCopy = (PPDMAUDIOCBRECORD)RTMemDup((void *)pCB, sizeof(PDMAUDIOCBRECORD));
-    if (!pCBCopy)
-        return NULL;
-
-    if (pCB->pvCtx)
-    {
-        pCBCopy->pvCtx = RTMemDup(pCB->pvCtx, pCB->cbCtx);
-        if (!pCBCopy->pvCtx)
-        {
-            RTMemFree(pCBCopy);
-            return NULL;
-        }
-
-        pCBCopy->cbCtx = pCB->cbCtx;
-    }
-
-    return pCBCopy;
-}
-
-/**
- * Destroys a given callback.
- *
- * @param   pCB                 Callback to destroy.
- */
-static void drvAudioCallbackDestroy(PPDMAUDIOCBRECORD pCB)
-{
-    if (!pCB)
-        return;
-
-    RTListNodeRemove(&pCB->Node);
-    if (pCB->pvCtx)
-    {
-        Assert(pCB->cbCtx);
-        RTMemFree(pCB->pvCtx);
-    }
-    RTMemFree(pCB);
-}
-
-/**
- * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnRegisterCallbacks}
- */
-static DECLCALLBACK(int) drvAudioRegisterCallbacks(PPDMIAUDIOCONNECTOR pInterface,
-                                                   PPDMAUDIOCBRECORD paCallbacks, size_t cCallbacks)
-{
-    PDRVAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVAUDIO, IAudioConnector);
-    AssertPtr(pThis);
-    AssertPtrReturn(paCallbacks, VERR_INVALID_POINTER);
-    AssertReturn(cCallbacks,     VERR_INVALID_PARAMETER);
-    int rc = RTCritSectEnter(&pThis->CritSect);
-    AssertRCReturn(rc, rc);
-
-    /*
-     *
-     */
-    for (size_t i = 0; i < cCallbacks; i++)
-    {
-        PPDMAUDIOCBRECORD pCB = drvAudioCallbackDuplicate(&paCallbacks[i]);
-        if (!pCB)
-        {
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
-        switch (pCB->enmSource)
-        {
-            case PDMAUDIOCBSOURCE_DEVICE:
-            {
-                switch (pCB->Device.enmType)
-                {
-                    case PDMAUDIODEVICECBTYPE_DATA_INPUT:
-                        RTListAppend(&pThis->In.lstCB, &pCB->Node);
-                        break;
-
-                    case PDMAUDIODEVICECBTYPE_DATA_OUTPUT:
-                        RTListAppend(&pThis->Out.lstCB, &pCB->Node);
-                        break;
-
-                    default:
-                        AssertMsgFailed(("Not supported\n"));
-                        break;
-                }
-
-                break;
-            }
-
-            default:
-               AssertMsgFailed(("Not supported\n"));
-               break;
-        }
-    }
-
-    /** @todo Undo allocations on error. */
-
-    RTCritSectLeave(&pThis->CritSect);
-    return rc;
-}
 
 /**
@@ -3736 +3623 @@
     Assert(RTListIsEmpty(&pThis->lstStreams));
 
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    /*
-     * Destroy callbacks, if any.
-     */
-    PPDMAUDIOCBRECORD pCB, pCBNext;
-    RTListForEachSafe(&pThis->In.lstCB, pCB, pCBNext, PDMAUDIOCBRECORD, Node)
-        drvAudioCallbackDestroy(pCB);
-
-    RTListForEachSafe(&pThis->Out.lstCB, pCB, pCBNext, PDMAUDIOCBRECORD, Node)
-        drvAudioCallbackDestroy(pCB);
-#endif
-
     if (RTCritSectIsInitialized(&pThis->CritSect))
     {
@@ -3794 +3669 @@
      */
     RTListInit(&pThis->lstStreams);
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    RTListInit(&pThis->In.lstCB);
-    RTListInit(&pThis->Out.lstCB);
-#endif
 
     /*
@@ -3977 +3848 @@
     pThis->IAudioConnector.pfnStreamPlay        = drvAudioStreamPlay;
     pThis->IAudioConnector.pfnStreamCapture     = drvAudioStreamCapture;
-#ifdef VBOX_WITH_AUDIO_CALLBACKS
-    pThis->IAudioConnector.pfnRegisterCallbacks = drvAudioRegisterCallbacks;
-#endif
 
     /*

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

@@ -299 +299 @@
 #ifndef VBOX_WITH_AUDIO_CALLBACKS
     /** The device has to be reinitialized.
-     *  Note: Only needed if VBOX_WITH_AUDIO_CALLBACKS is not defined, as otherwise
-     *        the Audio Connector will take care of this as soon as this backend
-     *        tells it to do so via the provided audio callback. */
+     * @note Only needed if VBOX_WITH_AUDIO_CALLBACKS is not defined, as otherwise
+     *       the Audio Connector will take care of this as soon as this backend
+     *       tells it to do so via the provided audio callback. */
     COREAUDIOSTATUS_REINIT,
 #endif