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

Timestamp:

Aug 31, 2018 5:57:44 PM (6 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio: Logging.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (13 diffs)

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

@@ -1967 +1967 @@
     {
         case PDMAUDIOBACKENDCBTYPE_DEVICES_CHANGED:
-            LogRel(("Audio: Host audio device configuration has changed\n"));
+            LogRel(("Audio: Device configuration of driver '%s' has changed\n", pThis->szName));
             rc = drvAudioScheduleReInitInternal(pThis);
             break;
@@ -2010 +2010 @@
         {
             if (fLog)
-                LogRel(("Audio: Found %RU16 devices\n", DevEnum.cDevices));
+                LogRel(("Audio: Found %RU16 devices for driver '%s'\n", DevEnum.cDevices, pThis->szName));
 
             PPDMAUDIODEVICE pDev;
@@ -2038 +2038 @@
         {
             if (fLog)
-                LogRel(("Audio: Device enumeration failed with %Rrc\n", rc));
+                LogRel(("Audio: Device enumeration for driver '%s' failed with %Rrc\n", pThis->szName, rc));
             /* Not fatal. */
         }
@@ -2047 +2047 @@
 
         if (fLog)
-            LogRel3(("Audio: Host audio backend does not support audio device enumeration, skipping\n"));
+            LogRel2(("Audio: Host driver '%s' does not support audio device enumeration, skipping\n", pThis->szName));
     }
 
@@ -2080 +2080 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("Audio: Initialization of host backend failed with %Rrc\n", rc));
+        LogRel(("Audio: Initialization of host driver '%s' failed with %Rrc\n", pThis->szName, rc));
         return VERR_AUDIO_BACKEND_INIT_FAILED;
     }
@@ -2090 +2090 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("Audio: Getting host backend configuration failed with %Rrc\n", rc));
+        LogRel(("Audio: Getting host driver configuration failed with %Rrc\n", pThis->szName, rc));
         return VERR_AUDIO_BACKEND_INIT_FAILED;
     }
@@ -2099 +2099 @@
     LogFlowFunc(("cStreamsFreeIn=%RU8, cStreamsFreeOut=%RU8\n", pThis->In.cStreamsFree, pThis->Out.cStreamsFree));
 
-    LogRel2(("Audio: Host audio backend supports %RU32 input streams and %RU32 output streams at once\n",
+    LogRel2(("Audio: Host driver '%s' supports %RU32 input streams and %RU32 output streams at once\n",
+             pThis->szName,
              /* Clamp for logging. Unlimited streams are defined by UINT32_MAX. */
              RT_MIN(64, pThis->In.cStreamsFree), RT_MIN(64, pThis->Out.cStreamsFree)));
@@ -2120 +2121 @@
         rc2 = pThis->pHostDrvAudio->pfnSetCallback(pThis->pHostDrvAudio, drvAudioBackendCallback);
         if (RT_FAILURE(rc2))
-             LogRel(("Audio: Error registering backend callback, rc=%Rrc\n", rc2));
+             LogRel(("Audio: Error registering callback for host driver '%s', rc=%Rrc\n", pThis->szName, rc2));
         /* Not fatal. */
     }
@@ -2178 +2179 @@
 
     if (pCfg->Dbg.fEnabled)
-        LogRel(("Audio: Debugging enabled (audio data written to '%s')\n", pCfg->Dbg.szPathOut));
+        LogRel(("Audio: Debugging for driver '%s' enabled (audio data written to '%s')\n", pThis->szName, pCfg->Dbg.szPathOut));
 
     /* Buffering stuff. */
@@ -2202 +2203 @@
     AssertPtrReturn(pCfgHandle, VERR_INVALID_POINTER);
     AssertPtrReturn(pDrvIns,    VERR_INVALID_POINTER);
-
-    LogRel2(("Audio: Verbose logging enabled\n"));
 
     PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO);
@@ -2228 +2227 @@
     CFGMR3QueryBoolDef(pThis->pCFGMNode, "OutputEnabled", &pThis->Out.fEnabled,  false);
 
-    LogRel2(("Audio: Initial status for driver '%s': Input is %s, output is %s\n",
+    LogRel2(("Audio: Verbose logging for driver '%s' enabled\n", pThis->szName));
+
+    LogRel2(("Audio: Initial status for driver '%s' is: input is %s, output is %s\n",
              pThis->szName, pThis->In.fEnabled ? "enabled" : "disabled", pThis->Out.fEnabled ? "enabled" : "disabled"));
 
@@ -2596 +2597 @@
     if (fEnable != *pfEnabled)
     {
-        LogRel(("Audio: %s %s\n",
-                fEnable ? "Enabling" : "Disabling", enmDir == PDMAUDIODIR_IN ? "input" : "output"));
+        LogRel(("Audio: %s %s for driver '%s'\n",
+                fEnable ? "Enabling" : "Disabling", enmDir == PDMAUDIODIR_IN ? "input" : "output", pThis->szName));
 
         PPDMAUDIOSTREAM pStream;
@@ -3193 +3194 @@
         if (!pThis->pHostDrvAudio)
         {
-            LogRel(("Audio: Failed to query interface for underlying host driver\n"));
+            LogRel(("Audio: Failed to query interface for underlying host driver '%s'\n", pThis->szName));
             rc = PDMDRV_SET_ERROR(pThis->pDrvIns, VERR_PDM_MISSING_INTERFACE_BELOW,
                                   N_("Host audio backend missing or invalid"));