Changeset 89081 in vbox

Timestamp:

May 17, 2021 9:15:52 AM (4 years ago)

Author:

vboxsync

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

144421

Message:

Audio/ValKit: Implemented and enabled Windows build (DSound + Wasapi backends). ​bugref:10008

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostAudioWasApi.cpp (modified) (1 diff)
• src/VBox/ValidationKit/utils/audio/Makefile.kmk (modified) (2 diffs)
• src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -794 +794 @@
 ifdef VBOX_WITH_VALIDATIONKIT
  # Enable more platforms later.
- if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), linux.amd64)
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64 linux.amd64)
   VBOX_WITH_AUDIO_VALIDATIONKIT = 1
  endif

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

@@ -45 +45 @@
 #include <new> /* std::bad_alloc */
 
-#ifdef VBOX_AUDIO_VKAT
-# include "VBoxDDVKAT.h"
-#else
-# include "VBoxDD.h"
-#endif
+#include "VBoxDD.h"
 
 

trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk

@@ -78 +78 @@
 endif
 
+ifeq ($(KBUILD_TARGET),win)
+  AudioTest_SOURCES += \
+        $(VKAT_PATH_AUDIO)/DrvHostAudioDSound.cpp \
+        $(VKAT_PATH_AUDIO)/DrvHostAudioWasApi.cpp
+ ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
+   AudioTest_DEFS    += VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
+   AudioTest_SOURCES += \
+        $(VKAT_PATH_AUDIO)/DrvHostAudioDSoundMMNotifClient.cpp
+ endif
+endif
+
 AudioTest_SOURCES.darwin = \
         $(VKAT_PATH_AUDIO)/DrvHostAudioCoreAudio.cpp \
@@ -89 +100 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-

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

@@ -297 +297 @@
     {   &g_DrvHostDSound,       "directsound" },
     {   &g_DrvHostDSound,       "dsound" },
-    {   &g_DrvHostDSound,       "ds" },
+    {   &g_DrvHostDSound,       "ds" }
 #endif
 };
@@ -347 +347 @@
 
     return VERR_CFGM_VALUE_NOT_FOUND;
+}
+
+VMMR3DECL(int) CFGMR3QueryStringAlloc(PCFGMNODE pNode, const char *pszName, char **ppszString)
+{
+    char szStr[128];
+    int rc = CFGMR3QueryString(pNode, pszName, szStr, sizeof(szStr));
+    if (RT_SUCCESS(rc))
+        *ppszString = RTStrDup(szStr);
+
+    return rc;
 }