Changeset 62965 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Aug 4, 2016 9:57:20 AM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (4 diffs)
• AudioMixer.cpp (modified) (7 diffs)
• DevSB16.cpp (modified) (1 diff)
• DrvAudio.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp

@@ -583 +583 @@
 
 /** Dummy conversion used when the source is muted. */
-static DECLCALLBACK(uint32_t) audioMixBufConvFromSilence(PPDMAUDIOSAMPLE paDst, const void *pvSrc,
-                                                         uint32_t cbSrc, PCPDMAUDMIXBUFCONVOPTS pOpts)
-{
+static DECLCALLBACK(uint32_t)
+audioMixBufConvFromSilence(PPDMAUDIOSAMPLE paDst, const void *pvSrc, uint32_t cbSrc, PCPDMAUDMIXBUFCONVOPTS pOpts)
+{
+    RT_NOREF(cbSrc, pvSrc);
+
     /* Internally zero always corresponds to silence. */
     RT_BZERO(paDst, pOpts->cSamples * sizeof(paDst[0]));
@@ -648 +650 @@
         }
     }
-
-    return NULL;
+    /* not reached */
 }
 
@@ -709 +710 @@
         }
     }
-
-    return NULL;
+    /* not reached */
 }
 
@@ -1019 +1019 @@
 #endif
 
-    uint32_t cSrcToRead;
+    uint32_t cSrcToRead = 0;
     uint32_t cSrcRead;
 

trunk/src/VBox/Devices/Audio/AudioMixer.cpp

@@ -129 +129 @@
 int AudioMixerCreate(const char *pszName, uint32_t fFlags, PAUDIOMIXER *ppMixer)
 {
+    RT_NOREF(fFlags);
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
     /** @todo Add fFlags validation. */
@@ -176 +177 @@
 void AudioMixerDebug(PAUDIOMIXER pMixer, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
+    RT_NOREF(pszArgs);
     PAUDMIXSINK pSink;
     unsigned    iSink = 0;
@@ -491 +493 @@
         /* Increase the stream's reference count to let others know
          * we're reyling on it to be around now. */
-        pConn->pfnStreamAddRef(pConn, pStream);
+        pConn->pfnStreamRetain(pConn, pStream);
     }
 
@@ -763 +765 @@
 int AudioMixerSinkRead(PAUDMIXSINK pSink, AUDMIXOP enmOp, void *pvBuf, uint32_t cbBuf, uint32_t *pcbRead)
 {
+    RT_NOREF(enmOp);
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
@@ -1080 +1083 @@
         AssertPtr(pConn);
 
-        uint32_t cPlayed   = 0;
         uint32_t cCaptured = 0;
 
@@ -1257 +1259 @@
 int AudioMixerSinkWrite(PAUDMIXSINK pSink, AUDMIXOP enmOp, const void *pvBuf, uint32_t cbBuf, uint32_t *pcbWritten)
 {
+    RT_NOREF(enmOp);
     AssertPtrReturn(pSink, VERR_INVALID_POINTER);
     /* pcbWritten is optional. */
@@ -1320 +1323 @@
 int AudioMixerStreamCtl(PAUDMIXSTREAM pMixStream, PDMAUDIOSTREAMCMD enmCmd, uint32_t fCtl)
 {
+    RT_NOREF(fCtl);
     AssertPtrReturn(pMixStream, VERR_INVALID_POINTER);
     /** @todo Validate fCtl. */

trunk/src/VBox/Devices/Audio/DevSB16.cpp

@@ -2153 +2153 @@
             rc2 = pDrv->pConnector->pfnStreamCreate(pDrv->pConnector, &CfgHost, pCfg, &pDrv->Out.pStream);
             if (RT_SUCCESS(rc2))
-                pDrv->pConnector->pfnStreamAddRef(pDrv->pConnector, pDrv->Out.pStream);
+                pDrv->pConnector->pfnStreamRetain(pDrv->pConnector, pDrv->Out.pStream);
         }
 

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -785 +785 @@
 
 /**
- * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamAddRef}
- */
-static DECLCALLBACK(uint32_t) drvAudioStreamAddRef(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
-{
-   AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-   AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+ * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamRetain}
+ */
+static DECLCALLBACK(uint32_t) drvAudioStreamRetain(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
+{
+   AssertPtrReturn(pInterface, UINT32_MAX);
+   AssertPtrReturn(pStream,    UINT32_MAX);
 
    NOREF(pInterface);
@@ -802 +802 @@
 static DECLCALLBACK(uint32_t) drvAudioStreamRelease(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
 {
-   AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-   AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
+   AssertPtrReturn(pInterface, UINT32_MAX);
+   AssertPtrReturn(pStream,    UINT32_MAX);
 
    NOREF(pInterface);
@@ -1868 +1868 @@
     AssertPtrReturn(pVol,       VERR_INVALID_POINTER);
 
-    PDRVAUDIO pThis = PDMIAUDIOCONNECTOR_2_DRVAUDIO(pInterface);
-
     LogFlowFunc(("%s: volL=%RU32, volR=%RU32, fMute=%RTbool\n", pStream->szName, pVol->uLeft, pVol->uRight, pVol->fMuted));
 
@@ -2150 +2148 @@
     pThis->IAudioConnector.pfnStreamCreate      = drvAudioStreamCreate;
     pThis->IAudioConnector.pfnStreamDestroy     = drvAudioStreamDestroy;
-    pThis->IAudioConnector.pfnStreamAddRef      = drvAudioStreamAddRef;
+    pThis->IAudioConnector.pfnStreamRetain      = drvAudioStreamRetain;
     pThis->IAudioConnector.pfnStreamRelease     = drvAudioStreamRelease;
     pThis->IAudioConnector.pfnStreamControl     = drvAudioStreamControl;