Changeset 35419 in vbox

Timestamp:

Jan 7, 2011 9:27:48 AM (14 years ago)

Author:

vboxsync

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

69286

Message:

Devices/Audio/filteraudio: don't call host audio functions if the host audio backend failed to initialize

File:

• trunk/src/VBox/Devices/Audio/filteraudio.c (modified) (7 diffs)

trunk/src/VBox/Devices/Audio/filteraudio.c

@@ -334 +334 @@
 
     if (!pVoice->fIntercepted)
-    {
         return filter_conf.pDrv->pcm_ops->run_out(phw);
-    }
 
     /* We return the live count in the case we are not initialized. This should
@@ -411 +409 @@
 
     status = ASMAtomicReadU32(&pVoice->status);
-    if (!(status == CA_STATUS_INIT))
+    if (status != CA_STATUS_INIT)
         return 0;
 
@@ -551 +549 @@
 
     /* Iterate as long as data is available */
-    while(csWritten < csAvail)
+    while (csWritten < csAvail)
     {
         /* How much is left? */
@@ -666 +664 @@
     int rc = VINF_SUCCESS;
     filterVoiceIn *pVoice;
+    int rcHost = 0;
 
     if (!filter_conf.pDrv)
@@ -689 +688 @@
             /* Note: audio.c does not use variable parameters '...', so ok to forward only 'phw' and 'cmd'. */
             Log(("FilterAudio: [Input]: forwarding ctl_in ENABLE for voice %p (hw %p)\n", pVoice, pVoice->phw));
-            return filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
+            if (pVoice->fHostOK)
+                rcHost = filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
+            return rcHost;
         }
 
@@ -731 +732 @@
             /* Note: audio.c does not use variable parameters '...', so ok to forward only 'phw' and 'cmd'. */
             Log(("FilterAudio: [Input]: forwarding ctl_in DISABLE for voice %p (hw %p)\n", pVoice, pVoice->phw));
-            return filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
+            if (pVoice->fHostOK)
+                rcHost = filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
+            return rcHost;
         }
 
@@ -771 +774 @@
     /* Uninitialize both host and filter parts of the voice. */
     Log(("FilterAudio: [Input]: forwarding fini_in for voice %p (hw %p)\n", pVoice, pVoice->phw));
-    filter_conf.pDrv->pcm_ops->fini_in(phw);
+    if (pVoice->fHostOK)
+        filter_conf.pDrv->pcm_ops->fini_in(phw);
 
     Log(("FilterAudio: [Input]: fini_in for voice %p (hw %p)\n", pVoice, pVoice->phw));