Changeset 48406 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Sep 10, 2013 12:53:50 PM (12 years ago)

Author:

vboxsync

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

88844

Message:

Main,VBoxManage: Implemented IConsole::EmulatedUSB. Removed IMachine::emulatedUSBWebcameraEnabled.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (9 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• ConsoleVRDPServer.cpp (modified) (6 diffs)
• EmulatedUSBImpl.cpp (added)
• VBoxDriversRegister.cpp (modified) (2 diffs)

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

@@ -58 +58 @@
 #include "AudioSnifferInterface.h"
 #include "Nvram.h"
-#ifdef VBOX_WITH_USB_VIDEO
-# include "UsbWebcamInterface.h"
-#endif
+#include "UsbWebcamInterface.h"
 #ifdef VBOX_WITH_USB_CARDREADER
 # include "UsbCardReader.h"
@@ -71 +69 @@
 #endif
 #include "BusAssignmentManager.h"
+#include "EmulatedUSBImpl.h"
 
 #include "VBoxEvents.h"
@@ -386 +385 @@
     , mAudioSniffer(NULL)
     , mNvram(NULL)
-#ifdef VBOX_WITH_USB_VIDEO
     , mEmWebcam(NULL)
-#endif
 #ifdef VBOX_WITH_USB_CARDREADER
     , mUsbCardReader(NULL)
@@ -504 +501 @@
         unconst(mVRDEServerInfo).createObject();
         rc = mVRDEServerInfo->init(this);
+        AssertComRCReturnRC(rc);
+
+        unconst(mEmulatedUSB).createObject();
+        rc = mEmulatedUSB->init(this);
         AssertComRCReturnRC(rc);
 
@@ -556 +557 @@
         }
 
-#ifdef VBOX_WITH_USB_VIDEO
         unconst(mEmWebcam) = new EmWebcam(this);
         AssertReturn(mEmWebcam, E_FAIL);
-#endif
 #ifdef VBOX_WITH_USB_CARDREADER
         unconst(mUsbCardReader) = new UsbCardReader(this);
@@ -657 +656 @@
     }
 
-#ifdef VBOX_WITH_USB_VIDEO
     if (mEmWebcam)
     {
@@ -663 +661 @@
         unconst(mEmWebcam) = NULL;
     }
-#endif
 
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -703 +700 @@
         mVRDEServerInfo->uninit();
         unconst(mVRDEServerInfo).setNull();
+    }
+
+    if (mEmulatedUSB)
+    {
+        mEmulatedUSB->uninit();
+        unconst(mEmulatedUSB).setNull();
     }
 
@@ -1992 +1995 @@
     /* mVRDEServerInfo is constant during life time, no need to lock */
     mVRDEServerInfo.queryInterfaceTo(aVRDEServerInfo);
+
+    return S_OK;
+}
+
+STDMETHODIMP Console::COMGETTER(EmulatedUSB)(IEmulatedUSB **aEmulatedUSB)
+{
+    CheckComArgOutPointerValid(aEmulatedUSB);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /* mEmulatedUSB is constant during life time, no need to lock */
+    mEmulatedUSB.queryInterfaceTo(aEmulatedUSB);
 
     return S_OK;

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

@@ -2379 +2379 @@
                 //      VBoxManage setextradata "myvm" "VBoxInternal/USB/USBProxy/GlobalConfig/Force11PacketSize" 1
                 //InsertConfigInteger(pCfg, "Force11PacketSize", true);
-            }
-#endif
-
-#ifdef VBOX_WITH_USB_VIDEO
-            BOOL aEmulatedUSBWebcamEnabled = FALSE;
-            hrc = pMachine->COMGETTER(EmulatedUSBWebcameraEnabled)(&aEmulatedUSBWebcamEnabled);    H();
-            if (aEmulatedUSBWebcamEnabled)
-            {
-                InsertConfigNode(pUsbDevices, "Webcam", &pDev);
-                InsertConfigNode(pDev,     "0", &pInst);
-                InsertConfigNode(pInst,    "Config", &pCfg);
-                InsertConfigNode(pInst,    "LUN#0", &pLunL0);
-                InsertConfigString(pLunL0, "Driver", "EmWebcam");
-                InsertConfigNode(pLunL0,   "Config", &pCfg);
-                InsertConfigInteger(pCfg,  "Object", (uintptr_t)mEmWebcam);
             }
 #endif

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

