Changeset 35427 in vbox for trunk/src

Timestamp:

Jan 7, 2011 2:09:52 PM (14 years ago)

Author:

vboxsync

Message:

Devices/Audio/filteraudio: do not call host backend voice uninit if the voice has not been initialized by the host (removed unnecessary parts of r69286).

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
@@ -409 +411 @@
 
     status = ASMAtomicReadU32(&pVoice->status);
-    if (status != CA_STATUS_INIT)
+    if (!(status == CA_STATUS_INIT))
         return 0;
 
@@ -549 +551 @@
 
     /* Iterate as long as data is available */
-    while (csWritten < csAvail)
+    while(csWritten < csAvail)
     {
         /* How much is left? */
@@ -664 +666 @@
     int rc = VINF_SUCCESS;
     filterVoiceIn *pVoice;
-    int rcHost = 0;
 
     if (!filter_conf.pDrv)
@@ -688 +689 @@
             /* 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));
-            if (pVoice->fHostOK)
-                rcHost = filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
-            return rcHost;
+            return filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
         }
 
@@ -730 +729 @@
         if (!pVoice->fIntercepted)
         {
+            if (!pVoice->fHostOK)
+            {
+                /* Host did not initialize the voice. Theoretically should not happen, because
+                 * audio.c should not disable a voice which has not been enabled at all.
+                 */
+                Log(("FilterAudio: [Input]: ctl_in DISABLE voice %p (hw %p) not available on host\n", pVoice, pVoice->phw));
+                return -1;
+            }
+
             /* 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));
-            if (pVoice->fHostOK)
-                rcHost = filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
-            return rcHost;
+            return filter_conf.pDrv->pcm_ops->ctl_in(phw, cmd);
         }
 
@@ -773 +779 @@
 
     /* Uninitialize both host and filter parts of the voice. */
-    Log(("FilterAudio: [Input]: forwarding fini_in for voice %p (hw %p)\n", pVoice, pVoice->phw));
     if (pVoice->fHostOK)
+    {
+        /* Uninit host part only if it was initialized by host. */
+        Log(("FilterAudio: [Input]: forwarding fini_in for voice %p (hw %p)\n", pVoice, pVoice->phw));
         filter_conf.pDrv->pcm_ops->fini_in(phw);
+    }
 
     Log(("FilterAudio: [Input]: fini_in for voice %p (hw %p)\n", pVoice, pVoice->phw));