Changeset 48406 in vbox for trunk/src/VBox/Main/include

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (5 diffs)
• ConsoleVRDPServer.h (modified) (1 diff)
• EmulatedUSBImpl.h (added)
• MachineImpl.h (modified) (2 diffs)

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

@@ -33 +33 @@
 class SharedFolder;
 class VRDEServerInfo;
+class EmulatedUSB;
 class AudioSniffer;
 class Nvram;
-#ifdef VBOX_WITH_USB_VIDEO
 class EmWebcam;
-#endif
 #ifdef VBOX_WITH_USB_CARDREADER
 class UsbCardReader;
@@ -147 +146 @@
     STDMETHOD(COMGETTER(UseHostClipboard))(BOOL *aUseHostClipboard);
     STDMETHOD(COMSETTER(UseHostClipboard))(BOOL aUseHostClipboard);
+    STDMETHOD(COMGETTER(EmulatedUSB))(IEmulatedUSB **aEmulatedUSB);
 
     // IConsole methods
@@ -242 +242 @@
     UsbCardReader *getUsbCardReader() { return mUsbCardReader; }
 #endif
-#ifdef VBOX_WITH_USB_VIDEO
     EmWebcam *getEmWebcam() { return mEmWebcam; }
-#endif
 
     int VRDPClientLogon(uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain);
@@ -762 +760 @@
     const ComObjPtr<ExtPackManager> mptrExtPackManager;
 #endif
+    const ComObjPtr<EmulatedUSB> mEmulatedUSB;
 
     USBDeviceList mUSBDevices;
@@ -808 +807 @@
     AudioSniffer * const mAudioSniffer;
     Nvram   * const mNvram;
-#ifdef VBOX_WITH_USB_VIDEO
     EmWebcam * const mEmWebcam;
-#endif
 #ifdef VBOX_WITH_USB_CARDREADER
     UsbCardReader * const mUsbCardReader;

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

@@ -144 +144 @@
 
     void SendAudioInputEnd(void *pvUserCtx);
-#ifdef VBOX_WITH_USB_VIDEO
-    int GetVideoFrameDimensions(uint16_t *pu16Heigh, uint16_t *pu16Width);
-    int SendVideoSreamOn(bool fFetch);
-#endif
 
     int SCardRequest(void *pvUser, uint32_t u32Function, const void *pvData, uint32_t cbData);

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

@@ -306 +306 @@
         PointingHIDType_T   mPointingHIDType;
         ChipsetType_T       mChipsetType;
-        BOOL                mEmulatedUSBWebcamEnabled;
         BOOL                mEmulatedUSBCardReaderEnabled;
 
@@ -419 +418 @@
     STDMETHOD(COMGETTER(EmulatedUSBCardReaderEnabled))(BOOL *aEnabled);
     STDMETHOD(COMSETTER(EmulatedUSBCardReaderEnabled))(BOOL aEnabled);
-    STDMETHOD(COMGETTER(EmulatedUSBWebcameraEnabled))(BOOL *aEnabled);
-    STDMETHOD(COMSETTER(EmulatedUSBWebcameraEnabled))(BOOL aEnabled);
     STDMETHOD(COMGETTER(HPETEnabled))(BOOL *enabled);
     STDMETHOD(COMSETTER(HPETEnabled))(BOOL enabled);