Changeset 89480 in vbox for trunk/src/VBox

Timestamp:

Jun 3, 2021 12:40:59 PM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioAlsaStubs.h: Another attempt at fixing the pedantic gcc warning/error. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp (modified) (3 diffs)

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

@@ -508 +508 @@
         unsigned int    padding[1 + PDMAUDIO_MAX_CHANNELS];
     } u;
-    uint8_t      aidChannels[PDMAUDIO_MAX_CHANNELS];
-    unsigned int cChannels = u.Map.channels = PDMAudioPropsChannels(&pCfgReq->Props);
-    unsigned int iDst      = 0;
+    uint8_t       aidSrcChannels[PDMAUDIO_MAX_CHANNELS];
+    unsigned int *aidDstChannels = &u.Map.pos[0];
+    unsigned int  cChannels      = u.Map.channels = PDMAudioPropsChannels(&pCfgReq->Props);
+    unsigned int  iDst           = 0;
     for (unsigned int iSrc = 0; iSrc < cChannels; iSrc++)
     {
-        uint8_t const idSrc = pCfgReq->Props.aidChannels[iSrc];
-        aidChannels[iDst] = idSrc;
-        u.Map.pos[iDst]   = drvHstAudAlsaPdmChToAlsa((PDMAUDIOCHANNELID)idSrc, cChannels);
+        uint8_t const idSrc  = pCfgReq->Props.aidChannels[iSrc];
+        aidSrcChannels[iDst] = idSrc;
+        aidDstChannels[iDst] = drvHstAudAlsaPdmChToAlsa((PDMAUDIOCHANNELID)idSrc, cChannels);
         iDst++;
     }
@@ -521 +522 @@
     for (; iDst < PDMAUDIO_MAX_CHANNELS; iDst++)
     {
-        aidChannels[iDst] = PDMAUDIOCHANNELID_INVALID;
-        u.Map.pos[iDst]   = SND_CHMAP_NA;
+        aidSrcChannels[iDst] = PDMAUDIOCHANNELID_INVALID;
+        aidDstChannels[iDst] = SND_CHMAP_NA;
     }
 
@@ -529 +530 @@
                           err);
     if (cChannels == PDMAudioPropsChannels(&pCfgReq->Props))
-        memcpy(pCfgAcq->Props.aidChannels, aidChannels, sizeof(pCfgAcq->Props.aidChannels));
+        memcpy(pCfgAcq->Props.aidChannels, aidSrcChannels, sizeof(pCfgAcq->Props.aidChannels));
     else
     {