Changeset 88028 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 8, 2021 7:31:22 PM (4 years ago)

Author:

vboxsync

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

143156

Message:

Audio: Moving some of the DrvAudio.h stuff into PDM - VBox/vmm/pdmaudioinline.h. bugref:9890

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-client/DrvAudioRec.cpp (modified) (3 diffs)
• src-client/DrvAudioVRDE.cpp (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -1035 +1035 @@
 # Audio bits.
 VBoxC_SOURCES += \
-        ../Devices/Audio/DrvAudioCommon.cpp \
         src-client/AudioDriver.cpp \
         $(if $(VBOX_WITH_AUDIO_VRDE),src-client/DrvAudioVRDE.cpp,)

trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

@@ -89 +89 @@
 #include "ConsoleImpl.h"
 
-#include "../../Devices/Audio/DrvAudio.h" /* Ugly! */
 #include "WebMWriter.h"
 
@@ -95 +94 @@
 #include <iprt/cdefs.h>
 
+#include <VBox/vmm/cfgm.h>
+#include <VBox/vmm/pdmdrv.h>
 #include <VBox/vmm/pdmaudioifs.h>
-#include <VBox/vmm/pdmdrv.h>
-#include <VBox/vmm/cfgm.h>
+#include <VBox/vmm/pdmaudioinline.h>
 #include <VBox/err.h>
 
@@ -1232 +1232 @@
     pPCMProps->fSwapEndian = false;
 
-    AssertMsgReturn(DrvAudioHlpPcmPropsAreValid(pPCMProps),
+    AssertMsgReturn(PDMAudioPropsAreValid(pPCMProps),
                     ("Configuration error: Audio configuration is invalid!\n"), VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES);
 

trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

@@ -28 +28 @@
 #include "ConsoleVRDPServer.h"
 
-#include "../../Devices/Audio/DrvAudio.h"
-
 #include <iprt/mem.h>
 #include <iprt/cdefs.h>
 #include <iprt/circbuf.h>
 
+#include <VBox/vmm/cfgm.h>
+#include <VBox/vmm/pdmdrv.h>
 #include <VBox/vmm/pdmaudioifs.h>
-#include <VBox/vmm/pdmdrv.h>
+#include <VBox/vmm/pdmaudioinline.h>
 #include <VBox/RemoteDesktop/VRDE.h>
-#include <VBox/vmm/cfgm.h>
 #include <VBox/err.h>