- Timestamp:
- Oct 20, 2021 9:03:22 AM (3 years ago)
- Location:
- trunk/src/VBox/Devices/Audio
- Files:
-
- 5 edited
-
DrvAudio.cpp (modified) (4 diffs)
-
DrvHostAudioAlsa.cpp (modified) (2 diffs)
-
DrvHostAudioCoreAudio.cpp (modified) (3 diffs)
-
DrvHostAudioPulseAudio.cpp (modified) (2 diffs)
-
DrvHostAudioWasApi.cpp (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DrvAudio.cpp
r90016 r91861 4633 4633 { 4634 4634 PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); 4635 PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO); 4635 PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO); 4636 PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3; 4636 4637 LogFlowFunc(("pDrvIns=%#p, pCfgHandle=%#p, fFlags=%x\n", pDrvIns, pCfg, fFlags)); 4637 4638 … … 4670 4671 "In|Out"); 4671 4672 4672 int rc = CFGMR3QueryStringDef(pCfg, "DriverName", pThis->BackendCfg.szName, sizeof(pThis->BackendCfg.szName), "Untitled");4673 int rc = pHlp->pfnCFGMQueryStringDef(pCfg, "DriverName", pThis->BackendCfg.szName, sizeof(pThis->BackendCfg.szName), "Untitled"); 4673 4674 AssertLogRelRCReturn(rc, rc); 4674 4675 4675 4676 /* Neither input nor output by default for security reasons. */ 4676 rc = CFGMR3QueryBoolDef(pCfg, "InputEnabled", &pThis->In.fEnabled, false);4677 rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "InputEnabled", &pThis->In.fEnabled, false); 4677 4678 AssertLogRelRCReturn(rc, rc); 4678 4679 4679 rc = CFGMR3QueryBoolDef(pCfg, "OutputEnabled", &pThis->Out.fEnabled, false);4680 rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "OutputEnabled", &pThis->Out.fEnabled, false); 4680 4681 AssertLogRelRCReturn(rc, rc); 4681 4682 4682 4683 /* Debug stuff (same for both directions). */ 4683 rc = CFGMR3QueryBoolDef(pCfg, "DebugEnabled", &pThis->CfgIn.Dbg.fEnabled, false);4684 rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "DebugEnabled", &pThis->CfgIn.Dbg.fEnabled, false); 4684 4685 AssertLogRelRCReturn(rc, rc); 4685 4686 4686 rc = CFGMR3QueryStringDef(pCfg, "DebugPathOut", pThis->CfgIn.Dbg.szPathOut, sizeof(pThis->CfgIn.Dbg.szPathOut), "");4687 rc = pHlp->pfnCFGMQueryStringDef(pCfg, "DebugPathOut", pThis->CfgIn.Dbg.szPathOut, sizeof(pThis->CfgIn.Dbg.szPathOut), ""); 4687 4688 AssertLogRelRCReturn(rc, rc); 4688 4689 if (pThis->CfgIn.Dbg.szPathOut[0] == '\0') … … 4720 4721 #define QUERY_VAL_RET(a_Width, a_szName, a_pValue, a_uDefault, a_ExprValid, a_szValidRange) \ 4721 4722 do { \ 4722 rc = RT_CONCAT( CFGMR3QueryU,a_Width)(pDirNode, strcpy(szNm, a_szName), a_pValue); \4723 rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pDirNode, strcpy(szNm, a_szName), a_pValue); \ 4723 4724 if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT) \ 4724 4725 { \ 4725 rc = RT_CONCAT( CFGMR3QueryU,a_Width)(pCfg, strcat(szNm, pszDir), a_pValue); \4726 rc = RT_CONCAT(pHlp->pfnCFGMQueryU,a_Width)(pCfg, strcat(szNm, pszDir), a_pValue); \ 4726 4727 if (rc == VERR_CFGM_VALUE_NOT_FOUND || rc == VERR_CFGM_NO_PARENT) \ 4727 4728 { \ … … 4739 4740 } while (0) 4740 4741 4741 PCFGMNODE const pDirNode = CFGMR3GetChild(pCfg, pszDir);4742 rc = CFGMR3ValidateConfig(pDirNode, iDir == 0 ? "In/" : "Out/",4743 "PCMSampleBit|"4744 "PCMSampleHz|"4745 "PCMSampleSigned|"4746 "PCMSampleSwapEndian|"4747 "PCMSampleChannels|"4748 "PeriodSizeMs|"4749 "BufferSizeMs|"4750 "PreBufferSizeMs",4751 "", pDrvIns->pReg->szName, pDrvIns->iInstance);4742 PCFGMNODE const pDirNode = pHlp->pfnCFGMGetChild(pCfg, pszDir); 4743 rc = pHlp->pfnCFGMValidateConfig(pDirNode, iDir == 0 ? "In/" : "Out/", 4744 "PCMSampleBit|" 4745 "PCMSampleHz|" 4746 "PCMSampleSigned|" 4747 "PCMSampleSwapEndian|" 4748 "PCMSampleChannels|" 4749 "PeriodSizeMs|" 4750 "BufferSizeMs|" 4751 "PreBufferSizeMs", 4752 "", pDrvIns->pReg->szName, pDrvIns->iInstance); 4752 4753 AssertRCReturn(rc, rc); 4753 4754 -
trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp
r91841 r91861 1475 1475 RT_NOREF(fFlags); 1476 1476 PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); 1477 PDRVHSTAUDALSA pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDALSA); 1477 PDRVHSTAUDALSA pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDALSA); 1478 PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3; 1478 1479 LogRel(("Audio: Initializing ALSA driver\n")); 1479 1480 … … 1514 1515 PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "OutputDeviceID|InputDeviceID", ""); 1515 1516 1516 rc = CFGMR3QueryStringDef(pCfg, "InputDeviceID", pThis->szInputDev, sizeof(pThis->szInputDev), "default");1517 rc = pHlp->pfnCFGMQueryStringDef(pCfg, "InputDeviceID", pThis->szInputDev, sizeof(pThis->szInputDev), "default"); 1517 1518 AssertRCReturn(rc, rc); 1518 rc = CFGMR3QueryStringDef(pCfg, "OutputDeviceID", pThis->szOutputDev, sizeof(pThis->szOutputDev), "default");1519 rc = pHlp->pfnCFGMQueryStringDef(pCfg, "OutputDeviceID", pThis->szOutputDev, sizeof(pThis->szOutputDev), "default"); 1519 1520 AssertRCReturn(rc, rc); 1520 1521 -
trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp
r91425 r91861 2723 2723 RT_NOREF(pCfg, fFlags); 2724 2724 PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); 2725 PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO); 2725 PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO); 2726 PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3; 2726 2727 LogRel(("Audio: Initializing Core Audio driver\n")); 2727 2728 … … 2770 2771 2771 2772 char *pszTmp = NULL; 2772 rc = CFGMR3QueryStringAlloc(pCfg, "InputDeviceID", &pszTmp);2773 rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "InputDeviceID", &pszTmp); 2773 2774 if (RT_SUCCESS(rc)) 2774 2775 { … … 2779 2780 return PDMDRV_SET_ERROR(pDrvIns, rc, "Failed to query 'InputDeviceID'"); 2780 2781 2781 rc = CFGMR3QueryStringAlloc(pCfg, "OutputDeviceID", &pszTmp);2782 rc = pHlp->pfnCFGMQueryStringAlloc(pCfg, "OutputDeviceID", &pszTmp); 2782 2783 if (RT_SUCCESS(rc)) 2783 2784 { -
trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp
r91185 r91861 2208 2208 RT_NOREF(pCfg, fFlags); 2209 2209 PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); 2210 PDRVHSTAUDPA pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDPA); 2210 PDRVHSTAUDPA pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDPA); 2211 PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3; 2212 2211 2213 LogRel(("Audio: Initializing PulseAudio driver\n")); 2212 2214 … … 2244 2246 */ 2245 2247 PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "VmName|InputDeviceID|OutputDeviceID", ""); 2246 int rc = CFGMR3QueryString(pCfg, "VmName", pThis->szStreamName, sizeof(pThis->szStreamName));2248 int rc = pHlp->pfnCFGMQueryString(pCfg, "VmName", pThis->szStreamName, sizeof(pThis->szStreamName)); 2247 2249 AssertMsgRCReturn(rc, ("Confguration error: No/bad \"VmName\" value, rc=%Rrc\n", rc), rc); 2248 rc = CFGMR3QueryStringDef(pCfg, "InputDeviceID", pThis->szInputDev, sizeof(pThis->szInputDev), "");2250 rc = pHlp->pfnCFGMQueryStringDef(pCfg, "InputDeviceID", pThis->szInputDev, sizeof(pThis->szInputDev), ""); 2249 2251 AssertMsgRCReturn(rc, ("Confguration error: Failed to read \"InputDeviceID\" as string: rc=%Rrc\n", rc), rc); 2250 rc = CFGMR3QueryStringDef(pCfg, "OutputDeviceID", pThis->szOutputDev, sizeof(pThis->szOutputDev), "");2252 rc = pHlp->pfnCFGMQueryStringDef(pCfg, "OutputDeviceID", pThis->szOutputDev, sizeof(pThis->szOutputDev), ""); 2251 2253 AssertMsgRCReturn(rc, ("Confguration error: Failed to read \"OutputDeviceID\" as string: rc=%Rrc\n", rc), rc); 2252 2254 -
trunk/src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp
r90778 r91861 3089 3089 { 3090 3090 PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); 3091 PDRVHOSTAUDIOWAS pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTAUDIOWAS); 3091 PDRVHOSTAUDIOWAS pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTAUDIOWAS); 3092 PCPDMDRVHLPR3 pHlp = pDrvIns->pHlpR3; 3092 3093 RT_NOREF(fFlags, pCfg); 3093 3094 … … 3134 3135 3135 3136 char szTmp[1024]; 3136 int rc = CFGMR3QueryStringDef(pCfg, "InputDeviceID", szTmp, sizeof(szTmp), "");3137 int rc = pHlp->pfnCFGMQueryStringDef(pCfg, "InputDeviceID", szTmp, sizeof(szTmp), ""); 3137 3138 AssertMsgRCReturn(rc, ("Confguration error: Failed to read \"InputDeviceID\" as string: rc=%Rrc\n", rc), rc); 3138 3139 if (szTmp[0]) … … 3142 3143 } 3143 3144 3144 rc = CFGMR3QueryStringDef(pCfg, "OutputDeviceID", szTmp, sizeof(szTmp), "");3145 rc = pHlp->pfnCFGMQueryStringDef(pCfg, "OutputDeviceID", szTmp, sizeof(szTmp), ""); 3145 3146 AssertMsgRCReturn(rc, ("Confguration error: Failed to read \"OutputDeviceID\" as string: rc=%Rrc\n", rc), rc); 3146 3147 if (szTmp[0])
Note:
See TracChangeset
for help on using the changeset viewer.

