Changeset 82319 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 2, 2019 12:30:24 PM (5 years ago)

Author:

vboxsync

Message:

DevHDA,DevIchAc97: Use devhlp for CFGMR3 functions. Don't pass empty DebugPathOut to devices (ConsoleImpl2.cpp). bugref:9218

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (7 diffs)

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

@@ -2843 +2843 @@
         if (fAudioEnabled)
         {
-            Utf8Str strAudioDevice;
-
-            AudioControllerType_T audioController;
-            hrc = audioAdapter->COMGETTER(AudioController)(&audioController);               H();
-            AudioCodecType_T audioCodec;
-            hrc = audioAdapter->COMGETTER(AudioCodec)(&audioCodec);                         H();
+            AudioControllerType_T enmAudioController;
+            hrc = audioAdapter->COMGETTER(AudioController)(&enmAudioController);            H();
+            AudioCodecType_T enmAudioCodec;
+            hrc = audioAdapter->COMGETTER(AudioCodec)(&enmAudioCodec);                      H();
 
             GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/Audio/Debug/Enabled", &strTmp);
-            const uint64_t fDebugEnabled = (strTmp.equalsIgnoreCase("true") || strTmp.equalsIgnoreCase("1")) ? 1 : 0;
+            const bool fDebugEnabled = strTmp.equalsIgnoreCase("true") || strTmp.equalsIgnoreCase("1");
 
             Utf8Str strDebugPathOut;
@@ -2859 +2857 @@
              *        without duplicating (more) code. */
 
-            switch (audioController)
+            const char *pszAudioDevice;
+            switch (enmAudioController)
             {
                 case AudioControllerType_AC97:
                 {
                     /* ICH AC'97. */
-                    strAudioDevice = "ichac97";
-
-                    InsertConfigNode   (pDevices, strAudioDevice.c_str(),  &pDev);
-                    InsertConfigNode   (pDev,     "0",                     &pInst);
-                    InsertConfigInteger(pInst,    "Trusted",               1); /* boolean */
-                    hrc = pBusMgr->assignPCIDevice(strAudioDevice.c_str(), pInst);          H();
-                    InsertConfigNode   (pInst,    "Config",                &pCfg);
-                    switch (audioCodec)
+                    pszAudioDevice = "ichac97";
+
+                    InsertConfigNode(pDevices,      pszAudioDevice,         &pDev);
+                    InsertConfigNode(pDev,          "0",                    &pInst);
+                    InsertConfigInteger(pInst,      "Trusted",              1); /* boolean */
+                    hrc = pBusMgr->assignPCIDevice(pszAudioDevice, pInst);              H();
+                    InsertConfigNode(pInst,         "Config",               &pCfg);
+                    switch (enmAudioCodec)
                     {
                         case AudioCodecType_STAC9700:
-                            InsertConfigString(pCfg,   "Codec", "STAC9700");
+                            InsertConfigString(pCfg, "Codec",               "STAC9700");
                             break;
                         case AudioCodecType_AD1980:
-                            InsertConfigString(pCfg,   "Codec", "AD1980");
+                            InsertConfigString(pCfg, "Codec",               "AD1980");
                             break;
                         default: AssertFailedBreak();
                     }
-                    InsertConfigInteger(pCfg, "DebugEnabled", fDebugEnabled);
-                    InsertConfigString (pCfg, "DebugPathOut", strDebugPathOut);
+                    InsertConfigInteger(pCfg,       "DebugEnabled",         fDebugEnabled);
+                    if (strDebugPathOut.isNotEmpty())
+                        InsertConfigString(pCfg,    "DebugPathOut",         strDebugPathOut);
                     break;
                 }
@@ -2888 +2888 @@
                 {
                     /* Legacy SoundBlaster16. */
-                    strAudioDevice = "sb16";
-
-                    InsertConfigNode   (pDevices, strAudioDevice.c_str(), &pDev);
-                    InsertConfigNode   (pDev,     "0", &pInst);
-                    InsertConfigInteger(pInst,    "Trusted",              1); /* boolean */
-                    InsertConfigNode   (pInst,    "Config",               &pCfg);
-                    InsertConfigInteger(pCfg,     "IRQ",                  5);
-                    InsertConfigInteger(pCfg,     "DMA",                  1);
-                    InsertConfigInteger(pCfg,     "DMA16",                5);
-                    InsertConfigInteger(pCfg,     "Port",                 0x220);
-                    InsertConfigInteger(pCfg,     "Version",              0x0405);
+                    pszAudioDevice = "sb16";
+
+                    InsertConfigNode(pDevices,      pszAudioDevice,         &pDev);
+                    InsertConfigNode(pDev,          "0", &pInst);
+                    InsertConfigInteger(pInst,      "Trusted",              1); /* boolean */
+                    InsertConfigNode(pInst,         "Config",               &pCfg);
+                    InsertConfigInteger(pCfg,       "IRQ",                  5);
+                    InsertConfigInteger(pCfg,       "DMA",                  1);
+                    InsertConfigInteger(pCfg,       "DMA16",                5);
+                    InsertConfigInteger(pCfg,       "Port",                 0x220);
+                    InsertConfigInteger(pCfg,       "Version",              0x0405);
                     break;
                 }
@@ -2904 +2904 @@
                 {
                     /* Intel HD Audio. */
-                    strAudioDevice = "hda";
-
-                    InsertConfigNode   (pDevices, strAudioDevice.c_str(),  &pDev);
-                    InsertConfigNode   (pDev,     "0",                     &pInst);
-                    InsertConfigInteger(pInst,    "Trusted",               1); /* boolean */
-                    hrc = pBusMgr->assignPCIDevice(strAudioDevice.c_str(), pInst);          H();
-                    InsertConfigNode   (pInst,    "Config",                &pCfg);
-                    InsertConfigInteger(pCfg,     "DebugEnabled",          fDebugEnabled);
-                    InsertConfigString (pCfg,     "DebugPathOut",          strDebugPathOut);
+                    pszAudioDevice = "hda";
+
+                    InsertConfigNode(pDevices,      pszAudioDevice,         &pDev);
+                    InsertConfigNode(pDev,          "0",                    &pInst);
+                    InsertConfigInteger(pInst,      "Trusted",              1); /* boolean */
+                    hrc = pBusMgr->assignPCIDevice(pszAudioDevice, pInst);              H();
+                    InsertConfigNode(pInst,         "Config",               &pCfg);
+                    InsertConfigInteger(pCfg,       "DebugEnabled",         fDebugEnabled);
+                    if (strDebugPathOut.isNotEmpty())
+                        InsertConfigString(pCfg,    "DebugPathOut",         strDebugPathOut);
                     break;
                 }
@@ -3016 +3017 @@
             InsertConfigNodeF(pInst, &pLunL0, "LUN#%u", uAudioLUN);
             InsertConfigString(pLunL0, "Driver", "AUDIO");
-            AudioDriverCfg DrvCfgVRDE(strAudioDevice, 0 /* Instance */, uAudioLUN, "AudioVRDE");
+            AudioDriverCfg DrvCfgVRDE(pszAudioDevice, 0 /* Instance */, uAudioLUN, "AudioVRDE");
             rc = mAudioVRDE->InitializeConfig(&DrvCfgVRDE);
             if (RT_SUCCESS(rc))
@@ -3026 +3027 @@
             InsertConfigNodeF(pInst, &pLunL0, "LUN#%u", uAudioLUN);
             InsertConfigString(pLunL0, "Driver", "AUDIO");
-            AudioDriverCfg DrvCfgVideoRec(strAudioDevice, 0 /* Instance */, uAudioLUN, "AudioVideoRec");
+            AudioDriverCfg DrvCfgVideoRec(pszAudioDevice, 0 /* Instance */, uAudioLUN, "AudioVideoRec");
             rc = Recording.mAudioRec->InitializeConfig(&DrvCfgVideoRec);
             if (RT_SUCCESS(rc))
@@ -3044 +3045 @@
                  * Tweak the logging groups.
                  */
-                Utf8Str strLogGroups = "drv_host_audio.e.l.l2.l3.f+" \
-                                       "drv_audio.e.l.l2.l3.f+" \
-                                       "audio_mixer.e.l.l2.l3.f+" \
-                                       "dev_hda_codec.e.l.l2.l3.f+" \
-                                       "dev_hda.e.l.l2.l3.f+" \
-                                       "dev_ac97.e.l.l2.l3.f+" \
+                Utf8Str strLogGroups = "drv_host_audio.e.l.l2.l3.f+"
+                                       "drv_audio.e.l.l2.l3.f+"
+                                       "audio_mixer.e.l.l2.l3.f+"
+                                       "dev_hda_codec.e.l.l2.l3.f+"
+                                       "dev_hda.e.l.l2.l3.f+"
+                                       "dev_ac97.e.l.l2.l3.f+"
                                        "dev_sb16.e.l.l2.l3.f";