VirtualBox

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


Ignore:
Timestamp:
Feb 23, 2015 8:42:30 AM (10 years ago)
Author:
vboxsync
Message:

PDM/Audio: Some renaming.

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

Legend:

Unmodified
Added
Removed

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

    r54230 r54368  
    4949    PPDMDRVINS           pDrvIns;
    5050    /** Pointer to the driver instance structure. */
    51     PDMIHOSTAUDIO        IHostAudioR3;
     51    PDMIHOSTAUDIO        IHostAudio;
    5252    /** Pointer to the VRDP's console object. */
    5353    ConsoleVRDPServer   *pConsoleVRDPServer;
    … …  
    8989                                            uint32_t *pcSamples)
    9090{
    91     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     91    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    9292    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    9393
    … …  
    105105                                             uint32_t *pcSamples)
    106106{
    107     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     107    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    108108    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    109109
    … …  
    121121static DECLCALLBACK(bool) drvAudioVRDEIsEnabled(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    122122{
    123     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     123    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    124124    AssertPtrReturn(pDrv, false);
    125125
    … …  
    149149    AssertPtrReturn(pcSamplesCaptured, VERR_INVALID_POINTER);
    150150
    151     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     151    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    152152    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    153153
    … …  
    197197    /* pcSamplesPlayed is optional. */
    198198
    199     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     199    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    200200    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    201201
    … …  
    275275static DECLCALLBACK(int) drvAudioVRDEFiniIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMIN pHstStrmIn)
    276276{
    277     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     277    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    278278    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    279279
    … …  
    286286static DECLCALLBACK(int) drvAudioVRDEFiniOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHstStrmOut)
    287287{
    288     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     288    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    289289    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    290290
    … …  
    295295                                                PDMAUDIOSTREAMCMD enmStreamCmd)
    296296{
    297     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     297    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    298298    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    299299
    … …  
    311311                                               PDMAUDIOSTREAMCMD enmStreamCmd)
    312312{
    313     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudioR3);
     313    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    314314    AssertPtrReturn(pDrv, VERR_INVALID_POINTER);
    315315
    … …  
    367367
    368368    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
    369     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHOSTAUDIO, &pThis->IHostAudioR3);
     369    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHOSTAUDIO, &pThis->IHostAudio);
    370370    return NULL;
    371371}
    … …  
    483483    /* IBase */
    484484    pDrvIns->IBase.pfnQueryInterface = drvAudioVRDEQueryInterface;
    485     /* IHostAudioR3 */
    486     PDMAUDIO_IHOSTAUDIOR3_CALLBACKS(drvAudioVRDE);
     485    /* IHostAudio */
     486    PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvAudioVRDE);
    487487
    488488    /* Init defaults. */

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

    r54230 r54368  
    8181    PPDMDRVINS          pDrvIns;
    8282    /** Pointer to the driver instance structure. */
    83     PDMIHOSTAUDIO       IHostAudioR3;
     83    PDMIHOSTAUDIO       IHostAudio;
    8484    ConsoleVRDPServer *pConsoleVRDPServer;
    8585    /** Pointer to the DrvAudio port interface that is above it. */
    … …  
    380380{
    381381    LogFlowFuncEnter();
    382     PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudioR3);
     382    PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudio);
    383383
    384384    PVIDEORECAUDIOOUT pVRDEVoiceOut = (PVIDEORECAUDIOOUT)pHostVoiceOut;
    … …  
    391391{
    392392    LogFlowFuncEnter();
    393     PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudioR3);
     393    PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudio);
    394394
    395395    PVIDEORECAUDIOIN pVRDEVoice = (PVIDEORECAUDIOIN)pHostVoiceIn;
    … …  
    478478                                                 uint32_t *pcSamplesPlayed)
    479479{
    480     PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudioR3);
     480    PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudio);
    481481    PVIDEORECAUDIOOUT pVRDEVoiceOut = (PVIDEORECAUDIOOUT)pHostVoiceOut;
    482482
    … …  
    535535static DECLCALLBACK(int) drvAudioVideoRecFiniIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMIN hw)
    536536{
    537     PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudioR3);
     537    PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudio);
    538538    LogFlowFuncEnter();
    539539    pDrv->pConsoleVRDPServer->SendAudioInputEnd(NULL);
    … …  
    544544static DECLCALLBACK(int) drvAudioVideoRecFiniOut(PPDMIHOSTAUDIO pInterface, PPDMAUDIOHSTSTRMOUT pHostVoiceOut)
    545545{
    546     PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudioR3);
     546    PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudio);
    547547    LogFlowFuncEnter();
    548548
    … …  
    553553                                                    PDMAUDIOSTREAMCMD enmStreamCmd)
    554554{
    555     PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudioR3);
     555    PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudio);
    556556    LogFlowFuncEnter();
    557557
    … …  
    562562                                                   PDMAUDIOSTREAMCMD enmStreamCmd)
    563563{
    564     PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudioR3);
     564    PDRVAUDIOVIDEOREC pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVIDEOREC, IHostAudio);
    565565
    566566    /* Initialize  VRDEVoice and return to VRDP server which returns this struct back to us
    … …  
    637637    PDRVAUDIOVIDEOREC  pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOVIDEOREC);
    638638    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
    639     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHOSTAUDIO, &pThis->IHostAudioR3);
     639    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHOSTAUDIO, &pThis->IHostAudio);
    640640    return NULL;
    641641}
    … …  
    811811    /* IBase */
    812812    pDrvIns->IBase.pfnQueryInterface = drvAudioVideoRecQueryInterface;
    813     /* IHostAudioR3 */
    814     PDMAUDIO_IHOSTAUDIOR3_CALLBACKS(drvAudioVideoRec);
     813    /* IHostAudio */
     814    PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvAudioVideoRec);
    815815
    816816    /* Get VRDPServer pointer. */
Note: See TracChangeset for help on using the changeset viewer.

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