Changeset 88210 in vbox for trunk

Timestamp:

Mar 19, 2021 5:47:14 PM (4 years ago)

Author:

vboxsync

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

143375

Message:

DrvHostAudioAlsa: Added 'DefaultOutput' and 'DefaultInput' config options so it's possible to select which device to play/record on. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (modified) (10 diffs)

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

@@ -103 +103 @@
 {
     /** Pointer to the driver instance structure. */
-    PPDMDRVINS         pDrvIns;
+    PPDMDRVINS          pDrvIns;
     /** Pointer to host audio interface. */
-    PDMIHOSTAUDIO      IHostAudio;
+    PDMIHOSTAUDIO       IHostAudio;
     /** Error count for not flooding the release log.
      *  UINT32_MAX for unlimited logging. */
-    uint32_t           cLogErrors;
+    uint32_t            cLogErrors;
+    /** Default input device name.   */
+    char                szDefaultIn[256];
+    /** Default output device name. */
+    char                szDefaultOut[256];
 } DRVHOSTALSAAUDIO, *PDRVHOSTALSAAUDIO;
 
@@ -362 +366 @@
  *
  * @returns VBox status code.
- * @param   fIn                 Whether this is an input stream to create or not.
- * @param   pCfgReq             Requested configuration to create stream with.
- * @param   pCfgObt             Obtained configuration the stream got created on success.
- * @param   pphPCM              Where to store the ALSA stream handle on success.
- */
-static int alsaStreamOpen(bool fIn, PALSAAUDIOSTREAMCFG pCfgReq, PALSAAUDIOSTREAMCFG pCfgObt, snd_pcm_t **pphPCM)
+ * @param   pszDev  The name of the device to open.
+ * @param   fIn     Whether this is an input stream to create or not.
+ * @param   pCfgReq Requested configuration to create stream with.
+ * @param   pCfgObt Obtained configuration the stream got created on success.
+ * @param   pphPCM  Where to store the ALSA stream handle on success.
+ */
+static int alsaStreamOpen(const char *pszDev, bool fIn, PALSAAUDIOSTREAMCFG pCfgReq,
+                          PALSAAUDIOSTREAMCFG pCfgObt,  snd_pcm_t **pphPCM)
 {
     snd_pcm_t *phPCM = NULL;
@@ -379 +385 @@
     do
     {
-        const char *pszDev = "default"; /** @todo Make this configurable through PALSAAUDIOSTREAMCFG. */
-        if (!pszDev)
-        {
-            LogRel(("ALSA: Invalid or no %s device name set\n", fIn ? "input" : "output"));
-            rc = VERR_INVALID_PARAMETER;
-            break;
-        }
+        AssertLogRelMsgReturn(pszDev && *pszDev,
+                              ("ALSA: Invalid or no %s device name set\n", fIn ? "input" : "output"),
+                              VERR_INVALID_NAME);
 
         LogRel(("ALSA: Using %s device \"%s\"\n", fIn ? "input" : "output", pszDev));
@@ -964 +966 @@
  *
  * @returns VBox status code.
- * @param   pStreamALSA         ALSA output stream to create.
- * @param   pCfgReq             Requested configuration to create stream with.
- * @param   pCfgAcq             Obtained configuration the stream got created with on success.
- */
-static int alsaCreateStreamOut(PALSAAUDIOSTREAM pStreamALSA, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+ * @param   pThis       The ALSA driver instance data.
+ * @param   pStreamALSA ALSA output stream to create.
+ * @param   pCfgReq     Requested configuration to create stream with.
+ * @param   pCfgAcq     Obtained configuration the stream got created
+ *                      with on success.
+ */
+static int alsaCreateStreamOut(PDRVHOSTALSAAUDIO pThis, PALSAAUDIOSTREAM pStreamALSA,
+                               PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     snd_pcm_t *phPCM = NULL;
@@ -985 +990 @@
 
         ALSAAUDIOSTREAMCFG obt;
-        rc = alsaStreamOpen(false /* fIn */, &req, &obt, &phPCM);
+        rc = alsaStreamOpen(pThis->szDefaultOut, false /* fIn */, &req, &obt, &phPCM);
         if (RT_FAILURE(rc))
             break;
@@ -1024 +1029 @@
  *
  * @returns VBox status code.
- * @param   pStreamALSA         ALSA input stream to create.
- * @param   pCfgReq             Requested configuration to create stream with.
- * @param   pCfgAcq             Obtained configuration the stream got created with on success.
- */
-static int alsaCreateStreamIn(PALSAAUDIOSTREAM pStreamALSA, PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
+ * @param   pThis       The ALSA driver instance data.
+ * @param   pStreamALSA ALSA input stream to create.
+ * @param   pCfgReq     Requested configuration to create stream with.
+ * @param   pCfgAcq     Obtained configuration the stream got created
+ *                      with on success.
+ */
+static int alsaCreateStreamIn(PDRVHOSTALSAAUDIO pThis, PALSAAUDIOSTREAM pStreamALSA,
+                              PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
     int rc;
@@ -1045 +1053 @@
 
         ALSAAUDIOSTREAMCFG obt;
-        rc = alsaStreamOpen(true /* fIn */, &req, &obt, &phPCM);
+        rc = alsaStreamOpen(pThis->szDefaultIn, true /* fIn */, &req, &obt, &phPCM);
         if (RT_FAILURE(rc))
             break;
@@ -1351 +1359 @@
                                                          PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
+    PDRVHOSTALSAAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVHOSTALSAAUDIO, IHostAudio);
     AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
     AssertPtrReturn(pStream,    VERR_INVALID_POINTER);
@@ -1360 +1369 @@
     int rc;
     if (pCfgReq->enmDir == PDMAUDIODIR_IN)
-        rc = alsaCreateStreamIn( pStreamALSA, pCfgReq, pCfgAcq);
+        rc = alsaCreateStreamIn( pThis, pStreamALSA, pCfgReq, pCfgAcq);
     else
-        rc = alsaCreateStreamOut(pStreamALSA, pCfgReq, pCfgAcq);
+        rc = alsaCreateStreamOut(pThis, pStreamALSA, pCfgReq, pCfgAcq);
 
     if (RT_SUCCESS(rc))
@@ -1586 +1595 @@
     pThis->IHostAudio.pfnStreamCaptureEnd   = NULL;
 
+    /*
+     * Read configuration.
+     */
+    int rc = CFGMR3QueryStringDef(pCfg, "DefaultInput", pThis->szDefaultIn, sizeof(pThis->szDefaultIn), "default");
+    AssertRCReturn(rc, rc);
+    rc = CFGMR3QueryStringDef(pCfg, "DefaultOutput", pThis->szDefaultOut, sizeof(pThis->szDefaultOut), "default");
+    AssertRCReturn(rc, rc);
 
     return VINF_SUCCESS;