Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 32 insertions, 3 deletions

diff --git a/src/VBox/Devices/Audio/dsoundaudio.c b/src/VBox/Devices/Audio/dsoundaudio.c
index eb6bea91..7f73058a 100644
--- a/src/VBox/Devices/Audio/dsoundaudio.c
+++ b/src/VBox/Devices/Audio/dsoundaudio.c
@@ -36,6 +36,7 @@
 #include "vl_vbox.h"
 #include "audio.h"
 #include <iprt/alloc.h>
+#include <iprt/uuid.h>
 #include <VBox/log.h>
 
 
@@ -53,6 +54,8 @@ static struct {
     int bufsize_out;
     audsettings_t settings;
     int latency_millis;
+    char *device_guid_out;
+    char *device_guid_in;
 } conf = {
     1,
     1,
@@ -65,7 +68,9 @@ static struct {
         2,
         AUD_FMT_S16
     },
-    10
+    10,
+    NULL,
+    NULL
 };
 
 typedef struct {
@@ -1016,6 +1021,8 @@ static void *dsound_audio_init (void)
     int err;
     HRESULT hr;
     dsound *s = &glob_dsound;
+    RTUUID devguid;
+    LPCGUID devguidp;
 
     hr = CoInitializeEx (NULL, COINIT_MULTITHREADED);
     if (FAILED (hr)) {
@@ -1046,7 +1053,16 @@ static void *dsound_audio_init (void)
         return NULL;
     }
 
-    hr = IDirectSound_Initialize (s->dsound, NULL);
+    if (conf.device_guid_out) {
+        hr = RTUuidFromStr(&devguid, conf.device_guid_out);
+        if (FAILED (hr)) {
+            LogRel(("DSound: Could not parse DirectSound output device GUID\n"));
+        }
+        devguidp = (LPCGUID)&devguid;
+    } else {
+        devguidp = NULL;
+    }
+    hr = IDirectSound_Initialize (s->dsound, devguidp);
     if (FAILED (hr)) {
 #ifndef VBOX
         dsound_logerr (hr, "Could not initialize DirectSound\n");
@@ -1080,7 +1096,16 @@ static void *dsound_audio_init (void)
 #endif
     }
     else {
-        hr = IDirectSoundCapture_Initialize (s->dsound_capture, NULL);
+        if (conf.device_guid_in) {
+            hr = RTUuidFromStr(&devguid, conf.device_guid_in);
+            if (FAILED (hr)) {
+                LogRel(("DSound: Could not parse DirectSound input device GUID\n"));
+            }
+            devguidp = (LPCGUID)&devguid;
+        } else {
+            devguidp = NULL;
+        }
+        hr = IDirectSoundCapture_Initialize (s->dsound_capture, devguidp);
         if (FAILED (hr)) {
 #ifndef VBOX
             dsound_logerr (hr, "Could not initialize DirectSoundCapture\n");
@@ -1128,6 +1153,10 @@ static struct audio_option dsound_options[] = {
      "(undocumented)", NULL, 0},
     {"BufsizeIn", AUD_OPT_INT, &conf.bufsize_in,
      "(undocumented)", NULL, 0},
+    {"DeviceGuidOut", AUD_OPT_STR, &conf.device_guid_out,
+     "DirectSound output device GUID", NULL, 0},
+    {"DeviceGuidIn", AUD_OPT_STR, &conf.device_guid_in,
+     "DirectSound input device GUID", NULL, 0},
     {NULL, 0, NULL, NULL, NULL, 0}
 };