VirtualBox

Changeset 63446 in vbox for trunk


Ignore:
Timestamp:
Aug 14, 2016 11:53:40 PM (8 years ago)
Author:
vboxsync
Message:

Devices: warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp

    r63445 r63446  
    225225}
    226226
     227#if 0 /* unused */
    227228static AudioDeviceID coreAudioDeviceUIDtoID(const char* pszUID)
    228229{
     
    255256    return kAudioDeviceUnknown;
    256257}
     258#endif /* unused */
     259
    257260
    258261/*********************************************************************************************************************************
     
    413416*   Internal Functions                                                                                                           *
    414417*********************************************************************************************************************************/
    415 static int coreAudioInitIn(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq);
    416 static int coreAudioInitOut(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq);
    417 static int coreAudioControlStreamIn(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd);
    418 static int coreAudioControlStreamOut(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd);
    419 static int coreAudioCreateStreamIn(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq);
    420 static int coreAudioCreateStreamOut(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq);
    421 static int coreAudioDestroyStreamIn(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream);
    422 static int coreAudioDestroyStreamOut(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream);
    423 
    424 static OSStatus coreAudioPlaybackAudioDevicePropertyChanged(AudioObjectID propertyID, UInt32 nAddresses, const AudioObjectPropertyAddress properties[], void *pvUser);
     418static OSStatus coreAudioPlaybackAudioDevicePropertyChanged(AudioObjectID propertyID, UInt32 cAddresses, const AudioObjectPropertyAddress properties[], void *pvUser);
    425419static OSStatus coreAudioPlaybackCb(void *pvUser, AudioUnitRenderActionFlags *pActionFlags, const AudioTimeStamp *pAudioTS, UInt32 uBusID, UInt32 cFrames, AudioBufferList* pBufData);
    426420
     
    481475static int coreAudioDevicesEnumerate(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOBACKENDCFG pCfg, bool fIn, uint32_t fEnum)
    482476{
     477    RT_NOREF(fEnum);
    483478    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
    484479    /* pCfg is optional. */
     
    606601int coreAudioUpdateStatusInternalEx(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOBACKENDCFG pCfg, uint32_t fEnum)
    607602{
     603    RT_NOREF(fEnum);
    608604    AssertPtrReturn(pThis, VERR_INVALID_POINTER);
    609605    /* pCfg is optional. */
     
    634630 */
    635631static OSStatus drvHostCoreAudioDeviceStateChanged(AudioObjectID propertyID,
    636                                                    UInt32 nAddresses,
    637                                                    const AudioObjectPropertyAddress properties[],
     632                                                   UInt32 cAddresses,
     633                                                   const AudioObjectPropertyAddress paProperties[],
    638634                                                   void *pvUser)
    639635{
    640     LogFlowFunc(("propertyID=%u nAddresses=%u pvUser=%p\n", propertyID, nAddresses, pvUser));
     636    RT_NOREF(paProperties)
     637    LogFlowFunc(("propertyID=%u cAddresses=%u pvUser=%p\n", propertyID, cAddresses, pvUser));
    641638
    642639    PCOREAUDIOSTREAMCBCTX pCbCtx = (PCOREAUDIOSTREAMCBCTX)pvUser;
     
    711708 */
    712709static OSStatus coreAudioDefaultDeviceChanged(AudioObjectID propertyID,
    713                                               UInt32 nAddresses,
     710                                              UInt32 cAddresses,
    714711                                              const AudioObjectPropertyAddress properties[],
    715712                                              void *pvUser)
     
    717714    OSStatus err = noErr;
    718715
    719     LogFlowFunc(("propertyID=%u nAddresses=%u pvUser=%p\n", propertyID, nAddresses, pvUser));
     716    LogFlowFunc(("propertyID=%u cAddresses=%u pvUser=%p\n", propertyID, cAddresses, pvUser));
    720717
    721718    PCOREAUDIOSTREAMCBCTX pCbCtx = (PCOREAUDIOSTREAMCBCTX)pvUser;
    722719    AssertPtr(pCbCtx);
    723720
    724     for (UInt32 idxAddress = 0; idxAddress < nAddresses; idxAddress++)
     721    for (UInt32 idxAddress = 0; idxAddress < cAddresses; idxAddress++)
    725722    {
    726723        const AudioObjectPropertyAddress *pProperty = &properties[idxAddress];
     
    805802 */
    806803static OSStatus coreAudioRecordingAudioDevicePropertyChanged(AudioObjectID                     propertyID,
    807                                                              UInt32                            cAdresses,
    808                                                              const AudioObjectPropertyAddress  aProperties[],
     804                                                             UInt32                            cAddresses,
     805                                                             const AudioObjectPropertyAddress  paProperties[],
    809806                                                             void                             *pvUser)
    810807{
     808    RT_NOREF(cAddresses, paProperties);
    811809    PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pvUser;
    812810
     
    848846                                           void                          *pvUser)
    849847{
     848    RT_NOREF(inAudioConverter, ppASPD);
    850849    AssertPtrReturn(ioNumberDataPackets, g_caConverterEOFDErr);
    851850    AssertPtrReturn(ioData,              g_caConverterEOFDErr);
     
    927926                                     AudioBufferList            *pBufData)
    928927{
     928    RT_NOREF(pBufData);
     929
    929930    /* If nothing is pending return immediately. */
    930931    if (cFrames == 0)
     
    18941895 */
    18951896static OSStatus coreAudioPlaybackAudioDevicePropertyChanged(AudioObjectID propertyID,
    1896                                                             UInt32 nAddresses,
    1897                                                             const AudioObjectPropertyAddress properties[],
     1897                                                            UInt32 cAddresses,
     1898                                                            const AudioObjectPropertyAddress paProperties[],
    18981899                                                            void *pvUser)
    18991900{
     1901    RT_NOREF(propertyID, cAddresses, paProperties, pvUser)
     1902
    19001903    switch (propertyID)
    19011904    {
     
    19211924                                    AudioBufferList            *pBufData)
    19221925{
     1926    RT_NOREF(pActionFlags, pAudioTS, uBusID, cFrames);
    19231927    PCOREAUDIOSTREAMOUT pStreamOut  = (PCOREAUDIOSTREAMOUT)pvUser;
    1924     PPDMAUDIOSTREAM     pStream     = &pStreamOut->Stream;
    19251928
    19261929    if (ASMAtomicReadU32(&pStreamOut->status) != CA_STATUS_INIT)
     
    20122015    /* pcbRead is optional. */
    20132016
    2014     PPDMDRVINS pDrvIns      = PDMIBASE_2_PDMDRV(pInterface);
    2015     PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
    2016 
    20172017    PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pStream;
    20182018
     2019/* unused, make you wonder why...
    20192020    size_t csReads = 0;
    20202021    char *pcSrc;
    2021     PPDMAUDIOSAMPLE psDst;
     2022    PPDMAUDIOSAMPLE psDst; */
    20222023
    20232024    if (ASMAtomicReadU32(&pStreamIn->status) != CA_STATUS_INIT)
     
    21172118PDMAUDIO_IHOSTAUDIO_EMIT_STREAMPLAY(drvHostCoreAudio)
    21182119{
     2120    RT_NOREF(pvBuf, cbBuf); /** @todo r=bird: this looks weird at first glance... */
     2121
    21192122    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
    21202123    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
    21212124    /* pcbWritten is optional. */
    21222125
    2123     PPDMDRVINS pDrvIns      = PDMIBASE_2_PDMDRV(pInterface);
    2124     PDRVHOSTCOREAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
    2125 
    21262126    PCOREAUDIOSTREAMOUT pStreamOut = (PCOREAUDIOSTREAMOUT)pStream;
    21272127
     
    21942194}
    21952195
    2196 static int coreAudioControlStreamOut(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
     2196static int coreAudioControlStreamOut(PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    21972197{
    21982198    PCOREAUDIOSTREAMOUT pStreamOut = (PCOREAUDIOSTREAMOUT)pStream;
     
    22692269}
    22702270
    2271 static int coreAudioControlStreamIn(PDRVHOSTCOREAUDIO pThis,
    2272                                     PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
     2271static int coreAudioControlStreamIn(PPDMAUDIOSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
    22732272{
    22742273    PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pStream;
     
    23412340}
    23422341
    2343 static int coreAudioDestroyStreamIn(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream)
     2342static int coreAudioDestroyStreamIn(PPDMAUDIOSTREAM pStream)
    23442343{
    23452344    PCOREAUDIOSTREAMIN pStreamIn = (PCOREAUDIOSTREAMIN)pStream;
     
    23562355    OSStatus err = noErr;
    23572356
    2358     int rc = coreAudioControlStreamIn(pThis, &pStreamIn->Stream, PDMAUDIOSTREAMCMD_DISABLE);
     2357    int rc = coreAudioControlStreamIn(&pStreamIn->Stream, PDMAUDIOSTREAMCMD_DISABLE);
    23592358    if (RT_SUCCESS(rc))
    23602359    {
     
    24602459}
    24612460
    2462 static int coreAudioDestroyStreamOut(PDRVHOSTCOREAUDIO pThis, PPDMAUDIOSTREAM pStream)
     2461static int coreAudioDestroyStreamOut(PPDMAUDIOSTREAM pStream)
    24632462{
    24642463    PCOREAUDIOSTREAMOUT pStreamOut = (PCOREAUDIOSTREAMOUT)pStream;
     
    24732472    }
    24742473
    2475     int rc = coreAudioControlStreamOut(pThis, &pStreamOut->Stream, PDMAUDIOSTREAMCMD_DISABLE);
     2474    int rc = coreAudioControlStreamOut(&pStreamOut->Stream, PDMAUDIOSTREAMCMD_DISABLE);
    24762475    if (RT_SUCCESS(rc))
    24772476    {
     
    27552754PDMAUDIO_IHOSTAUDIO_EMIT_GETSTATUS(drvHostCoreAudio)
    27562755{
     2756    RT_NOREF(enmDir);
    27572757    AssertPtrReturn(pInterface, PDMAUDIOBACKENDSTS_UNKNOWN);
    27582758
     
    27932793    AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
    27942794
    2795     PPDMDRVINS        pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    2796     PDRVHOSTCOREAUDIO pThis   = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
    2797 
    27982795    int rc;
    27992796    if (pStream->enmDir == PDMAUDIODIR_IN)
    2800         rc = coreAudioDestroyStreamIn(pThis,  pStream);
     2797        rc = coreAudioDestroyStreamIn(pStream);
    28012798    else
    2802         rc = coreAudioDestroyStreamOut(pThis, pStream);
     2799        rc = coreAudioDestroyStreamOut(pStream);
    28032800
    28042801    return rc;
     
    28162813    Assert(pStream->enmCtx == PDMAUDIOSTREAMCTX_HOST);
    28172814
    2818     PPDMDRVINS        pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
    2819     PDRVHOSTCOREAUDIO pThis   = PDMINS_2_DATA(pDrvIns, PDRVHOSTCOREAUDIO);
    2820 
    28212815    int rc;
    28222816    if (pStream->enmDir == PDMAUDIODIR_IN)
    2823         rc = coreAudioControlStreamIn(pThis,  pStream, enmStreamCmd);
     2817        rc = coreAudioControlStreamIn(pStream, enmStreamCmd);
    28242818    else
    2825         rc = coreAudioControlStreamOut(pThis, pStream, enmStreamCmd);
     2819        rc = coreAudioControlStreamOut(pStream, enmStreamCmd);
    28262820
    28272821    return rc;
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