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

Timestamp:

Jun 2, 2021 9:04:06 AM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Simplified code a bit by removing unnecessary parameters. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (9 diffs)

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

@@ -593 +593 @@
 
 /** @copydoc ATSCALLBACKS::pfnTonePlay */
-static DECLCALLBACK(int) audioTestSvcTonePlayCallback(void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
+static DECLCALLBACK(int) audioTestSvcTonePlayCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
 {
     PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
@@ -599 +599 @@
 
     AUDIOTESTTONE TstTone;
-    AudioTestToneInitRandom(&TstTone, &pStreamCfg->Props);
+    AudioTestToneInitRandom(&TstTone, &pToneParms->Props);
 
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestCreateStreamDefaultOut(pTstEnv, pTstStream, &pStreamCfg->Props);
+    int rc = audioTestCreateStreamDefaultOut(pTstEnv, pTstStream, &pToneParms->Props);
     if (RT_SUCCESS(rc))
     {
@@ -636 +636 @@
 
 /** @copydoc ATSCALLBACKS::pfnToneRecord */
-static DECLCALLBACK(int) audioTestSvcToneRecordCallback(void const *pvUser, PPDMAUDIOSTREAMCFG pStreamCfg, PAUDIOTESTTONEPARMS pToneParms)
+static DECLCALLBACK(int) audioTestSvcToneRecordCallback(void const *pvUser, PAUDIOTESTTONEPARMS pToneParms)
 {
     PATSCALLBACKCTX pCtx    = (PATSCALLBACKCTX)pvUser;
@@ -643 +643 @@
     const PAUDIOTESTSTREAM pTstStream = &pTstEnv->aStreams[0]; /** @todo Make this dynamic. */
 
-    int rc = audioTestCreateStreamDefaultIn(pTstEnv, pTstStream, &pStreamCfg->Props);
+    int rc = audioTestCreateStreamDefaultIn(pTstEnv, pTstStream, &pToneParms->Props);
     if (RT_SUCCESS(rc))
     {
@@ -650 +650 @@
         TstParms.enmType  = AUDIOTESTTYPE_TESTTONE_RECORD;
         TstParms.enmDir   = PDMAUDIODIR_IN;
-        TstParms.Props    = pStreamCfg->Props;
-        pToneParms->Props = pStreamCfg->Props;
+        TstParms.Props    = pToneParms->Props;
         TstParms.TestTone = *pToneParms;
 
@@ -1087 +1086 @@
             Cfg.Props = pTstParms->Props;
 
-            rc = AudioTestSvcClientTonePlay(&pTstEnv->u.Host.Client, &Cfg, &pTstParms->TestTone);
+            rc = AudioTestSvcClientTonePlay(&pTstEnv->u.Host.Client, &pTstParms->TestTone);
             if (RT_SUCCESS(rc))
             {
@@ -1146 +1145 @@
     for (uint32_t i = 0; i < pTstParms->cIterations; i++)
     {
+        pTstParms->TestTone.Props      = pTstParms->Props;
         pTstParms->TestTone.msDuration = RTRandU32Ex(50 /* ms */, RT_MS_10SEC); /** @todo Record even longer? */
 
@@ -1152 +1152 @@
         if (RT_SUCCESS(rc))
         {
-            PDMAUDIOSTREAMCFG Cfg;
-            RT_ZERO(Cfg);
-            /** @todo Add more parameters here? */
-            Cfg.Props = pTstParms->Props;
-
-            rc = AudioTestSvcClientToneRecord(&pTstEnv->u.Host.Client, &Cfg, &pTstParms->TestTone);
+            rc = AudioTestSvcClientToneRecord(&pTstEnv->u.Host.Client, &pTstParms->TestTone);
             if (RT_SUCCESS(rc))
             {
@@ -2095 +2090 @@
                         memcpy(&ToneParms.Props, &CfgAcq.Props, sizeof(PDMAUDIOPCMPROPS));
 
-                        rc = AudioTestSvcClientTonePlay(&Conn, &CfgAcq, &ToneParms);
+                        rc = AudioTestSvcClientTonePlay(&Conn, &ToneParms);
 
                         int rc2 = AudioTestSvcClientClose(&Conn);