VirtualBox

Changeset 82255 in vbox for trunk/src/VBox/Main/src-client


Ignore:
Timestamp:
Nov 27, 2019 11:20:26 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
135073
Message:

vmm/pdmaudioifs.h: More of the same. bugref:9218

Location:
trunk/src/VBox/Main/src-client
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

    r82254 r82255  
    620620 * @param   enmStreamCmd        Stream command to issue.
    621621 */
    622 static int avRecControlStreamOut(PDRVAUDIORECORDING pThis,
    623                                  PAVRECSTREAM pStreamAV, PDMAUDIOSTREAMCMD enmStreamCmd)
     622static int avRecControlStreamOut(PDRVAUDIORECORDING pThis, PAVRECSTREAM pStreamAV, PDMAUDIOSTREAMCMD enmStreamCmd)
    624623{
    625624    RT_NOREF(pThis, pStreamAV);
    … …  
    647646 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    648647 */
    649 static DECLCALLBACK(int) drvAudioVideoRecInit(PPDMIHOSTAUDIO pInterface)
     648static DECLCALLBACK(int) drvAudioVideoRecHA_Init(PPDMIHOSTAUDIO pInterface)
    650649{
    651650    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    674673 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    675674 */
    676 static DECLCALLBACK(int) drvAudioVideoRecStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
    677                                                        void *pvBuf, uint32_t uBufSize, uint32_t *puRead)
     675static DECLCALLBACK(int) drvAudioVideoRecHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
     676                                                          void *pvBuf, uint32_t uBufSize, uint32_t *puRead)
    678677{
    679678    RT_NOREF(pInterface, pStream, pvBuf, uBufSize);
    … …  
    689688 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    690689 */
    691 static DECLCALLBACK(int) drvAudioVideoRecStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
    692                                                     const void *pvBuf, uint32_t uBufSize, uint32_t *puWritten)
     690static DECLCALLBACK(int) drvAudioVideoRecHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
     691                                                       const void *pvBuf, uint32_t uBufSize, uint32_t *puWritten)
    693692{
    694693    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    876875 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    877876 */
    878 static DECLCALLBACK(int) drvAudioVideoRecGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
     877static DECLCALLBACK(int) drvAudioVideoRecHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    879878{
    880879    RT_NOREF(pInterface);
    … …  
    895894 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    896895 */
    897 static DECLCALLBACK(void) drvAudioVideoRecShutdown(PPDMIHOSTAUDIO pInterface)
     896static DECLCALLBACK(void) drvAudioVideoRecHA_Shutdown(PPDMIHOSTAUDIO pInterface)
    898897{
    899898    LogFlowFuncEnter();
    … …  
    908907 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    909908 */
    910 static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvAudioVideoRecGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
     909static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvAudioVideoRecHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    911910{
    912911    RT_NOREF(enmDir);
    … …  
    920919 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    921920 */
    922 static DECLCALLBACK(int) drvAudioVideoRecStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
    923                                                       PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
     921static DECLCALLBACK(int) drvAudioVideoRecHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
     922                                                         PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    924923{
    925924    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    954953 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    955954 */
    956 static DECLCALLBACK(int) drvAudioVideoRecStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     955static DECLCALLBACK(int) drvAudioVideoRecHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    957956{
    958957    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    983982 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    984983 */
    985 static DECLCALLBACK(int) drvAudioVideoRecStreamControl(PPDMIHOSTAUDIO pInterface,
    986                                                        PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
     984static DECLCALLBACK(int) drvAudioVideoRecHA_StreamControl(PPDMIHOSTAUDIO pInterface,
     985                                                          PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    987986{
    988987    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    10051004 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetReadable}
    10061005 */
    1007 static DECLCALLBACK(uint32_t) drvAudioVideoRecStreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     1006static DECLCALLBACK(uint32_t) drvAudioVideoRecHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    10081007{
    10091008    RT_NOREF(pInterface, pStream);
    … …  
    10161015 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
    10171016 */
    1018 static DECLCALLBACK(uint32_t) drvAudioVideoRecStreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     1017static DECLCALLBACK(uint32_t) drvAudioVideoRecHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    10191018{
    10201019    RT_NOREF(pInterface, pStream);
    … …  
    10271026 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    10281027 */
    1029 static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVideoRecStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     1028static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVideoRecHA_StreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    10301029{
    10311030    RT_NOREF(pInterface, pStream);
    10321031
    1033     return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED);
     1032    return PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED | PDMAUDIOSTREAMSTS_FLAGS_ENABLED;
    10341033}
    10351034
    … …  
    10381037 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
    10391038 */
    1040 static DECLCALLBACK(int) drvAudioVideoRecStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     1039static DECLCALLBACK(int) drvAudioVideoRecHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    10411040{
    10421041    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    11551154    pDrvIns->IBase.pfnQueryInterface = drvAudioVideoRecQueryInterface;
    11561155    /* IHostAudio */
    1157     PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvAudioVideoRec);
     1156    pThis->IHostAudio.pfnInit               = drvAudioVideoRecHA_Init;
     1157    pThis->IHostAudio.pfnShutdown           = drvAudioVideoRecHA_Shutdown;
     1158    pThis->IHostAudio.pfnGetConfig          = drvAudioVideoRecHA_GetConfig;
     1159    pThis->IHostAudio.pfnGetStatus          = drvAudioVideoRecHA_GetStatus;
     1160    pThis->IHostAudio.pfnStreamCreate       = drvAudioVideoRecHA_StreamCreate;
     1161    pThis->IHostAudio.pfnStreamDestroy      = drvAudioVideoRecHA_StreamDestroy;
     1162    pThis->IHostAudio.pfnStreamControl      = drvAudioVideoRecHA_StreamControl;
     1163    pThis->IHostAudio.pfnStreamGetReadable  = drvAudioVideoRecHA_StreamGetReadable;
     1164    pThis->IHostAudio.pfnStreamGetWritable  = drvAudioVideoRecHA_StreamGetWritable;
     1165    pThis->IHostAudio.pfnStreamGetStatus    = drvAudioVideoRecHA_StreamGetStatus;
     1166    pThis->IHostAudio.pfnStreamIterate      = drvAudioVideoRecHA_StreamIterate;
     1167    pThis->IHostAudio.pfnStreamPlay         = drvAudioVideoRecHA_StreamPlay;
     1168    pThis->IHostAudio.pfnStreamCapture      = drvAudioVideoRecHA_StreamCapture;
     1169    pThis->IHostAudio.pfnSetCallback        = NULL;
     1170    pThis->IHostAudio.pfnGetDevices         = NULL;
     1171    pThis->IHostAudio.pfnStreamGetPending   = NULL;
     1172    pThis->IHostAudio.pfnStreamPlayBegin    = NULL;
     1173    pThis->IHostAudio.pfnStreamPlayEnd      = NULL;
     1174    pThis->IHostAudio.pfnStreamCaptureBegin = NULL;
     1175    pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
    11581176
    11591177    /*

  • trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

    r82254 r82255  
    220220 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    221221 */
    222 static DECLCALLBACK(int) drvAudioVRDEInit(PPDMIHOSTAUDIO pInterface)
     222static DECLCALLBACK(int) drvAudioVrdeHA_Init(PPDMIHOSTAUDIO pInterface)
    223223{
    224224    RT_NOREF(pInterface);
    … …  
    232232 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    233233 */
    234 static DECLCALLBACK(int) drvAudioVRDEStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
    235                                                    void *pvBuf, uint32_t uBufSize, uint32_t *puRead)
     234static DECLCALLBACK(int) drvAudioVrdeHA_StreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
     235                                                      void *pvBuf, uint32_t uBufSize, uint32_t *puRead)
    236236{
    237237    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    267267 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    268268 */
    269 static DECLCALLBACK(int) drvAudioVRDEStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
    270                                                 const void *pvBuf, uint32_t uBufSize, uint32_t *puWritten)
     269static DECLCALLBACK(int) drvAudioVrdeHA_StreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
     270                                                   const void *pvBuf, uint32_t uBufSize, uint32_t *puWritten)
    271271{
    272272    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    368368 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    369369 */
    370 static DECLCALLBACK(int) drvAudioVRDEGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
     370static DECLCALLBACK(int) drvAudioVrdeHA_GetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    371371{
    372372    RT_NOREF(pInterface);
    … …  
    387387 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    388388 */
    389 static DECLCALLBACK(void) drvAudioVRDEShutdown(PPDMIHOSTAUDIO pInterface)
     389static DECLCALLBACK(void) drvAudioVrdeHA_Shutdown(PPDMIHOSTAUDIO pInterface)
    390390{
    391391    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    … …  
    400400 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    401401 */
    402 static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvAudioVRDEGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
     402static DECLCALLBACK(PDMAUDIOBACKENDSTS) drvAudioVrdeHA_GetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    403403{
    404404    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    … …  
    414414 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    415415 */
    416 static DECLCALLBACK(int) drvAudioVRDEStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
    417                                                   PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
     416static DECLCALLBACK(int) drvAudioVrdeHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream,
     417                                                     PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    418418{
    419419    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    446446 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    447447 */
    448 static DECLCALLBACK(int) drvAudioVRDEStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     448static DECLCALLBACK(int) drvAudioVrdeHA_StreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    449449{
    450450    RT_NOREF(pInterface);
    … …  
    476476 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    477477 */
    478 static DECLCALLBACK(int) drvAudioVRDEStreamControl(PPDMIHOSTAUDIO pInterface,
    479                                                    PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
     478static DECLCALLBACK(int) drvAudioVrdeHA_StreamControl(PPDMIHOSTAUDIO pInterface,
     479                                                      PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    480480{
    481481    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    501501 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetReadable}
    502502 */
    503 static DECLCALLBACK(uint32_t) drvAudioVRDEStreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     503static DECLCALLBACK(uint32_t) drvAudioVrdeHA_StreamGetReadable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    504504{
    505505    RT_NOREF(pInterface);
    … …  
    521521 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
    522522 */
    523 static DECLCALLBACK(uint32_t) drvAudioVRDEStreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     523static DECLCALLBACK(uint32_t) drvAudioVrdeHA_StreamGetWritable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    524524{
    525525    PDRVAUDIOVRDE pDrv        = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    … …  
    542542 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    543543 */
    544 static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     544static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVrdeHA_StreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    545545{
    546546    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    547547    RT_NOREF(pStream);
    548548
    549     PDMAUDIOSTREAMSTS streamSts = PDMAUDIOSTREAMSTS_FLAG_INITIALIZED;
     549    PDMAUDIOSTREAMSTS fStrmStatus = PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED;
    550550
    551551    if (pDrv->cClients) /* If any clients are connected, flag the stream as enabled. */
    552        streamSts |= PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    553 
    554     return streamSts;
     552       fStrmStatus |= PDMAUDIOSTREAMSTS_FLAGS_ENABLED;
     553
     554    return fStrmStatus;
    555555}
    556556
    … …  
    559559 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
    560560 */
    561 static DECLCALLBACK(int) drvAudioVRDEStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     561static DECLCALLBACK(int) drvAudioVrdeHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    562562{
    563563    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    572572 * @interface_method_impl{PDMIBASE,pfnQueryInterface}
    573573 */
    574 static DECLCALLBACK(void *) drvAudioVRDEQueryInterface(PPDMIBASE pInterface, const char *pszIID)
     574static DECLCALLBACK(void *) drvAudioVrdeQueryInterface(PPDMIBASE pInterface, const char *pszIID)
    575575{
    576576    PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    … …  
    723723DECLCALLBACK(int) AudioVRDE::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
    724724{
    725     RT_NOREF(fFlags);
    726 
    727725    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
    728726    PDRVAUDIOVRDE pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOVRDE);
     727    RT_NOREF(fFlags);
    729728
    730729    AssertPtrReturn(pDrvIns, VERR_INVALID_POINTER);
    … …  
    743742    pThis->pDrvIns                   = pDrvIns;
    744743    /* IBase */
    745     pDrvIns->IBase.pfnQueryInterface = drvAudioVRDEQueryInterface;
     744    pDrvIns->IBase.pfnQueryInterface = drvAudioVrdeQueryInterface;
    746745    /* IHostAudio */
    747     PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvAudioVRDE);
     746    pThis->IHostAudio.pfnInit              = drvAudioVrdeHA_Init;
     747    pThis->IHostAudio.pfnShutdown          = drvAudioVrdeHA_Shutdown;
     748    pThis->IHostAudio.pfnGetConfig         = drvAudioVrdeHA_GetConfig;
     749    pThis->IHostAudio.pfnGetDevices        = NULL;
     750    pThis->IHostAudio.pfnGetStatus         = drvAudioVrdeHA_GetStatus;
     751    pThis->IHostAudio.pfnSetCallback       = NULL;
     752    pThis->IHostAudio.pfnStreamCreate      = drvAudioVrdeHA_StreamCreate;
     753    pThis->IHostAudio.pfnStreamDestroy     = drvAudioVrdeHA_StreamDestroy;
     754    pThis->IHostAudio.pfnStreamControl     = drvAudioVrdeHA_StreamControl;
     755    pThis->IHostAudio.pfnStreamGetReadable = drvAudioVrdeHA_StreamGetReadable;
     756    pThis->IHostAudio.pfnStreamGetWritable = drvAudioVrdeHA_StreamGetWritable;
     757    pThis->IHostAudio.pfnStreamGetPending  = NULL;
     758    pThis->IHostAudio.pfnStreamGetStatus   = drvAudioVrdeHA_StreamGetStatus;
     759    pThis->IHostAudio.pfnStreamIterate     = drvAudioVrdeHA_StreamIterate;
     760    pThis->IHostAudio.pfnStreamPlay        = drvAudioVrdeHA_StreamPlay;
     761    pThis->IHostAudio.pfnStreamCapture     = drvAudioVrdeHA_StreamCapture;
    748762
    749763    /*
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette