VirtualBox

Changeset 68272 in vbox for trunk


Ignore:
Timestamp:
Aug 3, 2017 8:25:32 AM (7 years ago)
Author:
vboxsync
Message:

Audio: Renamed PDMAUDIOSTRMSTS* -> PDMAUDIOSTREAMSTS*. No actual code changes.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r68271 r68272  
    789789
    790790/** Stream status flag. To be used with PDMAUDIOSTRMSTS_FLAG_ flags. */
    791 typedef uint32_t PDMAUDIOSTRMSTS;
     791typedef uint32_t PDMAUDIOSTREAMSTS;
    792792
    793793/** No flags being set. */
    794 #define PDMAUDIOSTRMSTS_FLAG_NONE            0
     794#define PDMAUDIOSTREAMSTS_FLAG_NONE            0
    795795/** Whether this stream has been initialized by the
    796796 *  backend or not. */
    797 #define PDMAUDIOSTRMSTS_FLAG_INITIALIZED     RT_BIT_32(0)
     797#define PDMAUDIOSTREAMSTS_FLAG_INITIALIZED     RT_BIT_32(0)
    798798/** Whether this stream is enabled or disabled. */
    799 #define PDMAUDIOSTRMSTS_FLAG_ENABLED         RT_BIT_32(1)
     799#define PDMAUDIOSTREAMSTS_FLAG_ENABLED         RT_BIT_32(1)
    800800/** Whether this stream has been paused or not. This also implies
    801801 *  that this is an enabled stream! */
    802 #define PDMAUDIOSTRMSTS_FLAG_PAUSED          RT_BIT_32(2)
     802#define PDMAUDIOSTREAMSTS_FLAG_PAUSED          RT_BIT_32(2)
    803803/** Whether this stream was marked as being disabled
    804804 *  but there are still associated guest output streams
    805805 *  which rely on its data. */
    806 #define PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE RT_BIT_32(3)
     806#define PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE RT_BIT_32(3)
    807807/** Whether this stream is in re-initialization phase.
    808808 *  All other bits remain untouched to be able to restore
    809809 *  the stream's state after the re-initialization bas been
    810810 *  finished. */
    811 #define PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT  RT_BIT_32(4)
     811#define PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT  RT_BIT_32(4)
    812812/** Validation mask. */
    813 #define PDMAUDIOSTRMSTS_VALID_MASK           UINT32_C(0x0000001F)
     813#define PDMAUDIOSTREAMSTS_VALID_MASK           UINT32_C(0x0000001F)
    814814
    815815/**
    … …  
    900900    PDMAUDIOSTREAMCFG      Cfg;
    901901    /** Stream status flag. */
    902     PDMAUDIOSTRMSTS        fStatus;
     902    PDMAUDIOSTREAMSTS        fStatus;
    903903    /** This stream's mixing buffer. */
    904904    PDMAUDIOMIXBUF         MixBuf;
    … …  
    11341134     * @param   pStream         Pointer to audio stream.
    11351135     */
    1136     DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
     1136    DECLR3CALLBACKMEMBER(PDMAUDIOSTREAMSTS, pfnStreamGetStatus, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream));
    11371137
    11381138    /**
    … …  
    13161316     * @param   pStream             Pointer to audio stream.
    13171317     */
    1318     DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
     1318    DECLR3CALLBACKMEMBER(PDMAUDIOSTREAMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));
    13191319
    13201320    /**

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

    r68268 r68272  
    840840    RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
    841841    {
    842         if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     842        if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    843843        {
    844844            Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName));
    … …  
    891891        RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
    892892        {
    893             if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     893            if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    894894            {
    895895                Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName));
    … …  
    10961096    RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
    10971097    {
    1098         if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     1098        if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    10991099        {
    11001100            Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName));
    … …  
    14931493            }
    14941494
    1495             PDMAUDIOSTRMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream);
     1495            PDMAUDIOSTREAMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream);
    14961496
    14971497            /* Is the stream not enabled and also is not in a pending disable state anymore? */
    1498             if (   !(strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED)
    1499                 && !(strmSts & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE))
     1498            if (   !(strmSts & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
     1499                && !(strmSts & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE))
    15001500            {
    15011501                cStreamsDisabled++;
    … …  
    16221622    RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node)
    16231623    {
    1624         if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     1624        if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    16251625        {
    16261626            Log3Func(("\t%s: Stream '%s' disabled, skipping ...\n", pMixStream->pszName, pMixStream->pszName));
    … …  
    18151815    if (   pMixStream->pConn
    18161816        && pMixStream->pStream
    1817         && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     1817        && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    18181818    {
    18191819        fIsActive = true;
    … …  
    18471847    if (   pMixStream->pConn
    18481848        && pMixStream->pStream
    1849         && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_INITIALIZED))
     1849        && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED))
    18501850    {
    18511851        fIsValid = true;

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

    r67806 r68272  
    18971897        }
    18981898
    1899         PDMAUDIOSTRMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream);
    1900         fIsPlaying |= (   (strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED)
    1901                        || (strmSts & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE));
     1899        PDMAUDIOSTREAMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream);
     1900        fIsPlaying |= (   (strmSts & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
     1901                       || (strmSts & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE));
    19021902    }
    19031903
    … …  
    24842484
    24852485        /** @todo No input streams available for SB16 yet. */
    2486         bool fValidOut = pCon->pfnStreamGetStatus(pCon, pDrv->Out.pStream) & PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
     2486        bool fValidOut = pCon->pfnStreamGetStatus(pCon, pDrv->Out.pStream) & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED;
    24872487        if (!fValidOut)
    24882488        {

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

    r68267 r68272  
    151151 * @param   fFlags              Stream status flags to convert.
    152152 */
    153 static char *dbgAudioStreamStatusToStr(PDMAUDIOSTRMSTS fStatus)
    154 {
    155 #define APPEND_FLAG_TO_STR(_aFlag)               \
    156     if (fStatus & PDMAUDIOSTRMSTS_FLAG_##_aFlag) \
    157     {                                            \
    158         if (pszFlags)                            \
    159         {                                        \
    160             rc2 = RTStrAAppend(&pszFlags, " ");  \
    161             if (RT_FAILURE(rc2))                 \
    162                 break;                           \
    163         }                                        \
    164                                                  \
    165         rc2 = RTStrAAppend(&pszFlags, #_aFlag);  \
    166         if (RT_FAILURE(rc2))                     \
    167             break;                               \
    168     }                                            \
     153static char *dbgAudioStreamStatusToStr(PDMAUDIOSTREAMSTS fStatus)
     154{
     155#define APPEND_FLAG_TO_STR(_aFlag)                 \
     156    if (fStatus & PDMAUDIOSTREAMSTS_FLAG_##_aFlag) \
     157    {                                              \
     158        if (pszFlags)                              \
     159        {                                          \
     160            rc2 = RTStrAAppend(&pszFlags, " ");    \
     161            if (RT_FAILURE(rc2))                   \
     162                break;                             \
     163        }                                          \
     164                                                   \
     165        rc2 = RTStrAAppend(&pszFlags, #_aFlag);    \
     166        if (RT_FAILURE(rc2))                       \
     167            break;                                 \
     168    }                                              \
    169169
    170170    char *pszFlags = NULL;
    … …  
    384384        case PDMAUDIOSTREAMCMD_ENABLE:
    385385        {
    386             if (!(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     386            if (!(pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    387387            {
    388388                if (pHstStream)
    389389                {
    390390                    /* Is a pending disable outstanding? Then disable first. */
    391                     if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)
     391                    if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE)
    392392                        rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_DISABLE);
    393393
    … …  
    397397
    398398                if (RT_SUCCESS(rc))
    399                     pGstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_ENABLED;
     399                    pGstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    400400            }
    401401            break;
    … …  
    404404        case PDMAUDIOSTREAMCMD_DISABLE:
    405405        {
    406             if (pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)
     406            if (pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
    407407            {
    408408                if (pHstStream)
    … …  
    416416                    {
    417417                        LogFunc(("[%s] Pending disable/pause\n", pHstStream->szName));
    418                         pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
     418                        pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE;
    419419                    }
    420420
    421421                    /* Can we close the host stream as well (not in pending disable mode)? */
    422                     if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE))
     422                    if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE))
    423423                        rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_DISABLE);
    424424                }
    425425
    426426                if (RT_SUCCESS(rc))
    427                     pGstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_ENABLED;
     427                    pGstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    428428            }
    429429            break;
    … …  
    432432        case PDMAUDIOSTREAMCMD_PAUSE:
    433433        {
    434             if (!(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED))
     434            if (!(pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED))
    435435            {
    436436                if (pHstStream)
    … …  
    438438
    439439                if (RT_SUCCESS(rc))
    440                     pGstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PAUSED;
     440                    pGstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PAUSED;
    441441            }
    442442            break;
    … …  
    445445        case PDMAUDIOSTREAMCMD_RESUME:
    446446        {
    447             if (pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED)
     447            if (pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED)
    448448            {
    449449                if (pHstStream)
    … …  
    451451
    452452                if (RT_SUCCESS(rc))
    453                     pGstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PAUSED;
     453                    pGstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PAUSED;
    454454            }
    455455            break;
    … …  
    500500        case PDMAUDIOSTREAMCMD_ENABLE:
    501501        {
    502             if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     502            if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    503503            {
    504504                LogRel2(("Audio: Enabling stream '%s'\n", pHstStream->szName));
    … …  
    507507                if (RT_SUCCESS(rc))
    508508                {
    509                     pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_ENABLED;
     509                    pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    510510                }
    511511                else
    … …  
    517517        case PDMAUDIOSTREAMCMD_DISABLE:
    518518        {
    519             if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)
     519            if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
    520520            {
    521521                LogRel2(("Audio: Disabling stream '%s'\n", pHstStream->szName));
    … …  
    524524                if (RT_SUCCESS(rc))
    525525                {
    526                     pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_ENABLED;
    527                     pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
     526                    pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_ENABLED;
     527                    pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE;
    528528                    AudioMixBufReset(&pHstStream->MixBuf);
    529529                }
    … …  
    537537        {
    538538            /* Only pause if the stream is enabled. */
    539             if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     539            if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    540540                break;
    541541
    542             if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED))
     542            if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED))
    543543            {
    544544                LogRel2(("Audio: Pausing stream '%s'\n", pHstStream->szName));
    … …  
    547547                if (RT_SUCCESS(rc))
    548548                {
    549                     pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PAUSED;
     549                    pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PAUSED;
    550550                }
    551551                else
    … …  
    558558        {
    559559            /* Only need to resume if the stream is enabled. */
    560             if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED))
     560            if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED))
    561561                break;
    562562
    563             if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED)
     563            if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED)
    564564            {
    565565                LogRel2(("Audio: Resuming stream '%s'\n", pHstStream->szName));
    … …  
    568568                if (RT_SUCCESS(rc))
    569569                {
    570                     pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PAUSED;
     570                    pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PAUSED;
    571571                }
    572572                else
    … …  
    754754    PPDMAUDIOSTREAM pHstStream;
    755755    RTListForEach(&pThis->lstHstStreams, pHstStream, PDMAUDIOSTREAM, Node)
    756         pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT;
     756        pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT;
    757757
    758758# ifdef VBOX_WITH_AUDIO_ENUM
    … …  
    787787     * Gather current stream status.
    788788     */
    789     bool fIsEnabled = RT_BOOL(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED); /* Stream is enabled? */
     789    bool fIsEnabled = RT_BOOL(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED); /* Stream is enabled? */
    790790
    791791    /*
    … …  
    935935
    936936#ifdef LOG_ENABLED
    937         AssertMsg(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
     937        AssertMsg(pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED,
    938938                  ("Writing to disabled guest output stream \"%s\" not possible (status is %s, host status %s)\n",
    939939                   pGstStream->szName, pszGstSts, pszHstSts));
    … …  
    11031103
    11041104    /* Is the stream scheduled for re-initialization? Do so now. */
    1105     if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT)
     1105    if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT)
    11061106    {
    11071107#ifdef VBOX_WITH_AUDIO_ENUM
    … …  
    11171117        /* Remove the pending re-init flag in any case, regardless whether the actual re-initialization succeeded
    11181118         * or not. If it failed, the backend needs to notify us again to try again at some later point in time. */
    1119         pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT;
     1119        pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT;
    11201120
    11211121        rc = drvAudioStreamReInitInternal(pThis, pStream);
    … …  
    11311131
    11321132    /* Not enabled or paused? Skip iteration. */
    1133     if (   !(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)
    1134         ||  (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED))
     1133    if (   !(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)
     1134        ||  (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED))
    11351135    {
    11361136        return VINF_SUCCESS;
    … …  
    11911191            /* Has the host stream marked as disabled but there still were guest streams relying
    11921192             * on it? Check if the stream now can be closed and do so, if possible. */
    1193             if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)
     1193            if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE)
    11941194            {
    11951195                LogFunc(("[%s] Closing pending input stream\n", pHstStream->szName));
    … …  
    11971197                if (RT_SUCCESS(rc))
    11981198                {
    1199                     pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
     1199                    pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE;
    12001200                }
    12011201                else
    … …  
    14911491
    14921492        AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus);
    1493         PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend);
     1493        PDMAUDIOSTREAMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend);
    14941494#ifdef LOG_ENABLED
    14951495        char *pszBackendSts = dbgAudioStreamStatusToStr(stsBackend);
    … …  
    14971497        RTStrFree(pszBackendSts);
    14981498#endif /* LOG_ENABLED */
    1499         if (!(stsBackend & PDMAUDIOSTRMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */
     1499        if (!(stsBackend & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */
    15001500            break;
    15011501
    … …  
    15441544            /* Has the host stream marked as disabled but there still were guest streams relying
    15451545             * on it? Check if the stream now can be closed and do so, if possible. */
    1546             if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)
     1546            if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE)
    15471547            {
    15481548                LogFunc(("[%s] All pending data played, closing output stream ...\n", pHstStream->szName));
    … …  
    15501550                if (RT_SUCCESS(rc))
    15511551                {
    1552                     pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE;
     1552                    pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE;
    15531553                }
    15541554                else
    … …  
    17811781
    17821782        AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus);
    1783         PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend);
     1783        PDMAUDIOSTREAMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend);
    17841784#ifdef LOG_ENABLED
    17851785        char *pszBackendSts = dbgAudioStreamStatusToStr(stsBackend);
    … …  
    17871787        RTStrFree(pszBackendSts);
    17881788#endif /* LOG_ENABLED */
    1789         if (!(stsBackend & PDMAUDIOSTRMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */
     1789        if (!(stsBackend & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */
    17901790            break;
    17911791
    … …  
    27722772 * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamGetStatus}
    27732773 */
    2774 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioStreamGetStatus(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
     2774static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioStreamGetStatus(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
    27752775{
    27762776    AssertPtrReturn(pInterface, false);
    27772777
    27782778    if (!pStream)
    2779         return PDMAUDIOSTRMSTS_FLAG_NONE;
     2779        return PDMAUDIOSTREAMSTS_FLAG_NONE;
    27802780
    27812781    PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
    … …  
    27842784    AssertRC(rc2);
    27852785
    2786     PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_NONE;
     2786    PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_NONE;
    27872787
    27882788    PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
    … …  
    29512951              ("Stream '%s' is not a host stream and therefore has no backend\n", pHstStream->szName));
    29522952
    2953     AssertMsg((pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED) == 0,
     2953    AssertMsg((pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED) == 0,
    29542954              ("Stream '%s' already initialized in backend\n", pHstStream->szName));
    29552955
    … …  
    29822982     * in the host backend. This is necessary for trying to re-initialize the stream
    29832983     * at some later point in time. */
    2984     pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
     2984    pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_INITIALIZED;
    29852985
    29862986    if (pCfgAcq)
    … …  
    30163016#endif /* LOG_ENABLED */
    30173017
    3018     if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED)
     3018    if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED)
    30193019    {
    30203020        /* Check if the pointer to  the host audio driver is still valid.
    … …  
    30243024        if (RT_SUCCESS(rc))
    30253025        {
    3026             pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
     3026            pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_INITIALIZED;
    30273027#if 0 /** @todo r=andy Disabled for now -- need to test this on Windows hosts. */
    30283028            Assert(pHstStream->fStatus == PDMAUDIOSTRMSTS_FLAG_NONE);
    … …  
    30563056    if (pStream->enmCtx == PDMAUDIOSTREAMCTX_GUEST)
    30573057    {
    3058         if (pStream->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED)
     3058        if (pStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED)
    30593059        {
    30603060            rc = drvAudioStreamControlInternal(pThis, pStream, PDMAUDIOSTREAMCMD_DISABLE);
    30613061            if (RT_SUCCESS(rc))
    30623062            {
    3063                 pStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
    3064                 Assert(pStream->fStatus == PDMAUDIOSTRMSTS_FLAG_NONE);
     3063                pStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_INITIALIZED;
     3064                Assert(pStream->fStatus == PDMAUDIOSTREAMSTS_FLAG_NONE);
    30653065            }
    30663066        }
    … …  
    30803080
    30813081        /* Reset status. */
    3082         pStream->fStatus = PDMAUDIOSTRMSTS_FLAG_NONE;
     3082        pStream->fStatus = PDMAUDIOSTREAMSTS_FLAG_NONE;
    30833083
    30843084        /* Destroy mixing buffer. */

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

    r68132 r68272  
    16761676 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    16771677 */
    1678 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     1678static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    16791679{
    16801680    RT_NOREF(pInterface, pStream);
    16811681
    1682     return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED);
     1682    return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED);
    16831683}
    16841684

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

    r68238 r68272  
    24742474 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    24752475 */
    2476 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     2476static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    24772477{
    24782478    RT_NOREF(pInterface);
    … …  
    24812481    PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pStream;
    24822482
    2483     PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_NONE;
     2483    PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_NONE;
    24842484
    24852485    if (!pCAStream->pCfg) /* Not (yet) configured? Skip. */
    … …  
    24872487
    24882488    if (ASMAtomicReadU32(&pCAStream->enmStatus) == COREAUDIOSTATUS_INIT)
    2489         strmSts |= PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED;
     2489        strmSts |= PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    24902490
    24912491    return strmSts;

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

    r68266 r68272  
    22622262{
    22632263    RT_NOREF(pInterface);
    2264     AssertPtrReturn(pStream, PDMAUDIOSTRMSTS_FLAG_NONE);
     2264    AssertPtrReturn(pStream, PDMAUDIOSTREAMSTS_FLAG_NONE);
    22652265
    22662266    PDSOUNDSTREAM pStreamDS = (PDSOUNDSTREAM)pStream;
    … …  
    22802280    RT_NOREF(pInterface, pStream);
    22812281
    2282     AssertPtrReturn(pInterface, PDMAUDIOSTRMSTS_FLAG_NONE);
    2283     AssertPtrReturn(pStream,    PDMAUDIOSTRMSTS_FLAG_NONE);
     2282    AssertPtrReturn(pInterface, PDMAUDIOSTREAMSTS_FLAG_NONE);
     2283    AssertPtrReturn(pStream,    PDMAUDIOSTREAMSTS_FLAG_NONE);
    22842284
    22852285    PDRVHOSTDSOUND pThis     = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface);
    … …  
    23052305 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    23062306 */
    2307 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDSoundStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     2307static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostDSoundStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    23082308{
    23092309    RT_NOREF(pInterface);
    2310     AssertPtrReturn(pStream, PDMAUDIOSTRMSTS_FLAG_NONE);
     2310    AssertPtrReturn(pStream, PDMAUDIOSTREAMSTS_FLAG_NONE);
    23112311
    23122312    PDSOUNDSTREAM pStreamDS = (PDSOUNDSTREAM)pStream;
    23132313
    23142314    if (!pStreamDS->pCfg) /* Not (yet) configured? Skip. */
    2315         return PDMAUDIOSTRMSTS_FLAG_NONE;
    2316 
    2317     PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_INITIALIZED;
     2315        return PDMAUDIOSTREAMSTS_FLAG_NONE;
     2316
     2317    PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_INITIALIZED;
    23182318    if (pStreamDS->pCfg->enmDir == PDMAUDIODIR_IN)
    23192319    {
    23202320        if (pStreamDS->In.fEnabled)
    2321             strmSts |= PDMAUDIOSTRMSTS_FLAG_ENABLED;
     2321            strmSts |= PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    23222322    }
    23232323    else
    23242324    {
    23252325        if (pStreamDS->Out.fEnabled)
    2326             strmSts |= PDMAUDIOSTRMSTS_FLAG_ENABLED;
     2326            strmSts |= PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    23272327    }
    23282328

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

    r68241 r68272  
    378378 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable}
    379379 */
    380 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDebugAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     380static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostDebugAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    381381{
    382382    RT_NOREF(pInterface, pStream);
    383383
    384     return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED);
     384    return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED);
    385385}
    386386

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

    r68132 r68272  
    302302 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    303303 */
    304 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostNullAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     304static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostNullAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    305305{
    306306    RT_NOREF(pInterface, pStream);
    307     return PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED;
     307    return PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    308308}
    309309

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

    r68132 r68272  
    10731073 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    10741074 */
    1075 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostOSSAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     1075static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostOSSAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    10761076{
    10771077    RT_NOREF(pInterface, pStream);
    10781078
    1079     PDMAUDIOSTRMSTS strmSts =   PDMAUDIOSTRMSTS_FLAG_INITIALIZED
    1080                               | PDMAUDIOSTRMSTS_FLAG_ENABLED;
     1079    PDMAUDIOSTREAMSTS strmSts =   PDMAUDIOSTREAMSTS_FLAG_INITIALIZED
     1080                              | PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    10811081    return strmSts;
    10821082}

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

    r68132 r68272  
    15711571 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    15721572 */
    1573 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostPulseAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     1573static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostPulseAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    15741574{
    15751575    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    … …  
    15781578    PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface);
    15791579
    1580     PDMAUDIOSTRMSTS strmSts  = PDMAUDIOSTRMSTS_FLAG_NONE;
     1580    PDMAUDIOSTREAMSTS strmSts  = PDMAUDIOSTREAMSTS_FLAG_NONE;
    15811581
    15821582    /* Check PulseAudio's general status. */
    … …  
    15841584        && PA_CONTEXT_IS_GOOD(pa_context_get_state(pThis->pContext)))
    15851585    {
    1586        strmSts = PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED;
     1586       strmSts = PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED;
    15871587    }
    15881588

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

    r68132 r68272  
    406406}
    407407
    408 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostVaKitAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     408static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostVaKitAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    409409{
    410410    RT_NOREF(pInterface, pStream);
    411411
    412     return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED);
     412    return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED);
    413413}
    414414

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

    r68132 r68272  
    534534 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    535535 */
    536 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     536static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    537537{
    538538    RT_NOREF(pInterface, pStream);
    539539
    540     return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED);
     540    return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED);
    541541}
    542542

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

    r68132 r68272  
    852852 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
    853853 */
    854 static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVideoRecStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
     854static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVideoRecStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
    855855{
    856856    RT_NOREF(pInterface, pStream);
    857857
    858     return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED);
     858    return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED);
    859859}
    860860
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