Changeset 63370 in vbox for trunk/src/VBox/Devices/Audio
- Timestamp:
- Aug 12, 2016 4:59:35 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 110011
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
r63362 r63370 337 337 338 338 339 static int ossControlStreamIn(PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd) 340 { 341 339 static int ossControlStreamIn(/*PPDMIHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd*/ void) 340 { 342 341 /** @todo Nothing to do here right now!? */ 343 342 … … 346 345 347 346 348 static int ossControlStreamOut(PPDM IHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)347 static int ossControlStreamOut(PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd) 349 348 { 350 349 POSSAUDIOSTREAMOUT pStreamOut = (POSSAUDIOSTREAMOUT)pStream; … … 419 418 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMCAPTURE(drvHostOSSAudio) 420 419 { 421 RT_NOREF(pInterface );420 RT_NOREF(pInterface, cbBuf, pvBuf); 422 421 AssertPtrReturn(pStream, VERR_INVALID_POINTER); 423 422 … … 507 506 508 507 509 static int ossDestroyStreamIn(PPDM IHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)508 static int ossDestroyStreamIn(PPDMAUDIOSTREAM pStream) 510 509 { 511 510 POSSAUDIOSTREAMIN pStrm = (POSSAUDIOSTREAMIN)pStream; … … 529 528 530 529 531 static int ossDestroyStreamOut(PPDM IHOSTAUDIO pInterface, PPDMAUDIOSTREAM pStream)530 static int ossDestroyStreamOut(PPDMAUDIOSTREAM pStream) 532 531 { 533 532 POSSAUDIOSTREAMOUT pStrm = (POSSAUDIOSTREAMOUT)pStream; … … 650 649 651 650 652 static int ossCreateStreamIn(PPDMIHOSTAUDIO pInterface, 653 PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 654 { 655 PDRVHOSTOSSAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTOSSAUDIO(pInterface); 651 static int ossCreateStreamIn(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 652 { 656 653 POSSAUDIOSTREAMIN pStrm = (POSSAUDIOSTREAMIN)pStream; 657 654 … … 725 722 726 723 727 static int ossCreateStreamOut(PPDMIHOSTAUDIO pInterface, 728 PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 729 { 730 PDRVHOSTOSSAUDIO pThis = PDMIHOSTAUDIO_2_DRVHOSTOSSAUDIO(pInterface); 724 static int ossCreateStreamOut(PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq) 725 { 731 726 POSSAUDIOSTREAMOUT pStrm = (POSSAUDIOSTREAMOUT)pStream; 732 727 … … 856 851 PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostOSSAudio) 857 852 { 858 RT_NOREF(pInterface );853 RT_NOREF(pInterface, cbBuf, pvBuf); 859 854 AssertPtrReturn(pStream, VERR_INVALID_POINTER); 860 855 … … 1013 1008 int rc; 1014 1009 if (pCfgReq->enmDir == PDMAUDIODIR_IN) 1015 rc = ossCreateStreamIn(p Interface, pStream, pCfgReq, pCfgAcq);1010 rc = ossCreateStreamIn(pStream, pCfgReq, pCfgAcq); 1016 1011 else 1017 rc = ossCreateStreamOut(p Interface, pStream, pCfgReq, pCfgAcq);1012 rc = ossCreateStreamOut(pStream, pCfgReq, pCfgAcq); 1018 1013 1019 1014 return rc; … … 1031 1026 int rc; 1032 1027 if (pStream->enmDir == PDMAUDIODIR_IN) 1033 rc = ossDestroyStreamIn(p Interface, pStream);1028 rc = ossDestroyStreamIn(pStream); 1034 1029 else 1035 rc = ossDestroyStreamOut(p Interface, pStream);1030 rc = ossDestroyStreamOut(pStream); 1036 1031 1037 1032 return rc; … … 1051 1046 int rc; 1052 1047 if (pStream->enmDir == PDMAUDIODIR_IN) 1053 rc = ossControlStreamIn( pInterface, pStream, enmStreamCmd);1048 rc = ossControlStreamIn(/*pInterface, pStream, enmStreamCmd*/); 1054 1049 else 1055 rc = ossControlStreamOut(p Interface, pStream, enmStreamCmd);1050 rc = ossControlStreamOut(pStream, enmStreamCmd); 1056 1051 1057 1052 return rc; … … 1113 1108 static DECLCALLBACK(int) drvHostOSSAudioConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags) 1114 1109 { 1110 RT_NOREF(pCfg, fFlags); 1115 1111 PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); 1116 RT_NOREF(pCfg, fFlags);1117 1112 PDRVHOSTOSSAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTOSSAUDIO); 1118 1113 LogRel(("Audio: Initializing OSS driver\n"));
Note:
See TracChangeset
for help on using the changeset viewer.