Changeset 88378 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 7, 2021 7:58:26 AM (4 years ago)

Author:

vboxsync

Message:

Audio: Removed unused pfnStream(Play|Capture)(Begin|End) methods from PDMIHOSTAUDIO. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (4 diffs)
• DrvHostAudioAlsa.cpp (modified) (1 diff)
• DrvHostAudioCoreAudio.cpp (modified) (1 diff)
• DrvHostAudioDSound.cpp (modified) (1 diff)
• DrvHostAudioDebug.cpp (modified) (1 diff)
• DrvHostAudioNull.cpp (modified) (1 diff)
• DrvHostAudioOss.cpp (modified) (1 diff)
• DrvHostAudioPulseAudio.cpp (modified) (1 diff)
• DrvHostAudioValidationKit.cpp (modified) (1 diff)

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

@@ -1648 +1648 @@
     if (cFramesToPlay)
     {
-        if (pThis->pHostDrvAudio->pfnStreamPlayBegin)
-            pThis->pHostDrvAudio->pfnStreamPlayBegin(pThis->pHostDrvAudio, pStreamEx->pvBackend);
-
         rc = drvAudioStreamPlayDoIt(pThis, pStreamEx, cFramesToPlay, pcFramesPlayed);
-
-        if (pThis->pHostDrvAudio->pfnStreamPlayEnd)
-            pThis->pHostDrvAudio->pfnStreamPlayEnd(pThis->pHostDrvAudio, pStreamEx->pvBackend);
 
         pStreamEx->nsLastPlayedCaptured = RTTimeNanoTS();
@@ -1935 +1929 @@
          * Do the actual capturing.
          */
-        if (pThis->pHostDrvAudio->pfnStreamCaptureBegin)
-            pThis->pHostDrvAudio->pfnStreamCaptureBegin(pThis->pHostDrvAudio, pStreamEx->pvBackend);
-
         if (RT_LIKELY(pStreamEx->Host.Cfg.enmLayout == PDMAUDIOSTREAMLAYOUT_NON_INTERLEAVED))
             rc = drvAudioStreamCaptureNonInterleaved(pThis, pStreamEx, &cfCaptured);
@@ -1944 +1935 @@
         else
             AssertFailedStmt(rc = VERR_NOT_IMPLEMENTED);
-
-        if (pThis->pHostDrvAudio->pfnStreamCaptureEnd)
-            pThis->pHostDrvAudio->pfnStreamCaptureEnd(pThis->pHostDrvAudio, pStreamEx->pvBackend);
 
         if (RT_SUCCESS(rc))
@@ -2077 +2065 @@
     AssertPtrReturn(pHostDrvAudio->pfnStreamGetStatus, VERR_INVALID_POINTER);
     AssertPtrReturn(pHostDrvAudio->pfnStreamIterate, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pHostDrvAudio->pfnStreamPlayBegin, VERR_INVALID_POINTER);
     AssertPtrReturn(pHostDrvAudio->pfnStreamPlay, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pHostDrvAudio->pfnStreamPlayEnd, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pHostDrvAudio->pfnStreamCaptureBegin, VERR_INVALID_POINTER);
     AssertPtrReturn(pHostDrvAudio->pfnStreamCapture, VERR_INVALID_POINTER);
-    AssertPtrNullReturn(pHostDrvAudio->pfnStreamCaptureEnd, VERR_INVALID_POINTER);
 
     /*

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

@@ -1506 +1506 @@
     pThis->IHostAudio.pfnGetDevices         = NULL;
     pThis->IHostAudio.pfnStreamGetPending   = drvHostALSAStreamGetPending;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
     /*

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

@@ -2565 +2565 @@
     pThis->IHostAudio.pfnGetDevices         = drvHostCoreAudioHA_GetDevices;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
     int rc = RTCritSectInit(&pThis->CritSect);

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

@@ -2708 +2708 @@
     pThis->IHostAudio.pfnGetDevices         = drvHostDSoundHA_GetDevices;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
     /*

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

@@ -424 +424 @@
     pThis->IHostAudio.pfnGetDevices         = NULL;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
 #ifdef VBOX_AUDIO_DEBUG_DUMP_PCM_DATA

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

@@ -362 +362 @@
     pThis->IHostAudio.pfnGetDevices         = NULL;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
     return VINF_SUCCESS;

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

@@ -760 +760 @@
     pThis->IHostAudio.pfnGetDevices         = NULL;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
     return VINF_SUCCESS;

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

@@ -1704 +1704 @@
     pThis->IHostAudio.pfnGetDevices         = NULL;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
     int rc2 = CFGMR3QueryString(pCfg, "StreamName", pThis->szStreamName, sizeof(pThis->szStreamName));

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

@@ -427 +427 @@
     pThis->IHostAudio.pfnGetDevices         = NULL;
     pThis->IHostAudio.pfnStreamGetPending   = NULL;
-    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
-    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
-    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
-    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
     return VINF_SUCCESS;