Index: /trunk/include/VBox/vmm/pdmaudioifs.h =================================================================== --- /trunk/include/VBox/vmm/pdmaudioifs.h (revision 68271) +++ /trunk/include/VBox/vmm/pdmaudioifs.h (revision 68272) @@ -789,27 +789,27 @@ /** Stream status flag. To be used with PDMAUDIOSTRMSTS_FLAG_ flags. */ -typedef uint32_t PDMAUDIOSTRMSTS; +typedef uint32_t PDMAUDIOSTREAMSTS; /** No flags being set. */ -#define PDMAUDIOSTRMSTS_FLAG_NONE 0 +#define PDMAUDIOSTREAMSTS_FLAG_NONE 0 /** Whether this stream has been initialized by the * backend or not. */ -#define PDMAUDIOSTRMSTS_FLAG_INITIALIZED RT_BIT_32(0) +#define PDMAUDIOSTREAMSTS_FLAG_INITIALIZED RT_BIT_32(0) /** Whether this stream is enabled or disabled. */ -#define PDMAUDIOSTRMSTS_FLAG_ENABLED RT_BIT_32(1) +#define PDMAUDIOSTREAMSTS_FLAG_ENABLED RT_BIT_32(1) /** Whether this stream has been paused or not. This also implies * that this is an enabled stream! */ -#define PDMAUDIOSTRMSTS_FLAG_PAUSED RT_BIT_32(2) +#define PDMAUDIOSTREAMSTS_FLAG_PAUSED RT_BIT_32(2) /** Whether this stream was marked as being disabled * but there are still associated guest output streams * which rely on its data. */ -#define PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE RT_BIT_32(3) +#define PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE RT_BIT_32(3) /** Whether this stream is in re-initialization phase. * All other bits remain untouched to be able to restore * the stream's state after the re-initialization bas been * finished. */ -#define PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT RT_BIT_32(4) +#define PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT RT_BIT_32(4) /** Validation mask. */ -#define PDMAUDIOSTRMSTS_VALID_MASK UINT32_C(0x0000001F) +#define PDMAUDIOSTREAMSTS_VALID_MASK UINT32_C(0x0000001F) /** @@ -900,5 +900,5 @@ PDMAUDIOSTREAMCFG Cfg; /** Stream status flag. */ - PDMAUDIOSTRMSTS fStatus; + PDMAUDIOSTREAMSTS fStatus; /** This stream's mixing buffer. */ PDMAUDIOMIXBUF MixBuf; @@ -1134,5 +1134,5 @@ * @param pStream Pointer to audio stream. */ - DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)); + DECLR3CALLBACKMEMBER(PDMAUDIOSTREAMSTS, pfnStreamGetStatus, (PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)); /** @@ -1316,5 +1316,5 @@ * @param pStream Pointer to audio stream. */ - DECLR3CALLBACKMEMBER(PDMAUDIOSTRMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)); + DECLR3CALLBACKMEMBER(PDMAUDIOSTREAMSTS, pfnStreamGetStatus, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)); /** Index: /trunk/src/VBox/Devices/Audio/AudioMixer.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/AudioMixer.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/AudioMixer.cpp (revision 68272) @@ -840,5 +840,5 @@ RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node) { - if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) { Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName)); @@ -891,5 +891,5 @@ RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node) { - if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) { Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName)); @@ -1096,5 +1096,5 @@ RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node) { - if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) { Log3Func(("[%s] Stream '%s' disabled, skipping ...\n", pSink->pszName, pMixStream->pszName)); @@ -1493,9 +1493,9 @@ } - PDMAUDIOSTRMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream); + PDMAUDIOSTREAMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream); /* Is the stream not enabled and also is not in a pending disable state anymore? */ - if ( !(strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED) - && !(strmSts & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)) + if ( !(strmSts & PDMAUDIOSTREAMSTS_FLAG_ENABLED) + && !(strmSts & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE)) { cStreamsDisabled++; @@ -1622,5 +1622,5 @@ RTListForEach(&pSink->lstStreams, pMixStream, AUDMIXSTREAM, Node) { - if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) { Log3Func(("\t%s: Stream '%s' disabled, skipping ...\n", pMixStream->pszName, pMixStream->pszName)); @@ -1815,5 +1815,5 @@ if ( pMixStream->pConn && pMixStream->pStream - && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) { fIsActive = true; @@ -1847,5 +1847,5 @@ if ( pMixStream->pConn && pMixStream->pStream - && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTRMSTS_FLAG_INITIALIZED)) + && RT_BOOL(pMixStream->pConn->pfnStreamGetStatus(pMixStream->pConn, pMixStream->pStream) & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED)) { fIsValid = true; Index: /trunk/src/VBox/Devices/Audio/DevSB16.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 68272) @@ -1897,7 +1897,7 @@ } - PDMAUDIOSTRMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream); - fIsPlaying |= ( (strmSts & PDMAUDIOSTRMSTS_FLAG_ENABLED) - || (strmSts & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)); + PDMAUDIOSTREAMSTS strmSts = pConn->pfnStreamGetStatus(pConn, pStream); + fIsPlaying |= ( (strmSts & PDMAUDIOSTREAMSTS_FLAG_ENABLED) + || (strmSts & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE)); } @@ -2484,5 +2484,5 @@ /** @todo No input streams available for SB16 yet. */ - bool fValidOut = pCon->pfnStreamGetStatus(pCon, pDrv->Out.pStream) & PDMAUDIOSTRMSTS_FLAG_INITIALIZED; + bool fValidOut = pCon->pfnStreamGetStatus(pCon, pDrv->Out.pStream) & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED; if (!fValidOut) { Index: /trunk/src/VBox/Devices/Audio/DrvAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvAudio.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvAudio.cpp (revision 68272) @@ -151,20 +151,20 @@ * @param fFlags Stream status flags to convert. */ -static char *dbgAudioStreamStatusToStr(PDMAUDIOSTRMSTS fStatus) -{ -#define APPEND_FLAG_TO_STR(_aFlag) \ - if (fStatus & PDMAUDIOSTRMSTS_FLAG_##_aFlag) \ - { \ - if (pszFlags) \ - { \ - rc2 = RTStrAAppend(&pszFlags, " "); \ - if (RT_FAILURE(rc2)) \ - break; \ - } \ - \ - rc2 = RTStrAAppend(&pszFlags, #_aFlag); \ - if (RT_FAILURE(rc2)) \ - break; \ - } \ +static char *dbgAudioStreamStatusToStr(PDMAUDIOSTREAMSTS fStatus) +{ +#define APPEND_FLAG_TO_STR(_aFlag) \ + if (fStatus & PDMAUDIOSTREAMSTS_FLAG_##_aFlag) \ + { \ + if (pszFlags) \ + { \ + rc2 = RTStrAAppend(&pszFlags, " "); \ + if (RT_FAILURE(rc2)) \ + break; \ + } \ + \ + rc2 = RTStrAAppend(&pszFlags, #_aFlag); \ + if (RT_FAILURE(rc2)) \ + break; \ + } \ char *pszFlags = NULL; @@ -384,10 +384,10 @@ case PDMAUDIOSTREAMCMD_ENABLE: { - if (!(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) { if (pHstStream) { /* Is a pending disable outstanding? Then disable first. */ - if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE) + if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE) rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_DISABLE); @@ -397,5 +397,5 @@ if (RT_SUCCESS(rc)) - pGstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_ENABLED; + pGstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_ENABLED; } break; @@ -404,5 +404,5 @@ case PDMAUDIOSTREAMCMD_DISABLE: { - if (pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED) + if (pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED) { if (pHstStream) @@ -416,14 +416,14 @@ { LogFunc(("[%s] Pending disable/pause\n", pHstStream->szName)); - pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE; + pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE; } /* Can we close the host stream as well (not in pending disable mode)? */ - if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE)) + if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE)) rc = drvAudioStreamControlInternalBackend(pThis, pHstStream, PDMAUDIOSTREAMCMD_DISABLE); } if (RT_SUCCESS(rc)) - pGstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_ENABLED; + pGstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_ENABLED; } break; @@ -432,5 +432,5 @@ case PDMAUDIOSTREAMCMD_PAUSE: { - if (!(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED)) + if (!(pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED)) { if (pHstStream) @@ -438,5 +438,5 @@ if (RT_SUCCESS(rc)) - pGstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PAUSED; + pGstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PAUSED; } break; @@ -445,5 +445,5 @@ case PDMAUDIOSTREAMCMD_RESUME: { - if (pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED) + if (pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED) { if (pHstStream) @@ -451,5 +451,5 @@ if (RT_SUCCESS(rc)) - pGstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PAUSED; + pGstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PAUSED; } break; @@ -500,5 +500,5 @@ case PDMAUDIOSTREAMCMD_ENABLE: { - if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) { LogRel2(("Audio: Enabling stream '%s'\n", pHstStream->szName)); @@ -507,5 +507,5 @@ if (RT_SUCCESS(rc)) { - pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_ENABLED; + pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_ENABLED; } else @@ -517,5 +517,5 @@ case PDMAUDIOSTREAMCMD_DISABLE: { - if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED) + if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED) { LogRel2(("Audio: Disabling stream '%s'\n", pHstStream->szName)); @@ -524,6 +524,6 @@ if (RT_SUCCESS(rc)) { - pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_ENABLED; - pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE; + pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_ENABLED; + pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE; AudioMixBufReset(&pHstStream->MixBuf); } @@ -537,8 +537,8 @@ { /* Only pause if the stream is enabled. */ - if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) break; - if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED)) + if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED)) { LogRel2(("Audio: Pausing stream '%s'\n", pHstStream->szName)); @@ -547,5 +547,5 @@ if (RT_SUCCESS(rc)) { - pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PAUSED; + pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PAUSED; } else @@ -558,8 +558,8 @@ { /* Only need to resume if the stream is enabled. */ - if (!(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED)) + if (!(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) break; - if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED) + if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED) { LogRel2(("Audio: Resuming stream '%s'\n", pHstStream->szName)); @@ -568,5 +568,5 @@ if (RT_SUCCESS(rc)) { - pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PAUSED; + pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PAUSED; } else @@ -754,5 +754,5 @@ PPDMAUDIOSTREAM pHstStream; RTListForEach(&pThis->lstHstStreams, pHstStream, PDMAUDIOSTREAM, Node) - pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT; + pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT; # ifdef VBOX_WITH_AUDIO_ENUM @@ -787,5 +787,5 @@ * Gather current stream status. */ - bool fIsEnabled = RT_BOOL(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED); /* Stream is enabled? */ + bool fIsEnabled = RT_BOOL(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED); /* Stream is enabled? */ /* @@ -935,5 +935,5 @@ #ifdef LOG_ENABLED - AssertMsg(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED, + AssertMsg(pGstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED, ("Writing to disabled guest output stream \"%s\" not possible (status is %s, host status %s)\n", pGstStream->szName, pszGstSts, pszHstSts)); @@ -1103,5 +1103,5 @@ /* Is the stream scheduled for re-initialization? Do so now. */ - if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT) + if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT) { #ifdef VBOX_WITH_AUDIO_ENUM @@ -1117,5 +1117,5 @@ /* Remove the pending re-init flag in any case, regardless whether the actual re-initialization succeeded * or not. If it failed, the backend needs to notify us again to try again at some later point in time. */ - pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_REINIT; + pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_REINIT; rc = drvAudioStreamReInitInternal(pThis, pStream); @@ -1131,6 +1131,6 @@ /* Not enabled or paused? Skip iteration. */ - if ( !(pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED) - || (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PAUSED)) + if ( !(pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_ENABLED) + || (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PAUSED)) { return VINF_SUCCESS; @@ -1191,5 +1191,5 @@ /* Has the host stream marked as disabled but there still were guest streams relying * on it? Check if the stream now can be closed and do so, if possible. */ - if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE) + if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE) { LogFunc(("[%s] Closing pending input stream\n", pHstStream->szName)); @@ -1197,5 +1197,5 @@ if (RT_SUCCESS(rc)) { - pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE; + pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE; } else @@ -1491,5 +1491,5 @@ AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus); - PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend); + PDMAUDIOSTREAMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend); #ifdef LOG_ENABLED char *pszBackendSts = dbgAudioStreamStatusToStr(stsBackend); @@ -1497,5 +1497,5 @@ RTStrFree(pszBackendSts); #endif /* LOG_ENABLED */ - if (!(stsBackend & PDMAUDIOSTRMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */ + if (!(stsBackend & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */ break; @@ -1544,5 +1544,5 @@ /* Has the host stream marked as disabled but there still were guest streams relying * on it? Check if the stream now can be closed and do so, if possible. */ - if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE) + if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE) { LogFunc(("[%s] All pending data played, closing output stream ...\n", pHstStream->szName)); @@ -1550,5 +1550,5 @@ if (RT_SUCCESS(rc)) { - pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_PENDING_DISABLE; + pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_PENDING_DISABLE; } else @@ -1781,5 +1781,5 @@ AssertPtr(pThis->pHostDrvAudio->pfnStreamGetStatus); - PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend); + PDMAUDIOSTREAMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream->pvBackend); #ifdef LOG_ENABLED char *pszBackendSts = dbgAudioStreamStatusToStr(stsBackend); @@ -1787,5 +1787,5 @@ RTStrFree(pszBackendSts); #endif /* LOG_ENABLED */ - if (!(stsBackend & PDMAUDIOSTRMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */ + if (!(stsBackend & PDMAUDIOSTREAMSTS_FLAG_ENABLED)) /* Backend disabled? Bail out. */ break; @@ -2772,10 +2772,10 @@ * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioStreamGetStatus(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioStreamGetStatus(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream) { AssertPtrReturn(pInterface, false); if (!pStream) - return PDMAUDIOSTRMSTS_FLAG_NONE; + return PDMAUDIOSTREAMSTS_FLAG_NONE; PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface); @@ -2784,5 +2784,5 @@ AssertRC(rc2); - PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_NONE; + PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_NONE; PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream); @@ -2951,5 +2951,5 @@ ("Stream '%s' is not a host stream and therefore has no backend\n", pHstStream->szName)); - AssertMsg((pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED) == 0, + AssertMsg((pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED) == 0, ("Stream '%s' already initialized in backend\n", pHstStream->szName)); @@ -2982,5 +2982,5 @@ * in the host backend. This is necessary for trying to re-initialize the stream * at some later point in time. */ - pHstStream->fStatus |= PDMAUDIOSTRMSTS_FLAG_INITIALIZED; + pHstStream->fStatus |= PDMAUDIOSTREAMSTS_FLAG_INITIALIZED; if (pCfgAcq) @@ -3016,5 +3016,5 @@ #endif /* LOG_ENABLED */ - if (pHstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED) + if (pHstStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED) { /* Check if the pointer to the host audio driver is still valid. @@ -3024,5 +3024,5 @@ if (RT_SUCCESS(rc)) { - pHstStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_INITIALIZED; + pHstStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_INITIALIZED; #if 0 /** @todo r=andy Disabled for now -- need to test this on Windows hosts. */ Assert(pHstStream->fStatus == PDMAUDIOSTRMSTS_FLAG_NONE); @@ -3056,11 +3056,11 @@ if (pStream->enmCtx == PDMAUDIOSTREAMCTX_GUEST) { - if (pStream->fStatus & PDMAUDIOSTRMSTS_FLAG_INITIALIZED) + if (pStream->fStatus & PDMAUDIOSTREAMSTS_FLAG_INITIALIZED) { rc = drvAudioStreamControlInternal(pThis, pStream, PDMAUDIOSTREAMCMD_DISABLE); if (RT_SUCCESS(rc)) { - pStream->fStatus &= ~PDMAUDIOSTRMSTS_FLAG_INITIALIZED; - Assert(pStream->fStatus == PDMAUDIOSTRMSTS_FLAG_NONE); + pStream->fStatus &= ~PDMAUDIOSTREAMSTS_FLAG_INITIALIZED; + Assert(pStream->fStatus == PDMAUDIOSTREAMSTS_FLAG_NONE); } } @@ -3080,5 +3080,5 @@ /* Reset status. */ - pStream->fStatus = PDMAUDIOSTRMSTS_FLAG_NONE; + pStream->fStatus = PDMAUDIOSTREAMSTS_FLAG_NONE; /* Destroy mixing buffer. */ Index: /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (revision 68272) @@ -1676,9 +1676,9 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostALSAAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface, pStream); - return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED); + return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED); } Index: /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (revision 68272) @@ -2474,5 +2474,5 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostCoreAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface); @@ -2481,5 +2481,5 @@ PCOREAUDIOSTREAM pCAStream = (PCOREAUDIOSTREAM)pStream; - PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_NONE; + PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_NONE; if (!pCAStream->pCfg) /* Not (yet) configured? Skip. */ @@ -2487,5 +2487,5 @@ if (ASMAtomicReadU32(&pCAStream->enmStatus) == COREAUDIOSTATUS_INIT) - strmSts |= PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED; + strmSts |= PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED; return strmSts; Index: /trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (revision 68272) @@ -2262,5 +2262,5 @@ { RT_NOREF(pInterface); - AssertPtrReturn(pStream, PDMAUDIOSTRMSTS_FLAG_NONE); + AssertPtrReturn(pStream, PDMAUDIOSTREAMSTS_FLAG_NONE); PDSOUNDSTREAM pStreamDS = (PDSOUNDSTREAM)pStream; @@ -2280,6 +2280,6 @@ RT_NOREF(pInterface, pStream); - AssertPtrReturn(pInterface, PDMAUDIOSTRMSTS_FLAG_NONE); - AssertPtrReturn(pStream, PDMAUDIOSTRMSTS_FLAG_NONE); + AssertPtrReturn(pInterface, PDMAUDIOSTREAMSTS_FLAG_NONE); + AssertPtrReturn(pStream, PDMAUDIOSTREAMSTS_FLAG_NONE); PDRVHOSTDSOUND pThis = PDMIHOSTAUDIO_2_DRVHOSTDSOUND(pInterface); @@ -2305,24 +2305,24 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDSoundStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostDSoundStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface); - AssertPtrReturn(pStream, PDMAUDIOSTRMSTS_FLAG_NONE); + AssertPtrReturn(pStream, PDMAUDIOSTREAMSTS_FLAG_NONE); PDSOUNDSTREAM pStreamDS = (PDSOUNDSTREAM)pStream; if (!pStreamDS->pCfg) /* Not (yet) configured? Skip. */ - return PDMAUDIOSTRMSTS_FLAG_NONE; - - PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_INITIALIZED; + return PDMAUDIOSTREAMSTS_FLAG_NONE; + + PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_INITIALIZED; if (pStreamDS->pCfg->enmDir == PDMAUDIODIR_IN) { if (pStreamDS->In.fEnabled) - strmSts |= PDMAUDIOSTRMSTS_FLAG_ENABLED; + strmSts |= PDMAUDIOSTREAMSTS_FLAG_ENABLED; } else { if (pStreamDS->Out.fEnabled) - strmSts |= PDMAUDIOSTRMSTS_FLAG_ENABLED; + strmSts |= PDMAUDIOSTREAMSTS_FLAG_ENABLED; } Index: /trunk/src/VBox/Devices/Audio/DrvHostDebugAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostDebugAudio.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostDebugAudio.cpp (revision 68272) @@ -378,9 +378,9 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetWritable} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostDebugAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostDebugAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface, pStream); - return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED); + return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED); } Index: /trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp (revision 68272) @@ -302,8 +302,8 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostNullAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostNullAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface, pStream); - return PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED; + return PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED; } Index: /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (revision 68272) @@ -1073,10 +1073,10 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostOSSAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostOSSAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface, pStream); - PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_INITIALIZED - | PDMAUDIOSTRMSTS_FLAG_ENABLED; + PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_INITIALIZED + | PDMAUDIOSTREAMSTS_FLAG_ENABLED; return strmSts; } Index: /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (revision 68272) @@ -1571,5 +1571,5 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostPulseAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostPulseAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { AssertPtrReturn(pInterface, VERR_INVALID_POINTER); @@ -1578,5 +1578,5 @@ PDRVHOSTPULSEAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTPULSEAUDIO(pInterface); - PDMAUDIOSTRMSTS strmSts = PDMAUDIOSTRMSTS_FLAG_NONE; + PDMAUDIOSTREAMSTS strmSts = PDMAUDIOSTREAMSTS_FLAG_NONE; /* Check PulseAudio's general status. */ @@ -1584,5 +1584,5 @@ && PA_CONTEXT_IS_GOOD(pa_context_get_state(pThis->pContext))) { - strmSts = PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED; + strmSts = PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED; } Index: /trunk/src/VBox/Devices/Audio/DrvHostValidationKit.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostValidationKit.cpp (revision 68271) +++ /trunk/src/VBox/Devices/Audio/DrvHostValidationKit.cpp (revision 68272) @@ -406,9 +406,9 @@ } -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvHostVaKitAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvHostVaKitAudioStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface, pStream); - return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED); + return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED); } Index: /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp (revision 68271) +++ /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp (revision 68272) @@ -534,9 +534,9 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVRDEStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface, pStream); - return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED); + return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED); } Index: /trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp (revision 68271) +++ /trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp (revision 68272) @@ -852,9 +852,9 @@ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus} */ -static DECLCALLBACK(PDMAUDIOSTRMSTS) drvAudioVideoRecStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) +static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioVideoRecStreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream) { RT_NOREF(pInterface, pStream); - return (PDMAUDIOSTRMSTS_FLAG_INITIALIZED | PDMAUDIOSTRMSTS_FLAG_ENABLED); + return (PDMAUDIOSTREAMSTS_FLAG_INITIALIZED | PDMAUDIOSTREAMSTS_FLAG_ENABLED); }