Changeset 65012 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 27, 2016 10:58:38 AM (8 years ago)

Author:

vboxsync

Message:

Audio: Implemented DrvAudioHlpStreamCmdToStr(), logging.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (5 diffs)
• DrvAudio.h (modified) (1 diff)
• DrvAudioCommon.cpp (modified) (1 diff)

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

@@ -334 +334 @@
         return rc;
 
-    LogFlowFunc(("[%s] enmStreamCmd=%RU32\n", pStream->szName, enmStreamCmd));
+    LogFlowFunc(("[%s] enmStreamCmd=%s\n", pStream->szName, DrvAudioHlpStreamCmdToStr(enmStreamCmd)));
 
     rc = drvAudioStreamControlInternal(pThis, pStream, enmStreamCmd);
@@ -358 +358 @@
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
-    LogFunc(("[%s] enmStreamCmd=%RU32\n", pStream->szName, enmStreamCmd));
+    LogFunc(("[%s] enmStreamCmd=%s\n", pStream->szName, DrvAudioHlpStreamCmdToStr(enmStreamCmd)));
 
     PPDMAUDIOSTREAM pHstStream = drvAudioGetHostStream(pStream);
@@ -451 +451 @@
 
         default:
-            AssertMsgFailed(("Command %RU32 not implemented\n", enmStreamCmd));
+            AssertMsgFailed(("Command %s (%RU32) not implemented\n", DrvAudioHlpStreamCmdToStr(enmStreamCmd), enmStreamCmd));
             rc = VERR_NOT_IMPLEMENTED;
             break;
@@ -482 +482 @@
 #ifdef LOG_ENABLED
     char *pszHstSts = dbgAudioStreamStatusToStr(pHstStream->fStatus);
-    LogFlowFunc(("[%s] enmStreamCmd=%RU32, fStatus=%s\n", pHstStream->szName, enmStreamCmd, pszHstSts));
+    LogFlowFunc(("[%s] enmStreamCmd=%s, fStatus=%s\n", pHstStream->szName, DrvAudioHlpStreamCmdToStr(enmStreamCmd), pszHstSts));
     RTStrFree(pszHstSts);
 #endif /* LOG_ENABLED */
@@ -1728 +1728 @@
     PDRVAUDIO pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIO);
 
-    LogFlowFunc(("enmCmd=%RU32\n", enmCmd));
+    LogFlowFunc(("enmCmd=%s\n", DrvAudioHlpStreamCmdToStr(enmCmd)));
 
     if (!pThis->pHostDrvAudio)

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

@@ -161 +161 @@
 bool DrvAudioHlpStreamCfgIsValid(PPDMAUDIOSTREAMCFG pCfg);
 int DrvAudioHlpStreamCfgToProps(PPDMAUDIOSTREAMCFG pCfg, PPDMAUDIOPCMPROPS pProps);
+const char *DrvAudioHlpStreamCmdToStr(PDMAUDIOSTREAMCMD enmCmd);
 PDMAUDIOFMT DrvAudioHlpStrToAudFmt(const char *pszFmt);
 

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

@@ -992 +992 @@
             break;
     }
+}
+
+/**
+ * Converts a stream command to a string.
+ *
+ * @returns Stringified stream command, or "Unknown", if not found.
+ * @param   enmCmd              Stream command to convert.
+ */
+const char *DrvAudioHlpStreamCmdToStr(PDMAUDIOSTREAMCMD enmCmd)
+{
+    switch (enmCmd)
+    {
+        case PDMAUDIOSTREAMCMD_UNKNOWN: return "Unknown";
+        case PDMAUDIOSTREAMCMD_ENABLE:  return "Enable";
+        case PDMAUDIOSTREAMCMD_DISABLE: return "Disable";
+        case PDMAUDIOSTREAMCMD_PAUSE:   return "Pause";
+        case PDMAUDIOSTREAMCMD_RESUME:  return "Resume";
+        default:                        break;
+    }
+
+    AssertMsgFailed(("Invalid stream command %ld\n", enmCmd));
+    return "Unknown";
 }