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

Timestamp:

Oct 15, 2013 3:12:06 PM (11 years ago)

Author:

vboxsync

Message:

Main: emulated webcam updates.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (4 diffs)
• ConsoleVRDPServer.h (modified) (3 diffs)
• EmulatedUSBImpl.h (modified) (1 diff)
• UsbWebcamInterface.h (modified) (3 diffs)

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

@@ -36 +36 @@
 class AudioSniffer;
 class Nvram;
-class EmWebcam;
 #ifdef VBOX_WITH_USB_CARDREADER
 class UsbCardReader;
@@ -243 +242 @@
     UsbCardReader *getUsbCardReader() { return mUsbCardReader; }
 #endif
-    EmWebcam *getEmWebcam() { return mEmWebcam; }
 
     int VRDPClientLogon(uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain);
@@ -306 +304 @@
     VMMDevMouseInterface *getVMMDevMouseInterface();
     DisplayMouseInterface *getDisplayMouseInterface();
+
+    EmulatedUSB *getEmulatedUSB(void) { return mEmulatedUSB; }
 
 private:
@@ -825 +825 @@
     AudioSniffer * const mAudioSniffer;
     Nvram   * const mNvram;
-    EmWebcam * const mEmWebcam;
 #ifdef VBOX_WITH_USB_CARDREADER
     UsbCardReader * const mUsbCardReader;

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

@@ -40 +40 @@
 ///////////////////////////////////////////////////////////////////////////////
 
+class EmWebcam;
+
 typedef struct _VRDPInputSynch
 {
@@ -152 +154 @@
     int VideoInControl(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle,
                        const VRDEVIDEOINCTRLHDR *pReq, uint32_t cbReq);
+
+    Console *getConsole(void) { return mConsole; }
 
 private:
@@ -339 +343 @@
                                                        const VRDEVIDEOINPAYLOADHDR *pFrame,
                                                        uint32_t cbFrame);
+    EmWebcam *mEmWebcam;
 
     /* Input interface. */

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

@@ -46 +46 @@
                                           const void *pvData, uint32_t cbData);
 
+    HRESULT webcamAttachInternal(const com::Utf8Str &aPath,
+                                 const com::Utf8Str &aSettings,
+                                 const char *pszDriver,
+                                 void *pvObject);
+    HRESULT webcamDetachInternal(const com::Utf8Str &aPath);
+
 private:
 

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

@@ -23 +23 @@
 #include <VBox/RemoteDesktop/VRDEVideoIn.h>
 
-class Console;
+class ConsoleVRDPServer;
 typedef struct EMWEBCAMDRV EMWEBCAMDRV;
 typedef struct EMWEBCAMREMOTE EMWEBCAMREMOTE;
@@ -30 +30 @@
 {
     public:
-        EmWebcam(Console *console);
+        EmWebcam(ConsoleVRDPServer *pServer);
         virtual ~EmWebcam();
 
@@ -56 +56 @@
         static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
 
-        Console * const mParent;
+        ConsoleVRDPServer * const mParent;
 
         EMWEBCAMDRV *mpDrv;