Changeset 70994 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Feb 13, 2018 11:18:31 AM (7 years ago)

Author:

vboxsync

Message:

Audio/DrvHostPulseAudio.cpp: Added support for distinguishing input / output streams to the PulseAudio mixer controls, making it easier what to control in the mixer when multiple VMs are running.

File:

• trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (modified) (6 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -94 +94 @@
      *  Specify UINT32_MAX for unlimited logging. */
     uint32_t              cLogErrors;
+    /** The stream (base) name; needed for distinguishing
+     *  streams in the PulseAudio mixer controls if multiple
+     *  VMs are running at the same time. */
+    char                  szStreamName[64];
 } DRVHOSTPULSEAUDIO, *PDRVHOSTPULSEAUDIO;
 
@@ -758 +762 @@
              pStreamPA->BufAttr.tlength, pStreamPA->BufAttr.maxlength, pStreamPA->BufAttr.minreq));
 
+    Assert(pCfgReq->enmDir == PDMAUDIODIR_OUT);
+
+    char szName[256];
+    RTStrPrintf2(szName, sizeof(szName),  "VirtualBox %s [%s]",
+                 DrvAudioHlpPlaybackDstToStr(pCfgReq->DestSource.Dest), pThis->szStreamName);
+
     /* Note that the struct BufAttr is updated to the obtained values after this call! */
-    int rc = paStreamOpen(pThis, pStreamPA, false /* fIn */, "PulseAudio (Out)");
+    int rc = paStreamOpen(pThis, pStreamPA, false /* fIn */, szName);
     if (RT_FAILURE(rc))
         return rc;
@@ -800 +810 @@
     pStreamPA->BufAttr.maxlength   = (pStreamPA->BufAttr.fragsize * 3) / 2;
 
+    Assert(pCfgReq->enmDir == PDMAUDIODIR_IN);
+
+    char szName[256];
+    RTStrPrintf2(szName, sizeof(szName),  "VirtualBox %s [%s]",
+                 DrvAudioHlpRecSrcToStr(pCfgReq->DestSource.Source), pThis->szStreamName);
+
     /* Note: Other members of BufAttr are ignored for record streams. */
-    int rc = paStreamOpen(pThis, pStreamPA, true /* fIn */, "PulseAudio (In)");
+    int rc = paStreamOpen(pThis, pStreamPA, true /* fIn */, szName);
     if (RT_FAILURE(rc))
         return rc;
@@ -1577 +1593 @@
 
 
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
@@ -1664 +1679 @@
     /* IHostAudio */
     PDMAUDIO_IHOSTAUDIO_CALLBACKS(drvHostPulseAudio);
+
+    int rc2 = CFGMR3QueryString(pCfg, "StreamName", pThis->szStreamName, sizeof(pThis->szStreamName));
+    AssertMsgRCReturn(rc2, ("Confguration error: No/bad \"StreamName\" value, rc=%Rrc\n", rc2), rc2);
 
     return VINF_SUCCESS;