Changeset 88380 in vbox
- Timestamp:
- Apr 7, 2021 8:04:04 AM (4 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/vmm/pdmaudioifs.h
r88379 r88380 1338 1338 1339 1339 /** 1340 * Gives the host backend the chance to do some (necessary) iteration work.1341 *1342 * @returns VBox status code.1343 * @param pInterface Pointer to the interface structure containing the called function pointer.1344 * @param pStream Pointer to audio stream.1345 */1346 DECLR3CALLBACKMEMBER(int, pfnStreamIterate, (PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream));1347 1348 /**1349 1340 * Plays (writes to) an audio (output) stream. 1350 1341 * -
trunk/src/VBox/Devices/Audio/DrvAudio.cpp
r88378 r88380 1322 1322 bool fTryClosePending = false; 1323 1323 1324 int rc ;1324 int rc = VINF_SUCCESS; 1325 1325 1326 1326 do 1327 1327 { 1328 rc = pThis->pHostDrvAudio->pfnStreamIterate(pThis->pHostDrvAudio, pStreamEx->pvBackend);1329 if (RT_FAILURE(rc))1330 break;1331 1332 1328 if (pStreamEx->Core.enmDir == PDMAUDIODIR_OUT) 1333 1329 { … … 2064 2060 AssertPtrNullReturn(pHostDrvAudio->pfnStreamGetPending, VERR_INVALID_POINTER); 2065 2061 AssertPtrReturn(pHostDrvAudio->pfnStreamGetStatus, VERR_INVALID_POINTER); 2066 AssertPtrReturn(pHostDrvAudio->pfnStreamIterate, VERR_INVALID_POINTER);2067 2062 AssertPtrReturn(pHostDrvAudio->pfnStreamPlay, VERR_INVALID_POINTER); 2068 2063 AssertPtrReturn(pHostDrvAudio->pfnStreamCapture, VERR_INVALID_POINTER); -
trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp
r88378 r88380 1444 1444 1445 1445 /** 1446 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}1447 */1448 static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)1449 {1450 AssertPtrReturn(pInterface, VERR_INVALID_POINTER);1451 AssertPtrReturn(pStream, VERR_INVALID_POINTER);1452 1453 LogFlowFuncEnter();1454 1455 /* Nothing to do here for ALSA. */1456 return VINF_SUCCESS;1457 }1458 1459 1460 /**1461 1446 * @interface_method_impl{PDMIBASE,pfnQueryInterface} 1462 1447 */ … … 1501 1486 pThis->IHostAudio.pfnStreamGetWritable = drvHostAlsaAudioHA_StreamGetWritable; 1502 1487 pThis->IHostAudio.pfnStreamGetStatus = drvHostAlsaAudioHA_StreamGetStatus; 1503 pThis->IHostAudio.pfnStreamIterate = drvHostAlsaAudioHA_StreamIterate;1504 1488 pThis->IHostAudio.pfnStreamPlay = drvHostAlsaAudioHA_StreamPlay; 1505 1489 pThis->IHostAudio.pfnStreamCapture = drvHostAlsaAudioHA_StreamCapture; -
trunk/src/VBox/Devices/Audio/DrvHostAudioCoreAudio.cpp
r88378 r88380 2430 2430 2431 2431 /** 2432 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}2433 */2434 static DECLCALLBACK(int) drvHostCoreAudioHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)2435 {2436 AssertPtrReturn(pInterface, VERR_INVALID_POINTER);2437 AssertPtrReturn(pStream, VERR_INVALID_POINTER);2438 2439 RT_NOREF(pInterface, pStream);2440 2441 /* Nothing to do here for Core Audio. */2442 return VINF_SUCCESS;2443 }2444 2445 2446 /**2447 2432 * @interface_method_impl{PDMIHOSTAUDIO,pfnInit} 2448 2433 */ … … 2560 2545 pThis->IHostAudio.pfnStreamGetWritable = drvHostCoreAudioHA_StreamGetWritable; 2561 2546 pThis->IHostAudio.pfnStreamGetStatus = drvHostCoreAudioHA_StreamGetStatus; 2562 pThis->IHostAudio.pfnStreamIterate = drvHostCoreAudioHA_StreamIterate;2563 2547 pThis->IHostAudio.pfnStreamPlay = drvHostCoreAudioHA_StreamPlay; 2564 2548 pThis->IHostAudio.pfnStreamCapture = drvHostCoreAudioHA_StreamCapture; -
trunk/src/VBox/Devices/Audio/DrvHostAudioDSound.cpp
r88378 r88380 2603 2603 } 2604 2604 2605 /**2606 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}2607 */2608 static DECLCALLBACK(int) drvHostDSoundHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)2609 {2610 RT_NOREF(pInterface, pStream);2611 return VINF_SUCCESS;2612 }2613 2614 2605 2615 2606 /********************************************************************************************************************************* … … 2703 2694 pThis->IHostAudio.pfnStreamGetWritable = drvHostDSoundHA_StreamGetWritable; 2704 2695 pThis->IHostAudio.pfnStreamGetStatus = drvHostDSoundHA_StreamGetStatus; 2705 pThis->IHostAudio.pfnStreamIterate = drvHostDSoundHA_StreamIterate;2706 2696 pThis->IHostAudio.pfnStreamPlay = drvHostDSoundHA_StreamPlay; 2707 2697 pThis->IHostAudio.pfnStreamCapture = drvHostDSoundHA_StreamCapture; -
trunk/src/VBox/Devices/Audio/DrvHostAudioDebug.cpp
r88378 r88380 363 363 364 364 return PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED | PDMAUDIOSTREAMSTS_FLAGS_ENABLED; 365 }366 367 368 /**369 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}370 */371 static DECLCALLBACK(int) drvHostDebugAudioHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)372 {373 RT_NOREF(pInterface, pStream);374 return VINF_SUCCESS;375 365 } 376 366 … … 419 409 pThis->IHostAudio.pfnStreamGetWritable = drvHostDebugAudioHA_StreamGetWritable; 420 410 pThis->IHostAudio.pfnStreamGetStatus = drvHostDebugAudioHA_StreamGetStatus; 421 pThis->IHostAudio.pfnStreamIterate = drvHostDebugAudioHA_StreamIterate;422 411 pThis->IHostAudio.pfnStreamPlay = drvHostDebugAudioHA_StreamPlay; 423 412 pThis->IHostAudio.pfnStreamCapture = drvHostDebugAudioHA_StreamCapture; -
trunk/src/VBox/Devices/Audio/DrvHostAudioNull.cpp
r88378 r88380 298 298 RT_NOREF(pInterface, pStream); 299 299 return PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED | PDMAUDIOSTREAMSTS_FLAGS_ENABLED; 300 }301 302 303 /**304 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}305 */306 static DECLCALLBACK(int) drvHostNullAudioHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)307 {308 RT_NOREF(pInterface, pStream);309 return VINF_SUCCESS;310 300 } 311 301 … … 357 347 pThis->IHostAudio.pfnStreamGetWritable = drvHostNullAudioHA_StreamGetWritable; 358 348 pThis->IHostAudio.pfnStreamGetStatus = drvHostNullAudioHA_StreamGetStatus; 359 pThis->IHostAudio.pfnStreamIterate = drvHostNullAudioHA_StreamIterate;360 349 pThis->IHostAudio.pfnStreamPlay = drvHostNullAudioHA_StreamPlay; 361 350 pThis->IHostAudio.pfnStreamCapture = drvHostNullAudioHA_StreamCapture; -
trunk/src/VBox/Devices/Audio/DrvHostAudioOss.cpp
r88378 r88380 584 584 RT_NOREF(pInterface, pStream); 585 585 return PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED | PDMAUDIOSTREAMSTS_FLAGS_ENABLED; 586 }587 588 589 /**590 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}591 */592 static DECLCALLBACK(int) drvHostOssAudioHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)593 {594 AssertPtrReturn(pInterface, VERR_INVALID_POINTER);595 AssertPtrReturn(pStream, VERR_INVALID_POINTER);596 597 LogFlowFuncEnter();598 599 /* Nothing to do here for OSS. */600 return VINF_SUCCESS;601 586 } 602 587 … … 755 740 pThis->IHostAudio.pfnStreamGetWritable = drvHostOssAudioHA_StreamGetWritable; 756 741 pThis->IHostAudio.pfnStreamGetStatus = drvHostOssAudioHA_StreamGetStatus; 757 pThis->IHostAudio.pfnStreamIterate = drvHostOssAudioHA_StreamIterate;758 742 pThis->IHostAudio.pfnStreamPlay = drvHostOssAudioHA_StreamPlay; 759 743 pThis->IHostAudio.pfnStreamCapture = drvHostOssAudioHA_StreamCapture; -
trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudio.cpp
r88378 r88380 1628 1628 1629 1629 /** 1630 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}1631 */1632 static DECLCALLBACK(int) drvHostPulseAudioHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)1633 {1634 AssertPtrReturn(pInterface, VERR_INVALID_POINTER);1635 AssertPtrReturn(pStream, VERR_INVALID_POINTER);1636 1637 LogFlowFuncEnter();1638 1639 /* Nothing to do here for PulseAudio. */1640 return VINF_SUCCESS;1641 }1642 1643 1644 /**1645 1630 * @interface_method_impl{PDMIBASE,pfnQueryInterface} 1646 1631 */ … … 1699 1684 pThis->IHostAudio.pfnStreamGetWritable = drvHostPulseAudioHA_StreamGetWritable; 1700 1685 pThis->IHostAudio.pfnStreamGetStatus = drvHostPulseAudioHA_StreamGetStatus; 1701 pThis->IHostAudio.pfnStreamIterate = drvHostPulseAudioHA_StreamIterate;1702 1686 pThis->IHostAudio.pfnStreamPlay = drvHostPulseAudioHA_StreamPlay; 1703 1687 pThis->IHostAudio.pfnStreamCapture = drvHostPulseAudioHA_StreamCapture; -
trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp
r88378 r88380 371 371 return PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED | PDMAUDIOSTREAMSTS_FLAGS_ENABLED; 372 372 } 373 374 static DECLCALLBACK(int) drvHostValKitAudioHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)375 {376 RT_NOREF(pInterface, pStream);377 return VINF_SUCCESS;378 }379 380 373 381 374 /** … … 422 415 pThis->IHostAudio.pfnStreamGetWritable = drvHostValKitAudioHA_StreamGetWritable; 423 416 pThis->IHostAudio.pfnStreamGetStatus = drvHostValKitAudioHA_StreamGetStatus; 424 pThis->IHostAudio.pfnStreamIterate = drvHostValKitAudioHA_StreamIterate;425 417 pThis->IHostAudio.pfnStreamPlay = drvHostValKitAudioHA_StreamPlay; 426 418 pThis->IHostAudio.pfnStreamCapture = drvHostValKitAudioHA_StreamCapture; -
trunk/src/VBox/Main/src-client/DrvAudioRec.cpp
r88378 r88380 1024 1024 1025 1025 /** 1026 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}1027 */1028 static DECLCALLBACK(int) drvAudioVideoRecHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)1029 {1030 AssertPtrReturn(pInterface, VERR_INVALID_POINTER);1031 AssertPtrReturn(pStream, VERR_INVALID_POINTER);1032 1033 LogFlowFuncEnter();1034 1035 /* Nothing to do here for video recording. */1036 return VINF_SUCCESS;1037 }1038 1039 1040 /**1041 1026 * @interface_method_impl{PDMIBASE,pfnQueryInterface} 1042 1027 */ … … 1153 1138 pThis->IHostAudio.pfnStreamGetWritable = drvAudioVideoRecHA_StreamGetWritable; 1154 1139 pThis->IHostAudio.pfnStreamGetStatus = drvAudioVideoRecHA_StreamGetStatus; 1155 pThis->IHostAudio.pfnStreamIterate = drvAudioVideoRecHA_StreamIterate;1156 1140 pThis->IHostAudio.pfnStreamPlay = drvAudioVideoRecHA_StreamPlay; 1157 1141 pThis->IHostAudio.pfnStreamCapture = drvAudioVideoRecHA_StreamCapture; -
trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp
r88362 r88380 525 525 526 526 return fStrmStatus; 527 }528 529 530 /**531 * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamIterate}532 */533 static DECLCALLBACK(int) drvAudioVrdeHA_StreamIterate(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)534 {535 AssertPtrReturn(pInterface, VERR_INVALID_POINTER);536 AssertPtrReturn(pStream, VERR_INVALID_POINTER);537 538 /* Nothing to do here for VRDE. */539 return VINF_SUCCESS;540 527 } 541 528 … … 728 715 pThis->IHostAudio.pfnStreamGetPending = NULL; 729 716 pThis->IHostAudio.pfnStreamGetStatus = drvAudioVrdeHA_StreamGetStatus; 730 pThis->IHostAudio.pfnStreamIterate = drvAudioVrdeHA_StreamIterate;731 717 pThis->IHostAudio.pfnStreamPlay = drvAudioVrdeHA_StreamPlay; 732 718 pThis->IHostAudio.pfnStreamCapture = drvAudioVrdeHA_StreamCapture;
Note:
See TracChangeset
for help on using the changeset viewer.