Changeset 70640 in vbox

Timestamp:

Jan 19, 2018 12:14:12 PM (7 years ago)

Author:

vboxsync

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

120370

Message:

Audio: Added VERR_AUDIO_BACKEND_NOT_ATTACHED and support for it in PDMIAUDIOCONNECTOR::pfnGetStatus() and AudioMixerSinkCreateStream().

Location:

trunk

Files:

• include/VBox/err.h (modified) (2 diffs)
• src/VBox/Devices/Audio/AudioMixer.cpp (modified) (1 diff)
• src/VBox/Devices/Audio/DrvAudio.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2778 +2778 @@
  *  NULL audio driver. */
 #define VERR_AUDIO_BACKEND_INIT_FAILED              (-6600)
+/** No host backend attached / available. */
+#define VERR_AUDIO_BACKEND_NOT_ATTACHED             (-6605)
 /** No free input streams.  */
 #define VERR_AUDIO_NO_FREE_INPUT_STREAMS            (-6601)

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

@@ -588 +588 @@
     /** @todo Validate fFlags. */
     /* ppStream is optional. */
+
+    if (pConn->pfnGetStatus(pConn, PDMAUDIODIR_ANY) == PDMAUDIOBACKENDSTS_NOT_ATTACHED)
+        return VERR_AUDIO_BACKEND_NOT_ATTACHED;
 
     PAUDMIXSTREAM pMixStream = (PAUDMIXSTREAM)RTMemAllocZ(sizeof(AUDMIXSTREAM));

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

@@ -2766 +2766 @@
     if (RT_SUCCESS(rc))
     {
-        if (   pThis->pHostDrvAudio
-            && pThis->pHostDrvAudio->pfnGetStatus)
-        {
-             backendSts = pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, enmDir);
-        }
+        if (pThis->pHostDrvAudio)
+        {
+            if (pThis->pHostDrvAudio->pfnGetStatus)
+                backendSts = pThis->pHostDrvAudio->pfnGetStatus(pThis->pHostDrvAudio, enmDir);
+        }
+        else
+            backendSts = PDMAUDIOBACKENDSTS_NOT_ATTACHED;
 
         int rc2 = RTCritSectLeave(&pThis->CritSect);