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

Timestamp:

Dec 27, 2016 2:44:51 PM (8 years ago)

Author:

vboxsync

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

112510

Message:

Logging.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (5 diffs)
• DrvAudioCommon.cpp (modified) (2 diffs)

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

@@ -148 +148 @@
 {
 #define APPEND_FLAG_TO_STR(_aFlag)               \
-    if ((fStatus & PDMAUDIOSTRMSTS_FLAG_##_aFlag) == PDMAUDIOSTRMSTS_FLAG_##_aFlag) \
+    if (fStatus & PDMAUDIOSTRMSTS_FLAG_##_aFlag) \
     {                                            \
         if (pszFlags)                            \
@@ -167 +167 @@
     do
     {
-        APPEND_FLAG_TO_STR(NONE           );
         APPEND_FLAG_TO_STR(INITIALIZED    );
         APPEND_FLAG_TO_STR(ENABLED        );
@@ -176 +175 @@
         APPEND_FLAG_TO_STR(PENDING_REINIT );
     } while (0);
+
+    if (!pszFlags)
+        rc2 = RTStrAAppend(&pszFlags, "NONE");
 
     if (   RT_FAILURE(rc2)
@@ -1231 +1233 @@
         PDMAUDIOSTRMSTS stsBackend = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pHstStream);
 
-        Log3Func(("[%s] Start: stsBackend=0x%x, csLive=%RU32\n", pHstStream->szName, stsBackend, csLive));
+#ifdef LOG_ENABLED
+        char *pszBackendSts = dbgAudioStreamStatusToStr(stsBackend);
+        Log3Func(("[%s] Start: stsBackend=%s, csLive=%RU32\n", pHstStream->szName, pszBackendSts, csLive));
+        RTStrFree(pszBackendSts);
+#endif /* LOG_ENABLED */
 
         if (   csLive
@@ -1251 +1257 @@
         }
 
-        Log3Func(("[%s] End: stsBackend=0x%x, csLive=%RU32, csPlayed=%RU32, rc=%Rrc\n",
-                  pHstStream->szName, stsBackend, csLive, csPlayed, rc));
+#ifdef LOG_ENABLED
+        pszBackendSts = dbgAudioStreamStatusToStr(stsBackend);
+        Log3Func(("[%s] End: stsBackend=%s, csLive=%RU32, csPlayed=%RU32, rc=%Rrc\n",
+                  pHstStream->szName, pszBackendSts, csLive, csPlayed, rc));
+        RTStrFree(pszBackendSts);
+#endif /* LOG_ENABLED */
 
         if (!csLive)

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

@@ -563 +563 @@
 char *DrvAudioHlpAudDevFlagsToStrA(PDMAUDIODEVFLAG fFlags)
 {
-
 #define APPEND_FLAG_TO_STR(_aFlag)              \
-    if ((fFlags & PDMAUDIODEV_FLAGS_##_aFlag) == PDMAUDIODEV_FLAGS_##_aFlag)    \
+    if (fFlags & PDMAUDIODEV_FLAGS_##_aFlag)    \
     {                                           \
         if (pszFlags)                           \
@@ -592 +591 @@
 
     } while (0);
+
+    if (!pszFlags)
+        rc2 = RTStrAAppend(&pszFlags, "NONE");
 
     if (   RT_FAILURE(rc2)