VirtualBox

Changeset 63467 in vbox for trunk


Ignore:
Timestamp:
Aug 15, 2016 11:25:51 AM (8 years ago)
Author:
vboxsync
Message:

Audio: Partly reverted r110001 (no use of function macros anymore).

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/vmm/pdmaudioifs.h

    r63443 r63467  
    923923    } while (0)
    924924
    925 
    926 /** @todo r=bird: This stuff is UGLY even if I can see the refactoring flexibility
    927  * it buys you.  However, it makes the code TOTALLY UNREADABLE for the uninitated!
    928  *                                                                               !
    929  * Please revert ASAP, that is after fixing the core audio related problems!  If
    930  * you don't, I will then next time I'm in the vicinity.
    931  */
    932 
    933 
    934 #define PDMAUDIO_IHOSTAUDIO_FN_RET_INIT    int
    935 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_INIT (PPDMIHOSTAUDIO pInterface)
    936 
    937 #define PDMAUDIO_IHOSTAUDIO_FN_RET_SHUTDOWN    void
    938 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_SHUTDOWN (PPDMIHOSTAUDIO pInterface)
    939 
    940 #define PDMAUDIO_IHOSTAUDIO_FN_RET_GETCONFIG    int
    941 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_GETCONFIG (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    942 
    943 #define PDMAUDIO_IHOSTAUDIO_FN_RET_GETSTATUS    PDMAUDIOBACKENDSTS
    944 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_GETSTATUS (PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    945 
    946 #define PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMCREATE    int
    947 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMCREATE (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    948 
    949 #define PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMDESTROY    int
    950 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMDESTROY (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    951 
    952 #define PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMCONTROL    int
    953 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMCONTROL (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    954 
    955 #define PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMGETSTATUS    PDMAUDIOSTRMSTS
    956 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMGETSTATUS (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    957 
    958 #define PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMITERATE    int
    959 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMITERATE (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    960 
    961 #define PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMPLAY    int
    962 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMPLAY (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    963 
    964 #define PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMCAPTURE    int
    965 #define PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMCAPTURE (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    966 
    967 #define PDMAUDIO_IHOSTAUDIO_DEF_FN(a_Prefix, a_Func) \
    968     static DECLCALLBACK(PDMAUDIO_IHOSTAUDIO_FN_RET_##a_Func) a_Prefix PDMAUDIO_IHOSTAUDIO_FN_PARAMS_##a_Func
    969 
    970 #define PDMAUDIO_IHOSTAUDIO_EMIT_INIT(a_Prefix)            PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, Init),            INIT)
    971 #define PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(a_Prefix)        PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, Shutdown),        SHUTDOWN)
    972 #define PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(a_Prefix)       PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, GetConfig),       GETCONFIG)
    973 #define PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(a_Prefix)       PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, GetStatus),       GETSTATUS)
    974 #define PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(a_Prefix)    PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, StreamCreate),    STREAMCREATE)
    975 #define PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(a_Prefix)   PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, StreamDestroy),   STREAMDESTROY)
    976 #define PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(a_Prefix)   PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, StreamControl),   STREAMCONTROL)
    977 #define PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(a_Prefix) PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, StreamGetStatus), STREAMGETSTATUS)
    978 #define PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(a_Prefix)   PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, StreamIterate),   STREAMITERATE)
    979 #define PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(a_Prefix)      PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, StreamPlay),      STREAMPLAY)
    980 #define PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(a_Prefix)   PDMAUDIO_IHOSTAUDIO_DEF_FN(RT_CONCAT(a_Prefix, StreamCapture),   STREAMCAPTURE)
    981 
    982925/** Pointer to a host audio interface. */
    983926typedef struct PDMIHOSTAUDIO *PPDMIHOSTAUDIO;
    … …  
    993936     * @param   pInterface          Pointer to the interface structure containing the called function pointer.
    994937     */
    995     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_INIT, pfnInit, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_INIT);
     938    DECLR3CALLBACKMEMBER(int, pfnInit, (PPDMIHOSTAUDIO pInterface));
    996939
    997940    /**
    … …  
    1001944     * @param   pInterface          Pointer to the interface structure containing the called function pointer.
    1002945     */
    1003     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_SHUTDOWN, pfnShutdown, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_SHUTDOWN);
     946    DECLR3CALLBACKMEMBER(void, pfnShutdown, (PPDMIHOSTAUDIO pInterface));
    1004947
    1005948    /**
    … …  
    1010953     * @param   pBackendCfg         Pointer where to store the backend audio configuration to.
    1011954     */
    1012     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_GETCONFIG, pfnGetConfig, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_GETCONFIG);
     955    DECLR3CALLBACKMEMBER(int, pfnGetConfig, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg));
    1013956
    1014957    /**
    … …  
    1019962     * @param   enmDir              Audio direction to get status for. Pass PDMAUDIODIR_ANY for overall status.
    1020963     */
    1021     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_GETSTATUS, pfnGetStatus, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_GETSTATUS);
     964    DECLR3CALLBACKMEMBER(PDMAUDIOBACKENDSTS, pfnGetStatus, (PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir));
    1022965
    1023966    /**
    … …  
    1032975     * @param   pCfgAcq             Pointer to acquired stream configuration.
    1033976     */
    1034     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMCREATE, pfnStreamCreate, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMCREATE);
     977    DECLR3CALLBACKMEMBER(int, pfnStreamCreate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfg, uint32_t *pcSamples));
    1035978
    1036979    /**
    … …  
    1041984     * @param   pStream             Pointer to audio stream.
    1042985     */
    1043     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMDESTROY, pfnStreamDestroy, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMDESTROY);
     986    DECLR3CALLBACKMEMBER(int, pfnStreamDestroy, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream));
    1044987
    1045988    /**
    … …  
    1051994     * @param   enmStreamCmd        The stream command to issue.
    1052995     */
    1053     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMCONTROL, pfnStreamControl, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMCONTROL);
     996    DECLR3CALLBACKMEMBER(int, pfnStreamControl, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd));
    1054997
    1055998    /**
    … …  
    10601003     * @param   enmDir              Audio direction to check status for.
    10611004     */
    1062     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMGETSTATUS, pfnStreamGetStatus, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMGETSTATUS);
     1005    DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream));
    10631006
    10641007    /**
    … …  
    10691012     * @param   pStream             Pointer to audio stream.
    10701013     */
    1071     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMITERATE, pfnStreamIterate, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMITERATE);
     1014    DECLR3CALLBACKMEMBER(int, pfnStreamIterate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream));
    10721015
    10731016    /**
    … …  
    10811024     * @param   pcbWritten          Returns number of bytes written. Optional.
    10821025     */
    1083     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMPLAY, pfnStreamPlay, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMPLAY);
     1026    DECLR3CALLBACKMEMBER(int, pfnStreamPlay, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, uint32_t *pcSamplesPlayed));
    10841027
    10851028    /**
    … …  
    10931036     * @param   pcbRead             Returns number of bytes read. Optional.
    10941037     */
    1095     DECLR3CALLBACKMEMBER(PDMAUDIO_IHOSTAUDIO_FN_RET_STREAMCAPTURE, pfnStreamCapture, PDMAUDIO_IHOSTAUDIO_FN_PARAMS_STREAMCAPTURE);
     1038    DECLR3CALLBACKMEMBER(int, pfnStreamCapture, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, uint32_t *pcSamplesCaptured));
    10961039
    10971040} PDMIHOSTAUDIO;

  • trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp

    r63395 r63467  
    992992 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    993993 */
    994 PDMAUDIO_IHOSTAUDIO_EMIT_INIT(drvHostALSAAudio)
     994int drvHostALSAAudioInit(PPDMIHOSTAUDIO pInterface)
    995995{
    996996    NOREF(pInterface);
    … …  
    10151015 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    10161016 */
    1017 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvHostALSAAudio)
     1017int drvHostALSAAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    10181018{
    10191019    RT_NOREF(pvBuf, cbBuf);
    … …  
    11701170 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    11711171 */
    1172 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostALSAAudio)
     1172int drvHostALSAAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    11731173{
    11741174    RT_NOREF(pvBuf, cbBuf);
    … …  
    15251525 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    15261526 */
    1527 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvHostALSAAudio)
     1527int drvHostALSAAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    15281528{
    15291529    NOREF(pInterface);
    … …  
    16051605 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    16061606 */
    1607 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvHostALSAAudio)
     1607void drvHostALSAAudioShutdown(PPDMIHOSTAUDIO pInterface)
    16081608{
    16091609    NOREF(pInterface);
    … …  
    16141614 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    16151615 */
    1616 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostALSAAudio)
     1616PDMAUDIOBACKENDSTS drvHostALSAAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    16171617{
    16181618    RT_NOREF(enmDir);
    … …  
    16261626 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    16271627 */
    1628 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvHostALSAAudio)
     1628int drvHostALSAAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    16291629{
    16301630    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    16471647 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    16481648 */
    1649 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(drvHostALSAAudio)
     1649int drvHostALSAAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    16501650{
    16511651    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    16651665 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    16661666 */
    1667 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(drvHostALSAAudio)
     1667int drvHostALSAAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    16681668{
    16691669    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    16851685 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    16861686 */
    1687 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(drvHostALSAAudio)
     1687PDMAUDIOSTRMSTS drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    16881688{
    16891689    NOREF(pInterface);
    … …  
    17181718 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
    17191719 */
    1720 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(drvHostALSAAudio)
     1720int drvHostALSAAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    17211721{
    17221722    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);

  • trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp

    r63446 r63467  
    21162116 * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamPlay}
    21172117 */
    2118 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostCoreAudio)
     2118int drvHostCoreAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    21192119{
    21202120    RT_NOREF(pvBuf, cbBuf); /** @todo r=bird: this looks weird at first glance... */
    … …  
    27372737 * @interface_method_impl{PDMIHOSTAUDIO, pfnGetConfig}
    27382738 */
    2739 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvHostCoreAudio)
     2739int drvHostCoreAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    27402740{
    27412741    AssertPtrReturn(pInterface,  VERR_INVALID_POINTER);
    … …  
    27522752 * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamGetStatus}
    27532753 */
    2754 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostCoreAudio)
     2754PDMAUDIOBACKENDSTS drvHostCoreAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    27552755{
    27562756    RT_NOREF(enmDir);
    … …  
    27642764 * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamCreate}
    27652765 */
    2766 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvHostCoreAudio)
     2766int drvHostCoreAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    27672767{
    27682768    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    27882788 * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamDestroy}
    27892789 */
    2790 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(drvHostCoreAudio)
     2790int drvHostCoreAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    27912791{
    27922792    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    28062806 * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamControl}
    28072807 */
    2808 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(drvHostCoreAudio)
     2808int drvHostCoreAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    28092809{
    28102810    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    28262826 * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamGetStatus}
    28272827 */
    2828 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(drvHostCoreAudio)
     2828PDMAUDIOSTRMSTS drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    28292829{
    28302830    RT_NOREF(pInterface);
    … …  
    28652865 * @interface_method_impl{PDMIHOSTAUDIO, pfnStreamIterate}
    28662866 */
    2867 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(drvHostCoreAudio)
     2867int drvHostCoreAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    28682868{
    28692869    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    28782878 * @interface_method_impl{PDMIHOSTAUDIO, pfnShutdown}
    28792879 */
    2880 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvHostCoreAudio)
     2880void drvHostCoreAudioShutdown(PPDMIHOSTAUDIO pInterface)
    28812881{
    28822882    RT_NOREF(pInterface);

  • trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp

    r63363 r63467  
    15291529 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    15301530 */
    1531 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostDSound)
     1531int drvHostDSoundStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    15321532{
    15331533    RT_NOREF2(pvBuf, cbBuf);
    … …  
    17821782 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    17831783 */
    1784 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvHostDSound)
     1784int drvHostDSoundStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    17851785{
    17861786    RT_NOREF2(pvBuf, cbBuf);
    … …  
    19221922 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    19231923 */
    1924 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvHostDSound)
     1924int drvHostDSoundGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    19251925{
    19261926    AssertPtrReturn(pInterface,  VERR_INVALID_POINTER);
    … …  
    20492049 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    20502050 */
    2051 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvHostDSound)
     2051void drvHostDSoundShutdown(PPDMIHOSTAUDIO pInterface)
    20522052{
    20532053    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
    … …  
    20812081 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    20822082 */
    2083 PDMAUDIO_IHOSTAUDIO_EMIT_INIT(drvHostDSound)
     2083int drvHostDSoundInit(PPDMIHOSTAUDIO pInterface)
    20842084{
    20852085    PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
    … …  
    21762176 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    21772177 */
    2178 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostDSound)
     2178PDMAUDIOBACKENDSTS drvHostDSoundGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    21792179{
    21802180    RT_NOREF(enmDir);
    … …  
    21882188 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    21892189 */
    2190 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvHostDSound)
     2190int drvHostDSoundStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    21912191{
    21922192    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    22102210 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    22112211 */
    2212 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(drvHostDSound)
     2212int drvHostDSoundStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    22132213{
    22142214    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    22302230 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    22312231 */
    2232 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(drvHostDSound)
     2232int drvHostDSoundStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    22332233{
    22342234    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    22522252 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    22532253 */
    2254 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(drvHostDSound)
     2254PDMAUDIOSTRMSTS drvHostDSoundStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    22552255{
    22562256    AssertPtrReturn(pInterface, PDMAUDIOSTRMSTS_FLAG_NONE);
    … …  
    22912291 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
    22922292 */
    2293 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(drvHostDSound)
     2293int drvHostDSoundStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    22942294{
    22952295    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);

  • trunk/src/VBox/Devices/Audio/DrvHostDebugAudio.cpp

    r63362 r63467  
    7575 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    7676 */
    77 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvHostDebugAudio)
     77int drvHostDebugAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    7878{
    7979    NOREF(pInterface);
    … …  
    9797 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    9898 */
    99 PDMAUDIO_IHOSTAUDIO_EMIT_INIT(drvHostDebugAudio)
     99int drvHostDebugAudioInit(PPDMIHOSTAUDIO pInterface)
    100100{
    101101    NOREF(pInterface);
    … …  
    109109 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    110110 */
    111 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvHostDebugAudio)
     111void drvHostDebugAudioShutdown(PPDMIHOSTAUDIO pInterface)
    112112{
    113113    NOREF(pInterface);
    … …  
    118118 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    119119 */
    120 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostDebugAudio)
     120PDMAUDIOBACKENDSTS drvHostDebugAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    121121{
    122122    RT_NOREF(enmDir);
    … …  
    193193 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    194194 */
    195 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvHostDebugAudio)
     195int drvHostDebugAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    196196{
    197197    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    213213 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    214214 */
    215 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostDebugAudio)
     215int drvHostDebugAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    216216{
    217217    PDRVHOSTDEBUGAUDIO pDrv       = RT_FROM_MEMBER(pInterface, DRVHOSTDEBUGAUDIO, IHostAudio);
    … …  
    282282 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    283283 */
    284 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvHostDebugAudio)
     284int drvHostDebugAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    285285{
    286286    RT_NOREF(pInterface, pStream);

  • trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp

    r63363 r63467  
    9393 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    9494 */
    95 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvHostNullAudio)
     95int drvHostNullAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    9696{
    9797    NOREF(pInterface);
    … …  
    115115 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    116116 */
    117 PDMAUDIO_IHOSTAUDIO_EMIT_INIT(drvHostNullAudio)
     117int drvHostNullAudioInit(PPDMIHOSTAUDIO pInterface)
    118118{
    119119    NOREF(pInterface);
    … …  
    127127 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    128128 */
    129 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvHostNullAudio)
     129void drvHostNullAudioShutdown(PPDMIHOSTAUDIO pInterface)
    130130{
    131131    RT_NOREF(pInterface);
    … …  
    136136 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    137137 */
    138 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostNullAudio)
     138PDMAUDIOBACKENDSTS drvHostNullAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    139139{
    140140    RT_NOREF(enmDir);
    … …  
    148148 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    149149 */
    150 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostNullAudio)
     150int drvHostNullAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    151151{
    152152    RT_NOREF2(pvBuf, cbBuf);
    … …  
    192192 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    193193 */
    194 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvHostNullAudio)
     194int drvHostNullAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    195195{
    196196    RT_NOREF4(pInterface, pStream, pvBuf, cbBuf);
    … …  
    248248 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    249249 */
    250 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvHostNullAudio)
     250int drvHostNullAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    251251{
    252252    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    290290 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    291291 */
    292 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(drvHostNullAudio)
     292int drvHostNullAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    293293{
    294294    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    308308 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    309309 */
    310 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(drvHostNullAudio)
     310int drvHostNullAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    311311{
    312312    RT_NOREF(enmStreamCmd);
    … …  
    323323 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    324324 */
    325 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(drvHostNullAudio)
     325PDMAUDIOSTRMSTS drvHostNullAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    326326{
    327327    RT_NOREF(pInterface, pStream);
    … …  
    334334 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
    335335 */
    336 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(drvHostNullAudio)
     336int drvHostNullAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    337337{
    338338    NOREF(pInterface);

  • trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp

    r63370 r63467  
    403403 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    404404 */
    405 PDMAUDIO_IHOSTAUDIO_EMIT_INIT(drvHostOSSAudio)
     405int drvHostOSSAudioInit(PPDMIHOSTAUDIO pInterface)
    406406{
    407407    RT_NOREF(pInterface);
    … …  
    416416 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    417417 */
    418 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvHostOSSAudio)
     418int drvHostOSSAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    419419{
    420420    RT_NOREF(pInterface, cbBuf, pvBuf);
    … …  
    578578 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    579579 */
    580 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvHostOSSAudio)
     580int drvHostOSSAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    581581{
    582582    RT_NOREF(pInterface);
    … …  
    849849 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    850850 */
    851 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostOSSAudio)
     851int drvHostOSSAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    852852{
    853853    RT_NOREF(pInterface, cbBuf, pvBuf);
    … …  
    978978 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    979979 */
    980 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvHostOSSAudio)
     980void drvHostOSSAudioShutdown(PPDMIHOSTAUDIO pInterface)
    981981{
    982982    RT_NOREF(pInterface);
    … …  
    987987 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    988988 */
    989 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostOSSAudio)
     989PDMAUDIOBACKENDSTS drvHostOSSAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    990990{
    991991    AssertPtrReturn(pInterface, PDMAUDIOBACKENDSTS_UNKNOWN);
    … …  
    999999 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    10001000 */
    1001 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvHostOSSAudio)
     1001int drvHostOSSAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    10021002{
    10031003    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    10191019 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    10201020 */
    1021 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(drvHostOSSAudio)
     1021int drvHostOSSAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    10221022{
    10231023    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    10371037 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    10381038 */
    1039 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(drvHostOSSAudio)
     1039int drvHostOSSAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    10401040{
    10411041    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    10571057 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
    10581058 */
    1059 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(drvHostOSSAudio)
     1059int drvHostOSSAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    10601060{
    10611061    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    10721072 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    10731073 */
    1074 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(drvHostOSSAudio)
     1074PDMAUDIOSTRMSTS drvHostOSSAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    10751075{
    10761076    RT_NOREF(pInterface);

  • trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp

    r63371 r63467  
    523523 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    524524 */
    525 PDMAUDIO_IHOSTAUDIO_EMIT_INIT(drvHostPulseAudio)
     525int drvHostPulseAudioInit(PPDMIHOSTAUDIO pInterface)
    526526{
    527527    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    750750 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    751751 */
    752 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvHostPulseAudio)
     752int drvHostPulseAudioStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    753753{
    754754    RT_NOREF(pvBuf, cbBuf);
    … …  
    876876 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    877877 */
    878 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostPulseAudio)
     878int drvHostPulseAudioStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    879879{
    880880    RT_NOREF(pvBuf, cbBuf);
    … …  
    13251325 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    13261326 */
    1327 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvHostPulseAudio)
     1327void drvHostPulseAudioShutdown(PPDMIHOSTAUDIO pInterface)
    13281328{
    13291329    AssertPtrReturnVoid(pInterface);
    … …  
    13561356 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    13571357 */
    1358 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvHostPulseAudio)
     1358int drvHostPulseAudioGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    13591359{
    13601360    AssertPtrReturn(pInterface,  VERR_INVALID_POINTER);
    … …  
    13701370 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    13711371 */
    1372 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostPulseAudio)
     1372PDMAUDIOBACKENDSTS drvHostPulseAudioGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    13731373{
    13741374    RT_NOREF(enmDir);
    … …  
    13821382 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    13831383 */
    1384 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvHostPulseAudio)
     1384int drvHostPulseAudioStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    13851385{
    13861386    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    14041404 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    14051405 */
    1406 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(drvHostPulseAudio)
     1406int drvHostPulseAudioStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    14071407{
    14081408    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    14241424 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    14251425 */
    1426 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(drvHostPulseAudio)
     1426int drvHostPulseAudioStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    14271427{
    14281428    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    14461446 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    14471447 */
    1448 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(drvHostPulseAudio)
     1448PDMAUDIOSTRMSTS drvHostPulseAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    14491449{
    14501450    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    14871487 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetConfig}
    14881488 */
    1489 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(drvHostPulseAudio)
     1489int drvHostPulseAudioStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    14901490{
    14911491    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);

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

    r63363 r63467  
    180180 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
    181181 */
    182 PDMAUDIO_IHOSTAUDIO_EMIT_INIT(drvAudioVRDE)
     182int drvAudioVRDEInit(PPDMIHOSTAUDIO pInterface)
    183183{
    184184    RT_NOREF(pInterface);
    … …  
    192192 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
    193193 */
    194 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvAudioVRDE)
     194int drvAudioVRDEStreamCapture(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
    195195{
    196196    RT_NOREF2(pvBuf, cbBuf);
    … …  
    232232 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPlay}
    233233 */
    234 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvAudioVRDE)
     234int drvAudioVRDEStreamPlay(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
    235235{
    236236    RT_NOREF2(pvBuf, cbBuf);
    … …  
    337337 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetConfig}
    338338 */
    339 PDMAUDIO_IHOSTAUDIO_EMIT_GETCONFIG(drvAudioVRDE)
     339int drvAudioVRDEGetConfig(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDCFG pBackendCfg)
    340340{
    341341    NOREF(pInterface);
    … …  
    356356 * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
    357357 */
    358 PDMAUDIO_IHOSTAUDIO_EMIT_SHUTDOWN(drvAudioVRDE)
     358void drvAudioVRDEShutdown(PPDMIHOSTAUDIO pInterface)
    359359{
    360360    PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
    … …  
    369369 * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
    370370 */
    371 PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvAudioVRDE)
     371PDMAUDIOBACKENDSTS drvAudioVRDEGetStatus(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir)
    372372{
    373373    RT_NOREF(enmDir);
    … …  
    381381 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate}
    382382 */
    383 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCREATE(drvAudioVRDE)
     383int drvAudioVRDEStreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
    384384{
    385385    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    401401 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDestroy}
    402402 */
    403 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMDESTROY(drvAudioVRDE)
     403int drvAudioVRDEStreamDestroy(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    404404{
    405405    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    419419 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
    420420 */
    421 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCONTROL(drvAudioVRDE)
     421int drvAudioVRDEStreamControl(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    422422{
    423423    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    439439 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    440440 */
    441 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMGETSTATUS(drvAudioVRDE)
     441PDMAUDIOSTRMSTS drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    442442{
    443443    NOREF(pInterface);
    … …  
    452452 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}
    453453 */
    454 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMITERATE(drvAudioVRDE)
     454int drvAudioVRDEStreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)
    455455{
    456456    AssertPtrReturn(pInterface, VERR_INVALID_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