Changeset 70496 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 9, 2018 4:09:23 PM (7 years ago)

Author:

vboxsync

Message:

Audio: Renamed VBOX_WITH_VRDE_AUDIO -> VBOX_WITH_AUDIO_VRDE.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (4 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (6 diffs)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src-client/ConsoleVRDPServer.cpp (modified) (6 diffs)
• src-client/VBoxDriversRegister.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2004-2017 Oracle Corporation
+# Copyright (C) 2004-2018 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -347 +347 @@
         $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC,) \
         $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,) \
-        $(if $(VBOX_WITH_VRDE_AUDIO),VBOX_WITH_VRDE_AUDIO,) \
+        $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \
@@ -747 +747 @@
         $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC,) \
         $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,) \
-        $(if $(VBOX_WITH_VRDE_AUDIO),VBOX_WITH_VRDE_AUDIO,) \
+        $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
         $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \
@@ -912 +912 @@
         ../Devices/Audio/AudioMixBuffer.cpp \
         ../Devices/Audio/DrvAudioCommon.cpp \
-        $(if $(VBOX_WITH_VRDE_AUDIO),src-client/DrvAudioVRDE.cpp,) \
+        $(if $(VBOX_WITH_AUDIO_VRDE),src-client/DrvAudioVRDE.cpp,) \
         $(if $(VBOX_WITH_AUDIO_VIDEOREC),src-client/DrvAudioVideoRec.cpp,)
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2005-2017 Oracle Corporation
+ * Copyright (C) 2005-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -135 +135 @@
     Display *i_getDisplay() const { return mDisplay; }
     MachineDebugger *i_getMachineDebugger() const { return mDebugger; }
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
     AudioVRDE *i_getAudioVRDE() const { return mAudioVRDE; }
 #endif

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2005-2017 Oracle Corporation
+ * Copyright (C) 2005-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -59 +59 @@
 #include "RemoteUSBDeviceImpl.h"
 #include "SharedFolderImpl.h"
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
 # include "DrvAudioVRDE.h"
 #endif
@@ -585 +585 @@
             meAttachmentType[slot] = NetworkAttachmentType_Null;
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
         unconst(mAudioVRDE) = new AudioVRDE(this);
         AssertReturn(mAudioVRDE, E_FAIL);
@@ -729 +729 @@
 #endif
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
     if (mAudioVRDE)
     {
@@ -1439 +1439 @@
     }
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
     if (fu32Intercepted & VRDE_CLIENT_INTERCEPT_AUDIO)
     {
@@ -1477 +1477 @@
     LogFlowFunc(("u32ClientId=%RU32\n", u32ClientId));
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
     if (mAudioVRDE)
         mAudioVRDE->onVRDEControl(true /* fEnable */, 0 /* uFlags */);

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

@@ -10 +10 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -2963 +2963 @@
                     InsertConfigString(pLunL1, "Driver", strAudioDriver.c_str());
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
             /*
              * The VRDE audio backend driver.
@@ -2984 +2984 @@
                     InsertConfigInteger(pCfg, "Object", (uintptr_t)mAudioVRDE);
                     InsertConfigInteger(pCfg, "ObjectVRDPServer", (uintptr_t)mConsoleVRDPServer);
-#endif /* VBOX_WITH_VRDE_AUDIO */
+#endif /* VBOX_WITH_AUDIO_VRDE */
 
 #ifdef VBOX_WITH_AUDIO_VIDEOREC

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -24 +24 @@
 #include "KeyboardImpl.h"
 #include "MouseImpl.h"
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
 #include "DrvAudioVRDE.h"
 #endif
@@ -961 +961 @@
         ASMAtomicWriteU32(&pServer->mu32AudioInputClientId, 0);
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
         AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
         if (pVRDE)
@@ -1024 +1024 @@
                 LogFunc(("Intercepting audio input by client %RU32\n", u32ClientId));
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
                 AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
                 if (pVRDE)
@@ -1299 +1299 @@
     AssertPtrReturnVoid(pServer);
 
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
     AudioVRDE *pVRDE = pServer->mConsole->i_getAudioVRDE();
     if (!pVRDE) /* Nothing to do, bail out early. */
@@ -1325 +1325 @@
 #else
     RT_NOREF(pvCtx, u32Event, pvData, cbData);
-#endif /* VBOX_WITH_VRDE_AUDIO */
+#endif /* VBOX_WITH_AUDIO_VRDE */
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -28 +28 @@
 #include "DisplayImpl.h"
 #include "VMMDev.h"
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
 # include "DrvAudioVRDE.h"
 #endif
@@ -75 +75 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifdef VBOX_WITH_VRDE_AUDIO
+#ifdef VBOX_WITH_AUDIO_VRDE
     rc = pCallbacks->pfnRegister(pCallbacks, &AudioVRDE::DrvReg);
     if (RT_FAILURE(rc))