@@ -29 +29 @@
 # include "UsbCardReader.h"
 #endif
-#ifdef VBOX_WITH_USB_VIDEO
-# include "UsbWebcamInterface.h"
-#endif
+#include "UsbWebcamInterface.h"
 
 #include "Global.h"
@@ -2648 +2646 @@
                                                                        uint32_t cbData)
 {
-#ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
     EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
     pWebcam->EmWebcamCbNotify(u32Id, pvData, cbData);
-#else
-    NOREF(pvCallback);
-    NOREF(u32Id);
-    NOREF(pvData);
-    NOREF(cbData);
-#endif
 }
 
@@ -2667 +2658 @@
                                                                                  uint32_t cbDevice)
 {
-#ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
     EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
     pWebcam->EmWebcamCbDeviceDesc(rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice);
-#else
-    NOREF(pvCallback);
-    NOREF(rcRequest);
-    NOREF(pDeviceCtx);
-    NOREF(pvUser);
-    NOREF(pDeviceDesc);
-    NOREF(cbDevice);
-#endif
 }
 
@@ -2688 +2670 @@
                                                                               uint32_t cbControl)
 {
-#ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
     EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
     pWebcam->EmWebcamCbControl(rcRequest, pDeviceCtx, pvUser, pControl, cbControl);
-#else
-    NOREF(pvCallback);
-    NOREF(rcRequest);
-    NOREF(pDeviceCtx);
-    NOREF(pvUser);
-    NOREF(pControl);
-    NOREF(cbControl);
-#endif
 }
 
@@ -2708 +2681 @@
                                                                             uint32_t cbFrame)
 {
-#ifdef VBOX_WITH_USB_VIDEO
     ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback);
     EmWebcam *pWebcam = pThis->mConsole->getEmWebcam();
     pWebcam->EmWebcamCbFrame(rcRequest, pDeviceCtx, pFrame, cbFrame);
-#else
-    NOREF(pvCallback);
-    NOREF(rcRequest);
-    NOREF(pDeviceCtx);
-    NOREF(pFrame);
-    NOREF(cbFrame);
-#endif
 }
 
@@ -3903 +3868 @@
     }
 }
-
-#ifdef VBOX_WITH_USB_VIDEO
-int ConsoleVRDPServer::GetVideoFrameDimensions(uint16_t *pu16Heigh, uint16_t *pu16Width)
-{
-    *pu16Heigh = 640;
-    *pu16Width = 480;
-    return VINF_SUCCESS;
-}
-
-int ConsoleVRDPServer::SendVideoSreamOn(bool fFetch)
-{
-    /* Here we inform server that guest is starting/stopping
-     * the stream
-     */
-    return VINF_SUCCESS;
-}
-#endif
-
 
 

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

@@ -26 +26 @@
 #include "AudioSnifferInterface.h"
 #include "Nvram.h"
-#ifdef VBOX_WITH_USB_VIDEO
-# include "UsbWebcamInterface.h"
-#endif
+#include "UsbWebcamInterface.h"
 #ifdef VBOX_WITH_USB_CARDREADER
 # include "UsbCardReader.h"
@@ -78 +76 @@
         return rc;
 
-#ifdef VBOX_WITH_USB_VIDEO
     rc = pCallbacks->pfnRegister(pCallbacks, &EmWebcam::DrvReg);
     if (RT_FAILURE(rc))
         return rc;
-#endif
 
 #ifdef VBOX_WITH_USB_CARDREADER