Changeset 53442 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

Timestamp:

Dec 4, 2014 1:49:43 PM (10 years ago)

Author:

vboxsync

Message:

PDM Audio: Branch -> trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (5 diffs)

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

@@ -414 +414 @@
     , mpVmm2UserMethods(NULL)
     , m_pVMMDev(NULL)
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    , mAudioVRDE(NULL)
+#else
     , mAudioSniffer(NULL)
 #endif
@@ -596 +598 @@
 #ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         unconst(mAudioVRDE) = new AudioVRDE(this);
-        AssertComRCReturnRC(rc);
+        AssertReturn(mAudioVRDE, E_FAIL);
 #else
         unconst(mAudioSniffer) = new AudioSniffer(this);
         AssertReturn(mAudioSniffer, E_FAIL);
 #endif
-
         FirmwareType_T enmFirmwareType;
         mMachine->COMGETTER(FirmwareType)(&enmFirmwareType);
@@ -730 +731 @@
     }
 #endif
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if (mAudioVRDE)
+    {
+        delete mAudioVRDE;
+        unconst(mAudioVRDE) = NULL;
+    }
+#else
     if (mAudioSniffer)
     {
@@ -1433 +1441 @@
     if (fu32Intercepted & VRDE_CLIENT_INTERCEPT_AUDIO)
     {
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+        if (mAudioVRDE)
+            mAudioVRDE->onVRDEInputIntercept(false /* fIntercept */);
+#else
         mcAudioRefs--;
 
         if (mcAudioRefs <= 0)
         {
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
             if (mAudioSniffer)
             {
                 PPDMIAUDIOSNIFFERPORT port = mAudioSniffer->getAudioSnifferPort();
                 if (port)
-                {
                     port->pfnSetup(port, false, false);
-                }
             }
+        }
 #endif
-        }
     }
 
@@ -1480 +1489 @@
     AutoCaller autoCaller(this);
     AssertComRCReturnVoid(autoCaller.rc());
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
-    LogFlowFunc(("mAudioSniffer %p, u32ClientId %d.\n",
-                 mAudioSniffer, u32ClientId));
-    NOREF(u32ClientId);
-#endif
-
+
+    LogFlowFunc(("u32ClientId=%RU32\n", u32ClientId));
+
+#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
+    if (mAudioVRDE)
+        mAudioVRDE->onVRDEInputIntercept(true /* fIntercept */);
+#else
     ++mcAudioRefs;
 
     if (mcAudioRefs == 1)
     {
-#ifndef VBOX_WITH_PDM_AUDIO_DRIVER
         if (mAudioSniffer)
         {
             PPDMIAUDIOSNIFFERPORT port = mAudioSniffer->getAudioSnifferPort();
             if (port)
-            {
                 port->pfnSetup(port, true, true);
-            }
-        }
+        }
+    }
 #endif
-    }
 
     LogFlowFuncLeave();