VirtualBox

Changeset 88023 in vbox


Ignore:
Timestamp:
Mar 8, 2021 6:01:15 PM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
143151
Message:

Audio: Preparing to move some of the DrvAudio.h stuff into PDM. bugref:9890

Location:
trunk/src/VBox
Files:
17 edited

Legend:

Unmodified
Added
Removed

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

    r88022 r88023  
    618618
    619619    PDMAUDIOSTREAMCFG CfgHost;
    620     rc = DrvAudioHlpStreamCfgInitFromPcmProps(&CfgHost, &pSink->PCMProps);
     620    rc = PDMAudioStrmCfgInitWithProps(&CfgHost, &pSink->PCMProps);
    621621    AssertRCReturn(rc, rc);
    622622

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

    r87989 r88023  
    22682268    LogFunc(("szSink=%s, szStream=%s, cChannels=%RU8\n", pMixSink->pszName, pCfg->szName, pCfg->Props.cChannels));
    22692269
    2270     PPDMAUDIOSTREAMCFG pStreamCfg = DrvAudioHlpStreamCfgDup(pCfg);
     2270    PPDMAUDIOSTREAMCFG pStreamCfg = PDMAudioStrmCfgDup(pCfg);
    22712271    if (!pStreamCfg)
    22722272        return VERR_NO_MEMORY;
    … …  
    23702370    }
    23712371
    2372     DrvAudioHlpStreamCfgFree(pStreamCfg);
     2372    PDMAudioStrmCfgFree(pStreamCfg);
    23732373
    23742374    LogFlowFuncLeaveRC(rc);

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

    r88022 r88023  
    18461846    AssertPtrReturn(pMixSink, VERR_INVALID_POINTER);
    18471847
    1848     PPDMAUDIOSTREAMCFG pStreamCfg = DrvAudioHlpStreamCfgDup(pCfg);
     1848    PPDMAUDIOSTREAMCFG pStreamCfg = PDMAudioStrmCfgDup(pCfg);
    18491849    if (!pStreamCfg)
    18501850        return VERR_NO_MEMORY;
    … …  
    18521852    if (!RTStrPrintf(pStreamCfg->szName, sizeof(pStreamCfg->szName), "%s", pCfg->szName))
    18531853    {
    1854         DrvAudioHlpStreamCfgFree(pStreamCfg);
     1854        PDMAudioStrmCfgFree(pStreamCfg);
    18551855        return VERR_BUFFER_OVERFLOW;
    18561856    }
    … …  
    19211921        rc = VERR_INVALID_PARAMETER;
    19221922
    1923     DrvAudioHlpStreamCfgFree(pStreamCfg);
     1923    PDMAudioStrmCfgFree(pStreamCfg);
    19241924
    19251925    LogFlowFuncLeaveRC(rc);
    … …  
    21932193        /* Only (re-)create the stream (and driver chain) if we really have to.
    21942194         * Otherwise avoid this and just reuse it, as this costs performance. */
    2195         if (   !DrvAudioHlpStreamCfgMatchesPcmProps(&Cfg, &pStreamCC->State.Cfg.Props)
     2195        if (   !PDMAudioStrmCfgMatchesProps(&Cfg, &pStreamCC->State.Cfg.Props)
    21962196            || fForce)
    21972197        {
    … …  
    22352235                    rc = ichac97R3MixerAddDrvStreams(pThisCC, pMixSink, &Cfg);
    22362236                    if (RT_SUCCESS(rc))
    2237                         rc = DrvAudioHlpStreamCfgCopy(&pStreamCC->State.Cfg, &Cfg);
     2237                        rc = PDMAudioStrmCfgCopy(&pStreamCC->State.Cfg, &Cfg);
    22382238                }
    22392239            }

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

    r88015 r88023  
    17681768    Assert(DrvAudioHlpStreamCfgIsValid(pCfg));
    17691769
    1770     PPDMAUDIOSTREAMCFG pCfgHost = DrvAudioHlpStreamCfgDup(pCfg);
     1770    PPDMAUDIOSTREAMCFG pCfgHost = PDMAudioStrmCfgDup(pCfg);
    17711771    if (!pCfgHost)
    17721772        return VERR_NO_MEMORY;
    … …  
    17861786    }
    17871787
    1788     DrvAudioHlpStreamCfgFree(pCfgHost);
     1788    PDMAudioStrmCfgFree(pCfgHost);
    17891789
    17901790    return rc;
    … …  
    18391839        Cfg.Props.cShift    = PDMAUDIOPCMPROPS_MAKE_SHIFT_PARMS(Cfg.Props.cbSample, Cfg.Props.cChannels);
    18401840
    1841         if (!DrvAudioHlpStreamCfgMatchesPcmProps(&Cfg, &pThis->Out.Cfg.Props))
     1841        if (!PDMAudioStrmCfgMatchesProps(&Cfg, &pThis->Out.Cfg.Props))
    18421842        {
    18431843            Cfg.enmDir      = PDMAUDIODIR_OUT;
    … …  
    18691869        return VERR_INVALID_PARAMETER;
    18701870
    1871     int rc = DrvAudioHlpStreamCfgCopy(&pThis->Out.Cfg, pCfg);
     1871    int rc = PDMAudioStrmCfgCopy(&pThis->Out.Cfg, pCfg);
    18721872    if (RT_SUCCESS(rc))
    18731873    {

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

    r88022 r88023  
    561561#ifdef LOG_ENABLED
    562562    LogFunc(("[%s] Requested host format:\n", pStream->szName));
    563     DrvAudioHlpStreamCfgPrint(pCfgHost);
     563    PDMAudioStrmCfgLog(pCfgHost);
    564564#endif
    565565
    … …  
    581581#ifdef LOG_ENABLED
    582582    LogFunc(("[%s] Acquired host format:\n",  pStream->szName));
    583     DrvAudioHlpStreamCfgPrint(&CfgHostAcq);
     583    PDMAudioStrmCfgLog(&CfgHostAcq);
    584584#endif
    585585
    … …  
    658658
    659659    /* Make a copy of the acquired host stream configuration. */
    660     rc = DrvAudioHlpStreamCfgCopy(&pStream->Host.Cfg, &CfgHostAcq);
     660    rc = PDMAudioStrmCfgCopy(&pStream->Host.Cfg, &CfgHostAcq);
    661661    AssertRC(rc);
    662662
    … …  
    683683
    684684    /* Make a copy of the guest stream configuration. */
    685     rc = DrvAudioHlpStreamCfgCopy(&pStream->Guest.Cfg, pCfgGuest);
     685    rc = PDMAudioStrmCfgCopy(&pStream->Guest.Cfg, pCfgGuest);
    686686    AssertRC(rc);
    687687
    … …  
    840840#ifdef LOG_ENABLED
    841841                LogFunc(("[%s] Acquired host format:\n",  pStream->szName));
    842                 DrvAudioHlpStreamCfgPrint(&CfgHostAcq);
     842                PDMAudioStrmCfgLog(&CfgHostAcq);
    843843#endif
    844844            }
    … …  
    25572557    LogFlowFunc(("Host=%s, Guest=%s\n", pCfgHost->szName, pCfgGuest->szName));
    25582558#ifdef DEBUG
    2559     DrvAudioHlpStreamCfgPrint(pCfgHost);
    2560     DrvAudioHlpStreamCfgPrint(pCfgGuest);
     2559    PDMAudioStrmCfgLog(pCfgHost);
     2560    PDMAudioStrmCfgLog(pCfgGuest);
    25612561#endif
    25622562
    … …  
    32973297    /* Make the acquired host configuration the requested host configuration initially,
    32983298     * in case the backend does not report back an acquired configuration. */
    3299     int rc = DrvAudioHlpStreamCfgCopy(pCfgAcq, pCfgReq);
     3299    int rc = PDMAudioStrmCfgCopy(pCfgAcq, pCfgReq);
    33003300    if (RT_FAILURE(rc))
    33013301    {

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

    r88022 r88023  
    189189const char *DrvAudioHlpAudDirToStr(PDMAUDIODIR enmDir);
    190190const char *DrvAudioHlpAudFmtToStr(PDMAUDIOFMT enmFmt);
    191 bool DrvAudioHlpAudFmtIsSigned(PDMAUDIOFMT enmFmt);
    192 uint8_t DrvAudioHlpAudFmtToBits(PDMAUDIOFMT enmFmt);
     191bool        PDMAudioFormatIsSigned(PDMAUDIOFMT enmFmt);
     192uint8_t     PDMAudioFormatGetBits(PDMAUDIOFMT enmFmt);
    193193/** @}  */
    194194
    … …  
    225225/** @name Audio configuration helper methods.
    226226 * @{ */
    227 void    DrvAudioHlpStreamCfgInit(PPDMAUDIOSTREAMCFG pCfg);
    228 int     DrvAudioHlpStreamCfgInitFromPcmProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps);
     227void    PDMAudioStrmCfgInit(PPDMAUDIOSTREAMCFG pCfg);
     228int     PDMAudioStrmCfgInitWithProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps);
     229bool    PDMAudioStrmCfgMatchesProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps);
     230int     PDMAudioStrmCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg);
     231PPDMAUDIOSTREAMCFG PDMAudioStrmCfgDup(PCPDMAUDIOSTREAMCFG pCfg);
     232void    PDMAudioStrmCfgFree(PPDMAUDIOSTREAMCFG pCfg);
     233void    PDMAudioStrmCfgLog(PCPDMAUDIOSTREAMCFG pCfg);
     234
    229235bool    DrvAudioHlpStreamCfgIsValid(PCPDMAUDIOSTREAMCFG pCfg);
    230 bool    DrvAudioHlpStreamCfgMatchesPcmProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps);
    231 int     DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg);
    232 PPDMAUDIOSTREAMCFG DrvAudioHlpStreamCfgDup(PCPDMAUDIOSTREAMCFG pCfg);
    233 void    DrvAudioHlpStreamCfgFree(PPDMAUDIOSTREAMCFG pCfg);
    234 void    DrvAudioHlpStreamCfgPrint(PCPDMAUDIOSTREAMCFG pCfg);
    235236/** @}  */
    236237

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

    r88022 r88023  
    621621 * @param   enmFmt              Audio format to retrieve value for.
    622622 */
    623 bool DrvAudioHlpAudFmtIsSigned(PDMAUDIOFMT enmFmt)
     623bool PDMAudioFormatIsSigned(PDMAUDIOFMT enmFmt)
    624624{
    625625    switch (enmFmt)
    … …  
    650650 * @param   enmFmt              Audio format to retrieve value for.
    651651 */
    652 uint8_t DrvAudioHlpAudFmtToBits(PDMAUDIOFMT enmFmt)
     652uint8_t PDMAudioFormatGetBits(PDMAUDIOFMT enmFmt)
    653653{
    654654    switch (enmFmt)
    … …  
    742742 * @param   pCfg                Stream configuration to initialize.
    743743 */
    744 void DrvAudioHlpStreamCfgInit(PPDMAUDIOSTREAMCFG pCfg)
     744void PDMAudioStrmCfgInit(PPDMAUDIOSTREAMCFG pCfg)
    745745{
    746746    AssertPtrReturnVoid(pCfg);
    … …  
    758758 * @param   pProps      PCM properties to use.
    759759 */
    760 int DrvAudioHlpStreamCfgInitFromPcmProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
     760int PDMAudioStrmCfgInitWithProps(PPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
    761761{
    762762    AssertPtrReturn(pProps, VERR_INVALID_POINTER);
    763763    AssertPtrReturn(pCfg,   VERR_INVALID_POINTER);
    764764
    765     DrvAudioHlpStreamCfgInit(pCfg);
     765    PDMAudioStrmCfgInit(pCfg);
    766766
    767767    memcpy(&pCfg->Props, pProps, sizeof(PDMAUDIOPCMPROPS));
    … …  
    798798 * @param   pProps  PCM properties to match with.
    799799 */
    800 bool DrvAudioHlpStreamCfgMatchesPcmProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
     800bool PDMAudioStrmCfgMatchesProps(PCPDMAUDIOSTREAMCFG pCfg, PCPDMAUDIOPCMPROPS pProps)
    801801{
    802802    AssertPtrReturn(pCfg, false);
    … …  
    809809 * @param   pCfg                Audio stream configuration to free.
    810810 */
    811 void DrvAudioHlpStreamCfgFree(PPDMAUDIOSTREAMCFG pCfg)
     811void PDMAudioStrmCfgFree(PPDMAUDIOSTREAMCFG pCfg)
    812812{
    813813    if (pCfg)
    … …  
    825825 * @param   pSrcCfg             Source stream configuration to copy to destination.
    826826 */
    827 int DrvAudioHlpStreamCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg)
     827int PDMAudioStrmCfgCopy(PPDMAUDIOSTREAMCFG pDstCfg, PCPDMAUDIOSTREAMCFG pSrcCfg)
    828828{
    829829    AssertPtrReturn(pDstCfg, VERR_INVALID_POINTER);
    … …  
    845845/**
    846846 * Duplicates an audio stream configuration.
    847  * Must be free'd with DrvAudioHlpStreamCfgFree().
     847 * Must be free'd with PDMAudioStrmCfgFree().
    848848 *
    849849 * @return  Duplicates audio stream configuration on success, or NULL on failure.
    850850 * @param   pCfg                    Audio stream configuration to duplicate.
    851851 */
    852 PPDMAUDIOSTREAMCFG DrvAudioHlpStreamCfgDup(PCPDMAUDIOSTREAMCFG pCfg)
     852PPDMAUDIOSTREAMCFG PDMAudioStrmCfgDup(PCPDMAUDIOSTREAMCFG pCfg)
    853853{
    854854    AssertPtrReturn(pCfg, NULL);
    … …  
    866866        return NULL;
    867867
    868     int rc2 = DrvAudioHlpStreamCfgCopy(pDst, pCfg);
     868    int rc2 = PDMAudioStrmCfgCopy(pDst, pCfg);
    869869    if (RT_FAILURE(rc2))
    870870    {
    871         DrvAudioHlpStreamCfgFree(pDst);
     871        PDMAudioStrmCfgFree(pDst);
    872872        pDst = NULL;
    873873    }
    … …  
    882882 * @param   pCfg                Stream configuration to log.
    883883 */
    884 void DrvAudioHlpStreamCfgPrint(PCPDMAUDIOSTREAMCFG pCfg)
    885 {
    886     if (!pCfg)
    887         return;
    888 
    889     LogFunc(("szName=%s, enmDir=%RU32 (uHz=%RU32, cBits=%RU8%s, cChannels=%RU8)\n",
    890              pCfg->szName, pCfg->enmDir,
    891              pCfg->Props.uHz, pCfg->Props.cbSample * 8, pCfg->Props.fSigned ? "S" : "U", pCfg->Props.cChannels));
     884void PDMAudioStrmCfgLog(PCPDMAUDIOSTREAMCFG pCfg)
     885{
     886    if (pCfg)
     887        LogFunc(("szName=%s enmDir=%RU32 uHz=%RU32 cBits=%RU8%s cChannels=%RU8\n", pCfg->szName, pCfg->enmDir,
     888                 pCfg->Props.uHz, pCfg->Props.cbSample * 8, pCfg->Props.fSigned ? "S" : "U", pCfg->Props.cChannels));
    892889}
    893890
    … …  
    999996uint32_t PDMAudioPropsGetBitrate(PCPDMAUDIOPCMPROPS pProps)
    1000997{
    1001     return DrvAudioHlpCalcBitrate(pProps->cbSample * 8, pProps->uHz, pProps->cChannels);
     998    return pProps->cbSample * pProps->cChannels * pProps->uHz * 8;
    1002999}
    10031000

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

    r88022 r88023  
    13651365    if (RT_SUCCESS(rc))
    13661366    {
    1367         pStreamALSA->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     1367        pStreamALSA->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    13681368        if (!pStreamALSA->pCfg)
    13691369            rc = VERR_NO_MEMORY;
    … …  
    13951395    if (RT_SUCCESS(rc))
    13961396    {
    1397         DrvAudioHlpStreamCfgFree(pStreamALSA->pCfg);
     1397        PDMAudioStrmCfgFree(pStreamALSA->pCfg);
    13981398        pStreamALSA->pCfg = NULL;
    13991399    }

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

    r88022 r88023  
    15931593    /* Create the recording device's out format based on our required audio settings. */
    15941594    Assert(pCAStream->pCfg == NULL);
    1595     pCAStream->pCfg = DrvAudioHlpStreamCfgDup(pCfgReq);
     1595    pCAStream->pCfg = PDMAudioStrmCfgDup(pCfgReq);
    15961596    if (!pCAStream->pCfg)
    15971597        rc = VERR_NO_MEMORY;
    … …  
    16561656    if (pCAStream->pCfg)
    16571657    {
    1658         DrvAudioHlpStreamCfgFree(pCAStream->pCfg);
     1658        PDMAudioStrmCfgFree(pCAStream->pCfg);
    16591659        pCAStream->pCfg = NULL;
    16601660    }

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

    r88022 r88023  
    19151915    if (SUCCEEDED(hr))
    19161916    {
    1917         rc = DrvAudioHlpStreamCfgCopy(&pStreamDS->Cfg, pCfgAcq);
     1917        rc = PDMAudioStrmCfgCopy(&pStreamDS->Cfg, pCfgAcq);
    19181918        if (RT_SUCCESS(rc))
    19191919            dsoundStreamReset(pThis, pStreamDS);
    … …  
    20942094    if (SUCCEEDED(hr))
    20952095    {
    2096         rc = DrvAudioHlpStreamCfgCopy(&pStreamDS->Cfg, pCfgAcq);
     2096        rc = PDMAudioStrmCfgCopy(&pStreamDS->Cfg, pCfgAcq);
    20972097        if (RT_SUCCESS(rc))
    20982098            dsoundStreamReset(pThis, pStreamDS);
    … …  
    21292129                    if (SUCCEEDED(hr))
    21302130                    {
    2131                         rc = DrvAudioHlpStreamCfgCopy(&pStreamDS->Cfg, &CfgAcq);
     2131                        rc = PDMAudioStrmCfgCopy(&pStreamDS->Cfg, &CfgAcq);
    21322132                        if (RT_FAILURE(rc))
    21332133                            break;
    … …  
    23872387    if (RT_SUCCESS(rc))
    23882388    {
    2389         rc = DrvAudioHlpStreamCfgCopy(&pStreamDS->Cfg, pCfgAcq);
     2389        rc = PDMAudioStrmCfgCopy(&pStreamDS->Cfg, pCfgAcq);
    23902390        if (RT_SUCCESS(rc))
    23912391            rc = RTCritSectInit(&pStreamDS->CritSect);

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

    r88022 r88023  
    203203    if (RT_SUCCESS(rc))
    204204    {
    205         pStreamDbg->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     205        pStreamDbg->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    206206        if (!pStreamDbg->pCfg)
    207207            rc = VERR_NO_MEMORY;
    … …  
    316316        DrvAudioHlpFileDestroy(pStreamDbg->pFile);
    317317
    318         DrvAudioHlpStreamCfgFree(pStreamDbg->pCfg);
     318        PDMAudioStrmCfgFree(pStreamDbg->pCfg);
    319319        pStreamDbg->pCfg = NULL;
    320320    }

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

    r88022 r88023  
    214214    if (RT_SUCCESS(rc))
    215215    {
    216         pStreamNull->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     216        pStreamNull->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    217217        if (!pStreamNull->pCfg)
    218218            rc = VERR_NO_MEMORY;
    … …  
    258258    if (RT_SUCCESS(rc))
    259259    {
    260         DrvAudioHlpStreamCfgFree(pStreamNull->pCfg);
     260        PDMAudioStrmCfgFree(pStreamNull->pCfg);
    261261        pStreamNull->pCfg = NULL;
    262262    }

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

    r88022 r88023  
    971971    if (RT_SUCCESS(rc))
    972972    {
    973         pStreamOSS->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     973        pStreamOSS->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    974974        if (!pStreamOSS->pCfg)
    975975            rc = VERR_NO_MEMORY;
    … …  
    10011001    if (RT_SUCCESS(rc))
    10021002    {
    1003         DrvAudioHlpStreamCfgFree(pStreamOSS->pCfg);
     1003        PDMAudioStrmCfgFree(pStreamOSS->pCfg);
    10041004        pStreamOSS->pCfg = NULL;
    10051005    }

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

    r88022 r88023  
    15201520    if (RT_SUCCESS(rc))
    15211521    {
    1522         pStreamPA->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     1522        pStreamPA->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    15231523        if (!pStreamPA->pCfg)
    15241524            rc = VERR_NO_MEMORY;
    … …  
    15531553    if (RT_SUCCESS(rc))
    15541554    {
    1555         DrvAudioHlpStreamCfgFree(pStreamPA->pCfg);
     1555        PDMAudioStrmCfgFree(pStreamPA->pCfg);
    15561556        pStreamPA->pCfg = NULL;
    15571557    }

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

    r88022 r88023  
    205205    if (RT_SUCCESS(rc))
    206206    {
    207         pStreamDbg->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     207        pStreamDbg->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    208208        if (!pStreamDbg->pCfg)
    209209            rc = VERR_NO_MEMORY;
    … …  
    326326    if (RT_SUCCESS(rc))
    327327    {
    328         DrvAudioHlpStreamCfgFree(pStreamDbg->pCfg);
     328        PDMAudioStrmCfgFree(pStreamDbg->pCfg);
    329329        pStreamDbg->pCfg = NULL;
    330330    }

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

    r88022 r88023  
    940940    if (RT_SUCCESS(rc))
    941941    {
    942         pStreamAV->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     942        pStreamAV->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    943943        if (!pStreamAV->pCfg)
    944944            rc = VERR_NO_MEMORY;
    … …  
    970970    if (RT_SUCCESS(rc))
    971971    {
    972         DrvAudioHlpStreamCfgFree(pStreamAV->pCfg);
     972        PDMAudioStrmCfgFree(pStreamAV->pCfg);
    973973        pStreamAV->pCfg = NULL;
    974974    }

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

    r88022 r88023  
    437437    if (RT_SUCCESS(rc))
    438438    {
    439         pStreamVRDE->pCfg = DrvAudioHlpStreamCfgDup(pCfgAcq);
     439        pStreamVRDE->pCfg = PDMAudioStrmCfgDup(pCfgAcq);
    440440        if (!pStreamVRDE->pCfg)
    441441            rc = VERR_NO_MEMORY;
    … …  
    468468    if (RT_SUCCESS(rc))
    469469    {
    470         DrvAudioHlpStreamCfgFree(pStreamVRDE->pCfg);
     470        PDMAudioStrmCfgFree(pStreamVRDE->pCfg);
    471471        pStreamVRDE->pCfg = NULL;
    472472    }
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