Changeset 53486 in vbox for trunk

Timestamp:

Dec 9, 2014 9:22:18 AM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Warnings.

Location:

trunk/src/VBox

Files:

• Devices/Audio/AudioMixBuffer.cpp (modified) (3 diffs)
• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)

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

@@ -296 +296 @@
 
 /* audioMixBufConvToS8: 8 bit, signed. */
-AUDMIXBUF_CONVERT(S8 /* Name */,  int8_t,   INT8_MIN  /* Min */, INT8_MAX   /* Max */, true  /* fSigned */, 8  /* cShift */);
+AUDMIXBUF_CONVERT(S8 /* Name */,  int8_t,   INT8_MIN  /* Min */, INT8_MAX   /* Max */, true  /* fSigned */, 8  /* cShift */)
 /* audioMixBufConvToU8: 8 bit, unsigned. */
-AUDMIXBUF_CONVERT(U8 /* Name */,  uint8_t,  0         /* Min */, UINT8_MAX  /* Max */, false /* fSigned */, 8  /* cShift */);
+AUDMIXBUF_CONVERT(U8 /* Name */,  uint8_t,  0         /* Min */, UINT8_MAX  /* Max */, false /* fSigned */, 8  /* cShift */)
 /* audioMixBufConvToS16: 16 bit, signed. */
-AUDMIXBUF_CONVERT(S16 /* Name */, int16_t,  INT16_MIN /* Min */, INT16_MAX  /* Max */, true  /* fSigned */, 16 /* cShift */);
+AUDMIXBUF_CONVERT(S16 /* Name */, int16_t,  INT16_MIN /* Min */, INT16_MAX  /* Max */, true  /* fSigned */, 16 /* cShift */)
 /* audioMixBufConvToU16: 16 bit, unsigned. */
-AUDMIXBUF_CONVERT(U16 /* Name */, uint16_t, 0         /* Min */, UINT16_MAX /* Max */, false /* fSigned */, 16 /* cShift */);
+AUDMIXBUF_CONVERT(U16 /* Name */, uint16_t, 0         /* Min */, UINT16_MAX /* Max */, false /* fSigned */, 16 /* cShift */)
 /* audioMixBufConvToS32: 32 bit, signed. */
-AUDMIXBUF_CONVERT(S32 /* Name */, int32_t,  INT32_MIN /* Min */, INT32_MAX  /* Max */, true  /* fSigned */, 32 /* cShift */);
+AUDMIXBUF_CONVERT(S32 /* Name */, int32_t,  INT32_MIN /* Min */, INT32_MAX  /* Max */, true  /* fSigned */, 32 /* cShift */)
 /* audioMixBufConvToU32: 32 bit, unsigned. */
-AUDMIXBUF_CONVERT(U32 /* Name */, uint32_t, 0         /* Min */, UINT32_MAX /* Max */, false /* fSigned */, 32 /* cShift */);
+AUDMIXBUF_CONVERT(U32 /* Name */, uint32_t, 0         /* Min */, UINT32_MAX /* Max */, false /* fSigned */, 32 /* cShift */)
 
 #undef AUDMIXBUF_CONVERT
@@ -394 +394 @@
 
 /* audioMixBufOpAssign: Assigns values from source buffer to destination bufffer, overwriting the destination. */
-AUDMIXBUF_MIXOP(Assign /* Name */,  = /* Operation */);
+AUDMIXBUF_MIXOP(Assign /* Name */,  = /* Operation */)
 /* audioMixBufOpBlend: Blends together the values from both, the source and the destination buffer. */
-AUDMIXBUF_MIXOP(Blend  /* Name */, += /* Operation */);
+AUDMIXBUF_MIXOP(Blend  /* Name */, += /* Operation */)
 
 #undef AUDMIXBUF_MIXOP
@@ -1214 +1214 @@
 
     uint32_t cToWrite = AUDIOMIXBUF_B2S(pMixBuf, cbBuf);
-    Assert(cToWrite);
+    AssertMsg(cToWrite, ("cToWrite is 0 (cbBuf=%zu)\n", cbBuf));
 
     PPDMAUDIOSAMPLE pSamplesDst1 = pMixBuf->pSamples + pMixBuf->offReadWrite;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -2668 +2668 @@
 
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-            PCFGMNODE pLunL1;
             InsertConfigNode(pLunL0, "AttachedDriver", &pLunL1);
             InsertConfigNode(pLunL1, "Config", &pCfg);
@@ -2744 +2743 @@
                 {
 # ifdef VBOX_WITH_PDM_AUDIO_DRIVER
-                    #error "Port OSS audio backend!" /** @todo Port OSS driver. */
+//                    #error "Port OSS audio backend!" /** @todo Port OSS driver. */
 # else
                     InsertConfigString(pCfg, "AudioDriver", "ossaudio");