Changeset 73452 in vbox

Timestamp:

Aug 2, 2018 12:37:33 PM (6 years ago)

Author:

vboxsync

Message:

Audio: When setting the recording source, check if the selected driver has at least one input source available, otherwise skip to the next one.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• DevIchAc97.cpp (modified) (1 diff)

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

@@ -2433 +2433 @@
                 if (pStreamCfg->enmDir == PDMAUDIODIR_IN)
                 {
-                    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'\n", pStreamCfg->szName));
+                    PDMAUDIOBACKENDCFG Cfg;
+                    rc = pDrv->pConnector->pfnGetConfig(pDrv->pConnector, &Cfg);
+                    if (   RT_SUCCESS(rc)
+                        && Cfg.cMaxStreamsIn) /* At least one input source available? */
+                    {
+                        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'\n", pStreamCfg->szName));
+                    }
+                    else if (RT_FAILURE(rc))
+                        LogFunc(("LUN#%RU8: Unable to retrieve backend configuratio for '%s', rc=%Rrc\n",
+                                 pDrv->uLUN, pStreamCfg->szName, rc));
                 }
             }

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

@@ -1571 +1571 @@
                 if (pStreamCfg->enmDir == PDMAUDIODIR_IN)
                 {
-                    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'\n", pStreamCfg->szName));
+                    PDMAUDIOBACKENDCFG Cfg;
+                    rc = pDrv->pConnector->pfnGetConfig(pDrv->pConnector, &Cfg);
+                    if (   RT_SUCCESS(rc)
+                        && Cfg.cMaxStreamsIn) /* At least one input source available? */
+                    {
+                        rc = AudioMixerSinkSetRecordingSource(pMixSink, pMixStrm);
+                        LogFlowFunc(("LUN#%RU8: Recording source is now '%s', rc=%Rrc\n", pDrv->uLUN, pStreamCfg->szName, rc));
+                        LogRel2(("AC97: Set recording source to '%s'\n", pStreamCfg->szName));
+                    }
+                    else if (RT_FAILURE(rc))
+                        LogFunc(("LUN#%RU8: Unable to retrieve backend configuratio for '%s', rc=%Rrc\n",
+                                 pDrv->uLUN, pStreamCfg->szName, rc));
                 }
             }