Changeset 89505 in vbox for trunk/src/VBox

Timestamp:

Jun 4, 2021 12:03:25 PM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioAlsa: Implemented pfnSetDevice and changed the config values to OutputDeviceID and InputDeviceID. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp (modified) (9 diffs)

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

@@ -105 +105 @@
      *  UINT32_MAX for unlimited logging. */
     uint32_t            cLogErrors;
+
+    /** Critical section protecting the default device strings. */
+    RTCRITSECT          CritSect;
     /** Default input device name.   */
     char                szDefaultIn[256];
     /** Default output device name. */
     char                szDefaultOut[256];
+    /** Upwards notification interface. */
+    PPDMIHOSTAUDIOPORT  pIHostAudioPort;
 } DRVHSTAUDALSA;
 /** Pointer to the instance data of an ALSA host audio driver. */
@@ -344 +349 @@
     }
     return rc;
+}
+
+
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnSetDevice}
+ */
+static DECLCALLBACK(int) drvHstAudAlsaHA_SetDevice(PPDMIHOSTAUDIO pInterface, PDMAUDIODIR enmDir, const char *pszId)
+{
+    PDRVHSTAUDALSA pThis = RT_FROM_MEMBER(pInterface, DRVHSTAUDALSA, IHostAudio);
+
+    /*
+     * Validate and normalize input.
+     */
+    AssertReturn(enmDir == PDMAUDIODIR_IN || enmDir == PDMAUDIODIR_OUT || enmDir == PDMAUDIODIR_DUPLEX, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(pszId, VERR_INVALID_POINTER);
+    if (!pszId || !*pszId)
+        pszId = "default";
+    else
+    {
+        size_t cch = strlen(pszId);
+        AssertReturn(cch < sizeof(pThis->szDefaultIn), VERR_INVALID_NAME);
+    }
+    LogFunc(("enmDir=%d pszId=%s\n", enmDir, pszId));
+
+    /*
+     * Update input.
+     */
+    if (enmDir == PDMAUDIODIR_IN || enmDir == PDMAUDIODIR_DUPLEX)
+    {
+        int rc = RTCritSectEnter(&pThis->CritSect);
+        AssertRCReturn(rc, rc);
+        if (strcmp(pThis->szDefaultIn, pszId) == 0)
+            RTCritSectLeave(&pThis->CritSect);
+        else
+        {
+            LogRel(("ALSA: Default input device: '%s' -> '%s'\n", pThis->szDefaultIn, pszId));
+            RTStrCopy(pThis->szDefaultIn, sizeof(pThis->szDefaultIn), pszId);
+            PPDMIHOSTAUDIOPORT pIHostAudioPort = pThis->pIHostAudioPort;
+            RTCritSectLeave(&pThis->CritSect);
+            if (pIHostAudioPort)
+            {
+                LogFlowFunc(("Notifying parent driver about input default device change...\n"));
+                pIHostAudioPort->pfnNotifyDeviceChanged(pIHostAudioPort, PDMAUDIODIR_IN, NULL /*pvUser*/);
+            }
+        }
+    }
+
+    /*
+     * Update output.
+     */
+    if (enmDir == PDMAUDIODIR_OUT || enmDir == PDMAUDIODIR_DUPLEX)
+    {
+        int rc = RTCritSectEnter(&pThis->CritSect);
+        AssertRCReturn(rc, rc);
+        if (strcmp(pThis->szDefaultOut, pszId) == 0)
+            RTCritSectLeave(&pThis->CritSect);
+        else
+        {
+            LogRel(("ALSA: Default output device: '%s' -> '%s'\n", pThis->szDefaultOut, pszId));
+            RTStrCopy(pThis->szDefaultOut, sizeof(pThis->szDefaultOut), pszId);
+            PPDMIHOSTAUDIOPORT pIHostAudioPort = pThis->pIHostAudioPort;
+            RTCritSectLeave(&pThis->CritSect);
+            if (pIHostAudioPort)
+            {
+                LogFlowFunc(("Notifying parent driver about output default device change...\n"));
+                pIHostAudioPort->pfnNotifyDeviceChanged(pIHostAudioPort, PDMAUDIODIR_OUT, NULL /*pvUser*/);
+            }
+        }
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -1369 +1445 @@
 
 
+/*********************************************************************************************************************************
+*   PDMIBASE                                                                                                                     *
+*********************************************************************************************************************************/
+
 /**
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
@@ -1378 +1458 @@
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHOSTAUDIO, &pThis->IHostAudio);
-
     return NULL;
 }
 
 
-/**
- * Construct a DirectSound Audio driver instance.
- *
- * @copydoc FNPDMDRVCONSTRUCT
+/*********************************************************************************************************************************
+*   PDMDRVREG                                                                                                                    *
+*********************************************************************************************************************************/
+
+/**
+ * @interface_method_impl{PDMDRVREG::pfnDestruct,
+ * Destructs an ALSA host audio driver instance.}
+ */
+static DECLCALLBACK(void) drvHstAudAlsaDestruct(PPDMDRVINS pDrvIns)
+{
+    PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
+    PDRVHSTAUDALSA pThis = PDMINS_2_DATA(pDrvIns, PDRVHSTAUDALSA);
+    LogFlowFuncEnter();
+
+    if (RTCritSectIsInitialized(&pThis->CritSect))
+    {
+        RTCritSectEnter(&pThis->CritSect);
+        pThis->pIHostAudioPort = NULL;
+        RTCritSectLeave(&pThis->CritSect);
+        RTCritSectDelete(&pThis->CritSect);
+    }
+
+    LogFlowFuncLeave();
+}
+
+
+/**
+ * @interface_method_impl{PDMDRVREG::pfnConstruct,
+ * Construct an ALSA host audio driver instance.}
  */
 static DECLCALLBACK(int) drvHstAudAlsaConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
@@ -1399 +1503 @@
      */
     pThis->pDrvIns                   = pDrvIns;
+    int rc = RTCritSectInit(&pThis->CritSect);
+    AssertRCReturn(rc, rc);
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface = drvHstAudAlsaQueryInterface;
@@ -1404 +1510 @@
     pThis->IHostAudio.pfnGetConfig                  = drvHstAudAlsaHA_GetConfig;
     pThis->IHostAudio.pfnGetDevices                 = drvHstAudAlsaHA_GetDevices;
-    pThis->IHostAudio.pfnSetDevice                  = NULL;
+    pThis->IHostAudio.pfnSetDevice                  = drvHstAudAlsaHA_SetDevice;
     pThis->IHostAudio.pfnGetStatus                  = drvHstAudAlsaHA_GetStatus;
     pThis->IHostAudio.pfnDoOnWorkerThread           = NULL;
@@ -1423 +1529 @@
      * Read configuration.
      */
-    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "DefaultOutput|DefaultInput", "");
-
-    int rc = CFGMR3QueryStringDef(pCfg, "DefaultInput", pThis->szDefaultIn, sizeof(pThis->szDefaultIn), "default");
+    PDMDRV_VALIDATE_CONFIG_RETURN(pDrvIns, "OutputDeviceID|InputDeviceID", "");
+
+    rc = CFGMR3QueryStringDef(pCfg, "InputDeviceID", pThis->szDefaultIn, sizeof(pThis->szDefaultIn), "default");
     AssertRCReturn(rc, rc);
-    rc = CFGMR3QueryStringDef(pCfg, "DefaultOutput", pThis->szDefaultOut, sizeof(pThis->szDefaultOut), "default");
+    rc = CFGMR3QueryStringDef(pCfg, "OutputDeviceID", pThis->szDefaultOut, sizeof(pThis->szDefaultOut), "default");
     AssertRCReturn(rc, rc);
 
@@ -1439 +1545 @@
         return rc;
     }
+
+    /*
+     * Query the notification interface from the driver/device above us.
+     */
+    pThis->pIHostAudioPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIHOSTAUDIOPORT);
+    AssertReturn(pThis->pIHostAudioPort, VERR_PDM_MISSING_INTERFACE_ABOVE);
+
 #ifdef DEBUG
+    /*
+     * Some debug stuff we don't use for anything at all.
+     */
     snd_lib_error_set_handler(drvHstAudAlsaDbgErrorHandler);
 #endif
@@ -1472 +1588 @@
     drvHstAudAlsaConstruct,
     /* pfnDestruct */
-    NULL,
+    drvHstAudAlsaDestruct,
     /* pfnRelocate */
     NULL,