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

Timestamp:

May 26, 2015 4:39:58 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Removed old audio architecture.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (7 diffs)

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

@@ -56 +56 @@
 #include "RemoteUSBDeviceImpl.h"
 #include "SharedFolderImpl.h"
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
 #include "DrvAudioVRDE.h"
-#else
-#include "AudioSnifferInterface.h"
-#endif
 #include "Nvram.h"
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -373 +369 @@
     , mpVmm2UserMethods(NULL)
     , m_pVMMDev(NULL)
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     , mAudioVRDE(NULL)
-#else
-    , mAudioSniffer(NULL)
-#endif
     , mNvram(NULL)
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -557 +549 @@
             meAttachmentType[slot] = NetworkAttachmentType_Null;
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         unconst(mAudioVRDE) = new AudioVRDE(this);
         AssertReturn(mAudioVRDE, E_FAIL);
-#else
-        unconst(mAudioSniffer) = new AudioSniffer(this);
-        AssertReturn(mAudioSniffer, E_FAIL);
-#endif
+
         FirmwareType_T enmFirmwareType;
         mMachine->COMGETTER(FirmwareType)(&enmFirmwareType);
@@ -697 +685 @@
 #endif
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     if (mAudioVRDE)
     {
@@ -703 +690 @@
         unconst(mAudioVRDE) = NULL;
     }
-#else
-    if (mAudioSniffer)
-    {
-        delete mAudioSniffer;
-        unconst(mAudioSniffer) = NULL;
-    }
-#endif
 
     // if the VM had a VMMDev with an HGCM thread, then remove that here
@@ -1402 +1382 @@
     if (fu32Intercepted & VRDE_CLIENT_INTERCEPT_AUDIO)
     {
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
         if (mAudioVRDE)
             mAudioVRDE->onVRDEControl(false /* fEnable */, 0 /* uFlags */);
-#else
-        mcAudioRefs--;
-
-        if (mcAudioRefs <= 0)
-        {
-            if (mAudioSniffer)
-            {
-                PPDMIAUDIOSNIFFERPORT port = mAudioSniffer->getAudioSnifferPort();
-                if (port)
-                    port->pfnSetup(port, false, false);
-            }
-        }
-#endif
     }
 
@@ -1449 +1415 @@
     LogFlowFunc(("u32ClientId=%RU32\n", u32ClientId));
 
-#ifdef VBOX_WITH_PDM_AUDIO_DRIVER
     if (mAudioVRDE)
         mAudioVRDE->onVRDEControl(true /* fEnable */, 0 /* uFlags */);
-#else
-    ++mcAudioRefs;
-
-    if (mcAudioRefs == 1)
-    {
-        if (mAudioSniffer)
-        {
-            PPDMIAUDIOSNIFFERPORT port = mAudioSniffer->getAudioSnifferPort();
-            if (port)
-                port->pfnSetup(port, true, true);
-        }
-    }
-#endif
 
     LogFlowFuncLeave();