Changeset 73381 in vbox

Timestamp:

Jul 27, 2018 9:16:19 AM (6 years ago)

Author:

vboxsync

Message:

DrvAudioCommon.cpp: Renamed DrvAudioHlp*FileName() -> DrvAudioHlpFileName*().

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (1 diff)
• DrvAudio.cpp (modified) (4 diffs)
• DrvAudio.h (modified) (1 diff)
• DrvAudioCommon.cpp (modified) (3 diffs)
• DrvHostDebugAudio.cpp (modified) (1 diff)
• DrvHostValidationKit.cpp (modified) (1 diff)
• HDAStream.cpp (modified) (2 diffs)

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

@@ -1414 +1414 @@
 
             char szFile[RTPATH_MAX + 1];
-            rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), szTemp, szName,
+            rc2 = DrvAudioHlpFileNameGet(szFile, RT_ELEMENTS(szFile), szTemp, szName,
                                          0 /* Instance */, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
             if (RT_SUCCESS(rc2))

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

@@ -2743 +2743 @@
                 char szFile[RTPATH_MAX + 1];
 
-                int rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->In.Cfg.Dbg.szPathOut, "CaptureNonInterleaved",
+                int rc2 = DrvAudioHlpFileNameGet(szFile, RT_ELEMENTS(szFile), pThis->In.Cfg.Dbg.szPathOut, "CaptureNonInterleaved",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                 if (RT_SUCCESS(rc2))
@@ -2756 +2756 @@
                 if (RT_SUCCESS(rc2))
                 {
-                    rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->In.Cfg.Dbg.szPathOut, "StreamRead",
+                    rc2 = DrvAudioHlpFileNameGet(szFile, RT_ELEMENTS(szFile), pThis->In.Cfg.Dbg.szPathOut, "StreamRead",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                     if (RT_SUCCESS(rc2))
@@ -2778 +2778 @@
                 char szFile[RTPATH_MAX + 1];
 
-                int rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Out.Cfg.Dbg.szPathOut, "PlayNonInterleaved",
+                int rc2 = DrvAudioHlpFileNameGet(szFile, RT_ELEMENTS(szFile), pThis->Out.Cfg.Dbg.szPathOut, "PlayNonInterleaved",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                 if (RT_SUCCESS(rc2))
@@ -2791 +2791 @@
                 if (RT_SUCCESS(rc2))
                 {
-                    rc2 = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), pThis->Out.Cfg.Dbg.szPathOut, "StreamWrite",
+                    rc2 = DrvAudioHlpFileNameGet(szFile, RT_ELEMENTS(szFile), pThis->Out.Cfg.Dbg.szPathOut, "StreamWrite",
                                                  pThis->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
                     if (RT_SUCCESS(rc2))

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

@@ -216 +216 @@
 /** @name Audio file (name) helper methods.
  * @{ */
-int DrvAudioHlpSanitizeFileName(char *pszPath, size_t cbPath);
-int DrvAudioHlpGetFileName(char *pszFile, size_t cchFile, const char *pszPath, const char *pszName, uint32_t uInstance, PDMAUDIOFILETYPE enmType, PDMAUDIOFILENAMEFLAGS fFlags);
+int DrvAudioHlpFileNameSanitize(char *pszPath, size_t cbPath);
+int DrvAudioHlpFileNameGet(char *pszFile, size_t cchFile, const char *pszPath, const char *pszName, uint32_t uInstance, PDMAUDIOFILETYPE enmType, PDMAUDIOFILENAMEFLAGS fFlags);
 /** @}  */
 

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

@@ -1215 +1215 @@
  * @param   cbPath              Size (in bytes) of path to sanitize.
  */
-int DrvAudioHlpSanitizeFileName(char *pszPath, size_t cbPath)
+int DrvAudioHlpFileNameSanitize(char *pszPath, size_t cbPath)
 {
     RT_NOREF(cbPath);
@@ -1256 +1256 @@
  * @param   fFlags              File naming flags.
  */
-int DrvAudioHlpGetFileName(char *pszFile, size_t cchFile, const char *pszPath, const char *pszName,
+int DrvAudioHlpFileNameGet(char *pszFile, size_t cchFile, const char *pszPath, const char *pszName,
                            uint32_t uInstance, PDMAUDIOFILETYPE enmType, PDMAUDIOFILENAMEFLAGS fFlags)
 {
@@ -1292 +1292 @@
             }
 
-            rc = DrvAudioHlpSanitizeFileName(szFileName, sizeof(szFileName));
+            rc = DrvAudioHlpFileNameSanitize(szFileName, sizeof(szFileName));
             if (RT_FAILURE(rc))
                 break;

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

@@ -139 +139 @@
     {
         char szFile[RTPATH_MAX];
-        rc = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), szTemp, "DebugAudioOut",
+        rc = DrvAudioHlpFileNameGet(szFile, RT_ELEMENTS(szFile), szTemp, "DebugAudioOut",
                                     pDrv->pDrvIns->iInstance, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
         if (RT_SUCCESS(rc))

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

@@ -164 +164 @@
             char szFile[RTPATH_MAX + 1];
 
-            rc = DrvAudioHlpGetFileName(szFile, RT_ELEMENTS(szFile), szTemp, "VaKit",
+            rc = DrvAudioHlpFileNameGet(szFile, RT_ELEMENTS(szFile), szTemp, "VaKit",
                                         0 /* Instance */, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
             if (RT_SUCCESS(rc))

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

@@ -85 +85 @@
 
         char szPath[RTPATH_MAX + 1];
-        int rc2 = DrvAudioHlpGetFileName(szPath, sizeof(szPath), pThis->Dbg.szOutPath, szFile,
+        int rc2 = DrvAudioHlpFileNameGet(szPath, sizeof(szPath), pThis->Dbg.szOutPath, szFile,
                                          0 /* uInst */, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
         AssertRC(rc2);
@@ -96 +96 @@
             RTStrPrintf(szFile, sizeof(szFile), "hdaDMAReadSD%RU8", pStream->u8SD);
 
-        rc2 = DrvAudioHlpGetFileName(szPath, sizeof(szPath), pThis->Dbg.szOutPath, szFile,
+        rc2 = DrvAudioHlpFileNameGet(szPath, sizeof(szPath), pThis->Dbg.szOutPath, szFile,
                                      0 /* uInst */, PDMAUDIOFILETYPE_WAV, PDMAUDIOFILENAME_FLAG_NONE);
         AssertRC(rc2);