Changeset 65164 in vbox

Timestamp:

Jan 5, 2017 5:45:12 PM (8 years ago)

Author:

vboxsync

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

112667

Message:

Main/VRDE: Got rid of Doppelmoppel i_getAudioVRDE() functions and use VBOX_WITH_VRDE_AUDIO where needed.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleVRDPServer.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -190 +190 @@
     int i_hgcmLoadService(const char *pszServiceLibrary, const char *pszServiceName);
     VMMDev *i_getVMMDev() { return m_pVMMDev; }
-    AudioVRDE *i_getAudioVRDE() { return mAudioVRDE; }
 
 #ifdef VBOX_WITH_EXTPACK

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
 #include "KeyboardImpl.h"
 #include "MouseImpl.h"
+#ifdef VBOX_WITH_VRDE_AUDIO
 #include "DrvAudioVRDE.h"
+#endif
 #ifdef VBOX_WITH_EXTPACK
 # include "ExtPackManagerImpl.h"
@@ -956 +958 @@
         ASMAtomicWriteU32(&pServer->mu32AudioInputClientId, 0);
 
+#ifdef VBOX_WITH_VRDE_AUDIO
         AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
         if (pVRDE)
             pVRDE->onVRDEInputIntercept(false /* fIntercept */);
+#endif
     }
 
@@ -1017 +1021 @@
                 LogFunc(("Intercepting audio input by client %RU32\n", u32ClientId));
 
+#ifdef VBOX_WITH_VRDE_AUDIO
                 AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
                 if (pVRDE)
                     pVRDE->onVRDEInputIntercept(true /* fIntercept */);
+#endif
             }
             else
@@ -1290 +1296 @@
     AssertPtrReturnVoid(pServer);
 
+#ifdef VBOX_WITH_VRDE_AUDIO
     AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
     if (!pVRDE) /* Nothing to do, bail out early. */
@@ -1313 +1320 @@
             break;
     }
+#else
+    RT_NOREF(pvCtx, u32Event, pvData, cbData);
+#endif /* VBOX_WITH_VRDE_AUDIO */
 }