Changeset 89837 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Jun 22, 2021 2:18:34 PM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Removed Doppelmoppel global/common options and use AUDIO_TEST_COMMON_OPTION_CASES in the main case as well. Also use g_fDrvAudioDebug as the global debug(ging) flag for VKAT. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (5 diffs)
• vkatCommon.cpp (modified) (1 diff)
• vkatInternal.h (modified) (2 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -198 +198 @@
 unsigned         g_uVerbosity = 0;
 /** DrvAudio: Enable debug (or not). */
-bool             g_fDrvAudioDebug = 0;
+bool             g_fDrvAudioDebug = false;
 /** DrvAudio: The debug output path. */
 const char      *g_pszDrvAudioDebug = NULL;
@@ -901 +901 @@
     }
 
-    AudioTestSetWipe(&SetA);
+    if (!g_fDrvAudioDebug) /* Don't wipe stuff when debugging. Can be useful for introspecting data. */
+        AudioTestSetWipe(&SetA);
     AudioTestSetClose(&SetA);
 
-    AudioTestSetWipe(&SetB);
+    if (!g_fDrvAudioDebug) /* Ditto. */
+        AudioTestSetWipe(&SetB);
     AudioTestSetClose(&SetB);
 
@@ -1031 +1033 @@
                  "Global Options:\n"
                  "  --debug-audio\n"
-                 "    Enables DrvAudio debugging.\n"
+                 "    Enables (DrvAudio) debugging.\n"
                  "  --debug-audio-path=<path>\n"
                  "    Tells DrvAudio where to put its debug output (wav-files).\n"
@@ -1088 +1090 @@
  * @param   pStream             Output stream to show logo on.
  */
-static void audioTestShowLogo(PRTSTREAM pStream)
+void audioTestShowLogo(PRTSTREAM pStream)
 {
     RTStrmPrintf(pStream, VBOX_PRODUCT " VKAT (Validation Kit Audio Test) Version " VBOX_VERSION_STRING " - r%s\n"
@@ -1146 +1148 @@
         switch (rc)
         {
-            case 'q':
-                g_uVerbosity = 0;
-                if (g_pRelLogger)
-                    RTLogGroupSettings(g_pRelLogger, "all=0 all.e");
-                break;
-
-            case 'v':
-                g_uVerbosity++;
-                if (g_pRelLogger)
-                    RTLogGroupSettings(g_pRelLogger, g_uVerbosity == 1 ? "all.e.l" : g_uVerbosity == 2 ? "all.e.l.f" : "all=~0");
-                break;
-
-            case 'V':
-                return audioTestVersion();
-
-            case 'h':
-                audioTestShowLogo(g_pStdOut);
-                return audioTestUsage(g_pStdOut);
+            AUDIO_TEST_COMMON_OPTION_CASES(ValueUnion);
 
             case VINF_GETOPT_NOT_OPTION:

trunk/src/VBox/ValidationKit/utils/audio/vkatCommon.cpp

@@ -825 +825 @@
     }
 
-    /* ignore rc */ AudioTestSetWipe(&pTstEnv->Set);
+    if (!g_fDrvAudioDebug) /* Don't wipe stuff when debugging. Can be useful for introspecting data. */
+        /* ignore rc */ AudioTestSetWipe(&pTstEnv->Set);
 
     AudioTestSetDestroy(&pTstEnv->Set);

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -347 +347 @@
 RTEXITCODE audioTestUsage(PRTSTREAM pStrm);
 RTEXITCODE audioTestVersion(void);
+void       audioTestShowLogo(PRTSTREAM pStream);
 /** @}  */
 
@@ -465 +466 @@
             \
             case 'h': \
+                audioTestShowLogo(g_pStdOut); \
                 return audioTestUsage(g_pStdOut); \
             \