Changeset 70493 in vbox for trunk

Timestamp:

Jan 9, 2018 12:24:31 PM (7 years ago)

Author:

vboxsync

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

120107

Message:

Audio/DrvHostValidationKit: Build fixes.

File:

• trunk/src/VBox/Devices/Audio/DrvHostValidationKit.cpp (modified) (4 diffs)

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

@@ -36 +36 @@
     PPDMAUDIOSTREAMCFG pCfg;
     /** Audio file to dump output to or read input from. */
-    PDMAUDIOFILE       File;
+    PPDMAUDIOFILE      pFile;
     /** Text file to store timing of audio buffers submittions**/
     RTFILE             hFileTiming;
@@ -162 +162 @@
         if (RT_SUCCESS(rc))
         {
-            char szFile[RTPATH_MAX];
-            rc = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), szTemp, NULL, PDMAUDIOFILETYPE_WAV);
+            char szFile[RTPATH_MAX + 1];
+
+            rc = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), szTemp, "VaKit",
+                                        0 /* Instance */, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
             if (RT_SUCCESS(rc))
             {
-                LogFlowFunc(("%s\n", szFile));
-                rc = DrvAudioHlpFileOpen(&pStreamDbg->File, PDMAUDIOFILETYPE_WAV, szFile,
-                                         RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
-                                         &pCfgReq->Props, PDMAUDIOFILE_FLAG_NONE);
-                if (RT_FAILURE(rc))
-                    LogRel(("VaKitAudio: Creating output file '%s' failed with %Rrc\n", szFile, rc));
-
-                RTStrCat(szFile, sizeof(szFile), ".timing");
-                rc = RTFileOpen(&pStreamDbg->hFileTiming, szFile, RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE);
-
-                if (RT_FAILURE(rc))
-                {
-                    LogRel(("VaKitAudio: Creating output file '%s' failed with %Rrc\n", szFile, rc));
-                }
-                else
-                {
-                    size_t cch;
-                    char szTimingInfo[128];
-                    cch = RTStrPrintf(szTimingInfo, sizeof(szTimingInfo), "# %dHz %dch %dbps\n",
-                        pCfgReq->Props.uHz, pCfgReq->Props.cChannels, pCfgReq->Props.cBits);
-
-                    RTFileWrite(pStreamDbg->hFileTiming, szTimingInfo, cch, NULL);
-                }
+                rc = DrvAudioHlpFileCreate(PDMAUDIOFILETYPE_WAV, szFile, PDMAUDIOFILE_FLAG_NONE, &pStreamDbg->pFile);
+                if (RT_SUCCESS(rc))
+                    rc = DrvAudioHlpFileOpen(pStreamDbg->pFile, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS, &pCfgReq->Props);
+            }
+
+            if (RT_FAILURE(rc))
+            {
+                LogRel(("VaKitAudio: Creating output file '%s' failed with %Rrc\n", szFile, rc));
             }
             else
-                LogRel(("VaKitAudio: Unable to build file name for temp dir '%s': %Rrc\n", szTemp, rc));
+            {
+                size_t cch;
+                char szTimingInfo[128];
+                cch = RTStrPrintf(szTimingInfo, sizeof(szTimingInfo), "# %dHz %dch %dbps\n",
+                    pCfgReq->Props.uHz, pCfgReq->Props.cChannels, pCfgReq->Props.cBits);
+
+                RTFileWrite(pStreamDbg->hFileTiming, szTimingInfo, cch, NULL);
+            }
         }
         else
@@ -277 +271 @@
    // pStreamDbg->Out.tsLastPlayed = PDMDrvHlpTMGetVirtualTime(pDrv->pDrvIns);;
 
-    int rc2 = DrvAudioHlpFileWrite(&pStreamDbg->File, pvBuf, cxBuf, 0 /* fFlags */);
+    int rc2 = DrvAudioHlpFileWrite(pStreamDbg->pFile, pvBuf, cxBuf, 0 /* fFlags */);
     if (RT_FAILURE(rc2))
         LogRel(("DebugAudio: Writing output failed with %Rrc\n", rc2));
@@ -321 +315 @@
     }
 
-    size_t cbDataSize = DrvAudioHlpFileGetDataSize(&pStreamDbg->File);
-
-    int rc = DrvAudioHlpFileClose(&pStreamDbg->File);
-    RTFileClose(pStreamDbg->hFileTiming);
-
-    if (RT_SUCCESS(rc))
-    {
-        /* Delete the file again if nothing but the header was written to it. */
-        bool fDeleteEmptyFiles = true; /** @todo Make deletion configurable? */
-
-        if (   !cbDataSize
-            && fDeleteEmptyFiles)
-        {
-            char szFile[RTPATH_MAX];
-
-            RTStrCopy(szFile, sizeof(szFile), pStreamDbg->File.szName);
-            RTFileDelete(szFile);
-
-            RTStrCat(szFile, sizeof(szFile), ".timing");
-            RTFileDelete(szFile);
-        }
-        else
-            LogRel(("VaKitAudio: Created output file '%s' (%zu bytes)\n", pStreamDbg->File.szName, cbDataSize));
-    }
-
-    return rc;
+    if (pStreamDbg->pFile)
+    {
+        size_t cbDataSize = DrvAudioHlpFileGetDataSize(pStreamDbg->pFile);
+        if (cbDataSize)
+            LogRel(("VaKitAudio: Created output file '%s' (%zu bytes)\n", pStreamDbg->pFile->szName, cbDataSize));
+
+        DrvAudioHlpFileDestroy(pStreamDbg->pFile);
+        pStreamDbg->pFile = NULL;
+    }
+
+    return VINF_SUCCESS;
 }