Changeset 70073 in vbox

Timestamp:

Dec 12, 2017 9:14:37 AM (7 years ago)

Author:

vboxsync

Message:

Audio/HDA: Added PDMAUDIOFILE_DEFAULT_OPEN_FLAGS for DrvAudioHlpFileOpen().

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)
• src/VBox/Devices/Audio/DrvAudioCommon.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/HDAStream.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -775 +775 @@
 #define PDMAUDIOFILE_FLAG_VALID_MASK    0x1
 
+/** Audio file default open flags. */
+#define PDMAUDIOFILE_DEFAULT_OPEN_FLAGS (RTFILE_O_OPEN_CREATE | RTFILE_O_APPEND | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE)
+
 /**
  * Audio file types.

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

@@ -2568 +2568 @@
                                                 &pHstStrm->In.Dbg.pFileCaptureNonInterleaved);
                     if (RT_SUCCESS(rc2))
-                        rc2 = DrvAudioHlpFileOpen(pHstStrm->In.Dbg.pFileCaptureNonInterleaved,
-                                                  RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE, &pHstStrm->Cfg.Props);
+                        rc2 = DrvAudioHlpFileOpen(pHstStrm->In.Dbg.pFileCaptureNonInterleaved, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS,
+                                                  &pHstStrm->Cfg.Props);
                 }
 
@@ -2581 +2581 @@
                                                     &pHstStrm->In.Dbg.pFileStreamRead);
                         if (RT_SUCCESS(rc2))
-                            rc2 = DrvAudioHlpFileOpen(pHstStrm->In.Dbg.pFileStreamRead,
-                                                      RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE, &pHstStrm->Cfg.Props);
+                            rc2 = DrvAudioHlpFileOpen(pHstStrm->In.Dbg.pFileStreamRead, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS,
+                                                      &pHstStrm->Cfg.Props);
                     }
                 }
@@ -2603 +2603 @@
                                                 &pHstStrm->Out.Dbg.pFilePlayNonInterleaved);
                     if (RT_SUCCESS(rc2))
-                        rc = DrvAudioHlpFileOpen(pHstStrm->Out.Dbg.pFilePlayNonInterleaved,
-                                                 RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE, &pHstStrm->Cfg.Props);
+                        rc = DrvAudioHlpFileOpen(pHstStrm->Out.Dbg.pFilePlayNonInterleaved, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS,
+                                                 &pHstStrm->Cfg.Props);
                 }
 
@@ -2616 +2616 @@
                                                     &pHstStrm->Out.Dbg.pFileStreamWrite);
                         if (RT_SUCCESS(rc2))
-                            rc2 = DrvAudioHlpFileOpen(pHstStrm->Out.Dbg.pFileStreamWrite,
-                                                      RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE, &pHstStrm->Cfg.Props);
+                            rc2 = DrvAudioHlpFileOpen(pHstStrm->Out.Dbg.pFileStreamWrite, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS,
+                                                      &pHstStrm->Cfg.Props);
                     }
                 }

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

@@ -1238 +1238 @@
  * @param   pFile               Pointer to audio file handle to use.
  * @param   fOpen               Open flags.
+ *                              Use PDMAUDIOFILE_DEFAULT_OPEN_FLAGS for the default open flags.
  * @param   pProps              PCM properties to use.
  */

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

@@ -447 +447 @@
             if (fEnable)
             {
-                int rc2 = DrvAudioHlpFileOpen(pStream->Dbg.Runtime.pFileStream,
-                                              RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
+                int rc2 = DrvAudioHlpFileOpen(pStream->Dbg.Runtime.pFileStream, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS,
                                               &pStream->State.Cfg.Props);
                 AssertRC(rc2);
 
-                rc2 = DrvAudioHlpFileOpen(pStream->Dbg.Runtime.pFileDMA,
-                                          RTFILE_O_WRITE | RTFILE_O_DENY_WRITE | RTFILE_O_CREATE_REPLACE,
+                rc2 = DrvAudioHlpFileOpen(pStream->Dbg.Runtime.pFileDMA, PDMAUDIOFILE_DEFAULT_OPEN_FLAGS,
                                           &pStream->State.Cfg.Props);
                 AssertRC(rc2);