Changeset 73838 in vbox

Timestamp:

Aug 22, 2018 4:15:08 PM (6 years ago)

Author:

vboxsync

Message:

Audio: Added the backend's (friendly) name into the backend configuration.

Location:

trunk

Files:

• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)
• src/VBox/Devices/Audio/DevHDA.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostDebugAudio.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostNullAudio.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvHostValidationKit.cpp (modified) (1 diff)
• src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (1 diff)
• src/VBox/Main/src-client/DrvAudioVideoRec.cpp (modified) (1 diff)

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -344 +344 @@
 typedef struct PDMAUDIOBACKENDCFG
 {
+    /** The backend's friendly name. */
+    char     szName[32];
     /** Size (in bytes) of the host backend's audio output stream structure. */
     size_t   cbStreamOut;

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

@@ -2447 +2447 @@
                     PDMAUDIOBACKENDCFG Cfg;
                     rc = pDrv->pConnector->pfnGetConfig(pDrv->pConnector, &Cfg);
-                    if (   RT_SUCCESS(rc)
-                        && Cfg.cMaxStreamsIn) /* At least one input source available? */
+                    if (RT_SUCCESS(rc))
                     {
-                        rc = AudioMixerSinkSetRecordingSource(pMixSink, pMixStrm);
-                        LogFlowFunc(("LUN#%RU8: Recording source is now '%s', rc=%Rrc\n", pDrv->uLUN, pStreamCfg->szName, rc));
-                        LogRel2(("HDA: Set recording source to '%s' (LUN#%RU8)\n", pStreamCfg->szName, pDrv->uLUN));
+                        if (Cfg.cMaxStreamsIn) /* At least one input source available? */
+                        {
+                            rc = AudioMixerSinkSetRecordingSource(pMixSink, pMixStrm);
+                            LogFlowFunc(("LUN#%RU8: Recording source for '%s' -> '%s', rc=%Rrc\n",
+                                         pDrv->uLUN, pStreamCfg->szName, Cfg.szName, rc));
+
+                            if (RT_SUCCESS(rc))
+                                LogRel(("HDA: Set recording source for '%s' to '%s'\n",
+                                        pStreamCfg->szName, Cfg.szName));
+                        }
+                        else
+                            LogRel(("HDA: Backend '%s' currently is not offering any recording source for '%s', muting\n",
+                                    Cfg.szName, pStreamCfg->szName));
                     }
                     else if (RT_FAILURE(rc))
-                        LogFunc(("LUN#%RU8: Unable to retrieve backend configuratio for '%s', rc=%Rrc\n",
+                        LogFunc(("LUN#%RU8: Unable to retrieve backend configuration for '%s', rc=%Rrc\n",
                                  pDrv->uLUN, pStreamCfg->szName, rc));
                 }

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

@@ -1162 +1162 @@
     RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "ALSA audio driver");
 
     pBackendCfg->cbStreamIn  = sizeof(ALSAAUDIOSTREAM);

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

@@ -2181 +2181 @@
 
     RT_BZERO(pBackendCfg, sizeof(PDMAUDIOBACKENDCFG));
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Core Audio driver");
 
     pBackendCfg->cbStreamIn  = sizeof(COREAUDIOSTREAM);

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

@@ -1744 +1744 @@
         pThis->fEnabledOut = RT_BOOL(cbCtx.cDevOut);
         pThis->fEnabledIn  = RT_BOOL(cbCtx.cDevIn);
+
+        RTStrPrintf2(Cfg.szName, sizeof(Cfg.szName), "DirectSound audio driver");
 
         Cfg.cMaxStreamsIn  = UINT32_MAX;

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

@@ -70 +70 @@
     RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Debug audio driver");
 
     pBackendCfg->cbStreamOut    = sizeof(DEBUGAUDIOSTREAM);

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

@@ -88 +88 @@
     NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "NULL audio driver");
 
     pBackendCfg->cbStreamOut    = sizeof(NULLAUDIOSTREAM);

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

@@ -552 +552 @@
 {
     RT_NOREF(pInterface);
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "OSS audio driver");
 
     pBackendCfg->cbStreamIn  = sizeof(OSSAUDIOSTREAM);

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

@@ -1124 +1124 @@
     PDMAUDIOBACKENDCFG Cfg;
     RT_ZERO(Cfg);
+
+    RTStrPrintf2(Cfg.szName, sizeof(Cfg.szName), "PulseAudio driver");
 
     Cfg.cbStreamOut    = sizeof(PULSEAUDIOSTREAM);

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

@@ -82 +82 @@
     RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Validation Kit audio driver");
 
     pBackendCfg->cbStreamOut    = sizeof(VAKITAUDIOSTREAM);

trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

@@ -373 +373 @@
     RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "VRDE audio driver");
 
     pBackendCfg->cbStreamOut    = sizeof(VRDESTREAM);

trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp

@@ -834 +834 @@
     RT_NOREF(pInterface);
     AssertPtrReturn(pBackendCfg, VERR_INVALID_POINTER);
+
+    RTStrPrintf2(pBackendCfg->szName, sizeof(pBackendCfg->szName), "Video recording audio driver");
 
     pBackendCfg->cbStreamOut    = sizeof(AVRECSTREAM);