- Timestamp:
- Jun 3, 2021 8:16:17 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
include/VBox/vmm/pdmaudioifs.h (modified) (2 diffs)
-
src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp (modified) (2 diffs)
-
src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp (modified) (1 diff)
-
src/VBox/Devices/Audio/DrvHostAudioDSound.cpp (modified) (3 diffs)
-
src/VBox/Devices/Audio/DrvHostAudioDebug.cpp (modified) (1 diff)
-
src/VBox/Devices/Audio/DrvHostAudioNull.cpp (modified) (1 diff)
-
src/VBox/Devices/Audio/DrvHostAudioOss.cpp (modified) (1 diff)
-
src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp (modified) (2 diffs)
-
src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (2 diffs)
-
src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (1 diff)
-
src/VBox/Main/src-client/DrvAudioRec.cpp (modified) (2 diffs)
-
src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/vmm/pdmaudioifs.h
r89415 r89487 1249 1249 * @retval VINF_AUDIO_STREAM_ASYNC_INIT_NEEDED if 1250 1250 * PDMIHOSTAUDIO::pfnStreamInitAsync should be called. 1251 * @param pInterface Pointer to the interface structure containing the called function pointer. 1252 * @param pStream Pointer to audio stream. 1253 * @param pCfgReq Pointer to requested stream configuration. 1254 * @param pCfgAcq Pointer to acquired stream configuration. 1255 * @todo r=bird: Implementation (at least Alsa) seems to make undocumented 1256 * assumptions about the content of @a pCfgAcq. 1251 * @param pInterface Pointer to this interface. 1252 * @param pStream Pointer to the audio stream. 1253 * @param pCfgReq The requested stream configuration. 1254 * @param pCfgAcq The acquired stream configuration - output. This is 1255 * the same as @a *pCfgReq when called, the 1256 * implementation will adjust it to make the actual 1257 * stream configuration as needed. 1257 1258 */ 1258 1259 DECLR3CALLBACKMEMBER(int, pfnStreamCreate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 1259 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq));1260 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)); 1260 1261 1261 1262 /** … … 1391 1392 1392 1393 /** PDMIHOSTAUDIO interface ID. */ 1393 #define PDMIHOSTAUDIO_IID " b942d1cd-ffbf-490b-a296-74f30884bbd6"1394 #define PDMIHOSTAUDIO_IID "0625ae75-491b-428b-836e-4f8a9869788f" 1394 1395 1395 1396 -
trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp
r89481 r89487 338 338 * @param pProps Internal audio PCM configuration to convert. 339 339 */ 340 static snd_pcm_format_t alsaAudioPropsToALSA(P PDMAUDIOPCMPROPS pProps)340 static snd_pcm_format_t alsaAudioPropsToALSA(PCPDMAUDIOPCMPROPS pProps) 341 341 { 342 342 switch (PDMAudioPropsSampleSize(pProps)) … … 680 680 */ 681 681 static DECLCALLBACK(int) drvHstAudAlsaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 682 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)682 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 683 683 { 684 684 PDRVHSTAUDALSA pThis = RT_FROM_MEMBER(pInterface, DRVHSTAUDALSA, IHostAudio); -
trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp
r89344 r89487 1516 1516 */ 1517 1517 static DECLCALLBACK(int) drvHstAudCaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 1518 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)1518 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 1519 1519 { 1520 1520 PDRVHOSTCOREAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTCOREAUDIO, IHostAudio); -
trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp
r89421 r89487 1450 1450 * actual stream format on successful return. 1451 1451 */ 1452 static HRESULT drvHostDSoundStreamCreateCapture(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, P PDMAUDIOSTREAMCFG pCfgReq,1452 static HRESULT drvHostDSoundStreamCreateCapture(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, PCPDMAUDIOSTREAMCFG pCfgReq, 1453 1453 PPDMAUDIOSTREAMCFG pCfgAcq, WAVEFORMATEXTENSIBLE *pWaveFmtExt) 1454 1454 { … … 1570 1570 * return. 1571 1571 */ 1572 static HRESULT drvHostDSoundStreamCreatePlayback(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, P PDMAUDIOSTREAMCFG pCfgReq,1572 static HRESULT drvHostDSoundStreamCreatePlayback(PDRVHOSTDSOUND pThis, PDSOUNDSTREAM pStreamDS, PCPDMAUDIOSTREAMCFG pCfgReq, 1573 1573 PPDMAUDIOSTREAMCFG pCfgAcq, WAVEFORMATEXTENSIBLE *pWaveFmtExt) 1574 1574 { … … 1684 1684 */ 1685 1685 static DECLCALLBACK(int) drvHostDSoundHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 1686 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)1686 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 1687 1687 { 1688 1688 PDRVHOSTDSOUND pThis = RT_FROM_MEMBER(pInterface, DRVHOSTDSOUND, IHostAudio); -
trunk/src/VBox/Devices/Audio/DrvHostAudioDebug.cpp
r89485 r89487 104 104 */ 105 105 static DECLCALLBACK(int) drvHstAudDebugHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 106 PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)106 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 107 107 { 108 108 PDRVHSTAUDDEBUG pThis = RT_FROM_MEMBER(pInterface, DRVHSTAUDDEBUG, IHostAudio); -
trunk/src/VBox/Devices/Audio/DrvHostAudioNull.cpp
r89484 r89487 83 83 */ 84 84 static DECLCALLBACK(int) drvHstAudNullHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 85 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)85 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 86 86 { 87 87 RT_NOREF(pInterface); -
trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp
r89479 r89487 352 352 */ 353 353 static DECLCALLBACK(int) drvHstAudOssHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 354 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)354 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 355 355 { 356 356 AssertPtr(pInterface); RT_NOREF(pInterface); -
trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp
r89483 r89487 1094 1094 */ 1095 1095 static DECLCALLBACK(int) drvHstAudPaHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 1096 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)1096 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 1097 1097 { 1098 1098 PDRVHSTAUDPA pThis = RT_FROM_MEMBER(pInterface, DRVHSTAUDPA, IHostAudio); … … 1215 1215 */ 1216 1216 for (iDst = 0; iDst < pStreamPA->ChannelMap.channels; iDst++) 1217 pCfg Req->Props.aidChannels[iDst] = drvHstAudPaConvertChannelPos(pStreamPA->ChannelMap.map[iDst]);1218 while (iDst < RT_ELEMENTS(pCfg Req->Props.aidChannels))1219 pCfg Req->Props.aidChannels[iDst++] = PDMAUDIOCHANNELID_INVALID;1217 pCfgAcq->Props.aidChannels[iDst] = drvHstAudPaConvertChannelPos(pStreamPA->ChannelMap.map[iDst]); 1218 while (iDst < RT_ELEMENTS(pCfgAcq->Props.aidChannels)) 1219 pCfgAcq->Props.aidChannels[iDst++] = PDMAUDIOCHANNELID_INVALID; 1220 1220 1221 1221 PDMAudioStrmCfgCopy(&pStreamPA->Cfg, pCfgAcq); -
trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp
r89469 r89487 334 334 335 335 336 static int drvHostValKitAudioCreateStreamIn(PDRVHOSTVALKITAUDIO pThis, PVALKITAUDIOSTREAM pStreamDbg,337 PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)338 {339 RT_NOREF(pThis, pStreamDbg, pCfgReq, pCfgAcq);340 341 return VINF_SUCCESS;342 }343 344 345 static int drvHostValKitAudioCreateStreamOut(PDRVHOSTVALKITAUDIO pThis, PVALKITAUDIOSTREAM pStreamDbg,346 PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)347 {348 RT_NOREF(pThis, pStreamDbg, pCfgReq, pCfgAcq);349 350 return VINF_SUCCESS;351 }352 353 354 336 /** 355 337 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCreate} 356 338 */ 357 339 static DECLCALLBACK(int) drvHostValKitAudioHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 358 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)340 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 359 341 { 360 342 PDRVHOSTVALKITAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTVALKITAUDIO, IHostAudio); … … 363 345 AssertPtrReturn(pCfgReq, VERR_INVALID_POINTER); 364 346 AssertPtrReturn(pCfgAcq, VERR_INVALID_POINTER); 365 366 int rc; 367 if (pCfgReq->enmDir == PDMAUDIODIR_IN) 368 rc = drvHostValKitAudioCreateStreamIn( pThis, pStreamDbg, pCfgReq, pCfgAcq); 369 else 370 rc = drvHostValKitAudioCreateStreamOut(pThis, pStreamDbg, pCfgReq, pCfgAcq); 347 RT_NOREF(pThis); 348 349 int rc = VINF_SUCCESS; 371 350 PDMAudioStrmCfgCopy(&pStreamDbg->Cfg, pCfgAcq); 372 351 return rc; -
trunk/src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp
r89420 r89487 1794 1794 */ 1795 1795 static DECLCALLBACK(int) drvHostAudioWasHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 1796 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)1796 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 1797 1797 { 1798 1798 PDRVHOSTAUDIOWAS pThis = RT_FROM_MEMBER(pInterface, DRVHOSTAUDIOWAS, IHostAudio); -
trunk/src/VBox/Main/src-client/DrvAudioRec.cpp
r89344 r89487 401 401 */ 402 402 static int avRecCreateStreamOut(PDRVAUDIORECORDING pThis, PAVRECSTREAM pStreamAV, 403 PAVRECSINK pSink, P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)403 PAVRECSINK pSink, PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 404 404 { 405 405 AssertPtrReturn(pThis, VERR_INVALID_POINTER); … … 464 464 */ 465 465 static DECLCALLBACK(int) drvAudioVideoRecHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 466 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)466 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 467 467 { 468 468 PDRVAUDIORECORDING pThis = RT_FROM_CPP_MEMBER(pInterface, DRVAUDIORECORDING, IHostAudio); -
trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp
r89415 r89487 357 357 */ 358 358 static DECLCALLBACK(int) drvAudioVrdeHA_StreamCreate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream, 359 P PDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)359 PCPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 360 360 { 361 361 PDRVAUDIOVRDE pThis = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
Note:
See TracChangeset
for help on using the changeset viewer.

