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

Timestamp:

Dec 27, 2016 10:32:19 AM (8 years ago)

Author:

vboxsync

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

112506

Message:

Audio: Logging.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (4 diffs)
• DrvAudioCommon.cpp (modified) (1 diff)

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

@@ -147 +147 @@
 static char *dbgAudioStreamStatusToStr(PDMAUDIOSTRMSTS fStatus)
 {
-#define APPEND_FLAG_TO_STR(_aFlag)              \
-    if (fStatus & PDMAUDIOSTRMSTS_FLAG_##_aFlag) \
+#define APPEND_FLAG_TO_STR(_aFlag)               \
+    if ((fStatus & PDMAUDIOSTRMSTS_FLAG_##_aFlag) == PDMAUDIOSTRMSTS_FLAG_##_aFlag) \
     {                                            \
         if (pszFlags)                            \
@@ -870 +870 @@
         AssertPtr(pGstStream);
 
+#ifdef LOG_ENABLED
+        char *pszGstSts = dbgAudioStreamStatusToStr(pGstStream->fStatus);
         AssertMsg(pGstStream->fStatus & PDMAUDIOSTRMSTS_FLAG_ENABLED,
-                  ("Writing to disabled guest output stream \"%s\" not possible\n", pGstStream->szName));
-
+                  ("Writing to disabled guest output stream \"%s\" not possible (status is %s)\n",
+                   pGstStream->szName, pszGstSts));
+        RTStrFree(pszGstSts);
+#endif
         pGstStream->Out.tsLastWriteMS = RTTimeMilliTS();
 
@@ -1344 +1348 @@
                 }
             }
+#ifdef LOG_ENABLED
             else
-                Log3Func(("[%s] Skipping (backend status 0x%x)\n", pHstStream->szName, stsBackend));
+            {
+                char *pszHstSts = dbgAudioStreamStatusToStr(stsBackend);
+                Log3Func(("[%s] Skipping (backend status %s)\n", pHstStream->szName, pszHstSts));
+                RTStrFree(pszHstSts);
+            }
+#endif
         }
         else
@@ -1358 +1368 @@
     }
     else
-        LogFunc(("     Failed with %Rrc\n", rc));
+        LogFunc(("Failed with %Rrc\n", rc));
 
     int rc2 = RTCritSectLeave(&pThis->CritSect);

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

@@ -565 +565 @@
 
 #define APPEND_FLAG_TO_STR(_aFlag)              \
-    if (fFlags & PDMAUDIODEV_FLAGS_##_aFlag)    \
+    if ((fFlags & PDMAUDIODEV_FLAGS_##_aFlag) == PDMAUDIODEV_FLAGS_##_aFlag)    \
     {                                           \
         if (pszFlags)                           \