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

Timestamp:

Jul 20, 2016 5:12:05 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

108916

Message:

Main: a few fixes for -Wunused -Wconversion

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixBuffer.cpp (modified) (4 diffs)
• DrvAudioCommon.cpp (modified) (2 diffs)

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

@@ -61 +61 @@
 #endif
 
+#ifdef DEBUG
 DECLINLINE(void) audioMixBufDbgPrintInternal(PPDMAUDIOMIXBUF pMixBuf);
+#endif
 
 /*
@@ -406 +408 @@
     { \
         _aType const *pSrc = (_aType const *)pvSrc; \
-        uint32_t cSamples = RT_MIN(pOpts->cSamples, cbSrc / sizeof(_aType)); \
+        uint32_t cSamples = RT_MIN(pOpts->cSamples, (uint32_t)(cbSrc / sizeof(_aType))); \
         AUDMIXBUF_MACRO_LOG(("cSamples=%RU32, BpS=%zu, lVol=%RU32, rVol=%RU32\n", \
                              pOpts->cSamples, sizeof(_aType), pOpts->From.Volume.uLeft, pOpts->From.Volume.uRight)); \
@@ -423 +425 @@
     { \
         _aType const *pSrc = (_aType const *)pvSrc; \
-        const uint32_t cSamples = RT_MIN(pOpts->cSamples, cbSrc / sizeof(_aType)); \
+        const uint32_t cSamples = RT_MIN(pOpts->cSamples, (uint32_t)(cbSrc / sizeof(_aType))); \
         AUDMIXBUF_MACRO_LOG(("cSamples=%RU32, BpS=%zu, lVol=%RU32, rVol=%RU32\n", \
                              cSamples, sizeof(_aType), pOpts->From.Volume.uLeft, pOpts->From.Volume.uRight)); \
@@ -569 +571 @@
         \
         if (pcDstWritten) \
-            *pcDstWritten = paDst - paDstStart; \
+            *pcDstWritten = (uint32_t)(paDst - paDstStart); \
         if (pcSrcRead) \
-            *pcSrcRead = paSrc - paSrcStart; \
+            *pcSrcRead = (uint32_t)(paSrc - paSrcStart); \
     }
 

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

@@ -421 +421 @@
     int rc = VINF_SUCCESS;
 
-    int cBits = 8, cShift = 0;
+    uint8_t cBits = 8;
+    int cShift = 0;
     bool fSigned = false;
 
@@ -456 +457 @@
         pProps->cBits       = cBits;
         pProps->fSigned     = fSigned;
-        pProps->cChannels   = pCfg->cChannels;
+        pProps->cChannels   = (uint8_t)pCfg->cChannels;
         pProps->cShift      = (pCfg->cChannels == 2) + cShift;
         pProps->uAlign      = (1 << pProps->cShift) - 1;