Changeset 62824 in vbox

Timestamp:

Aug 1, 2016 3:14:37 PM (9 years ago)

Author:

vboxsync

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

109415

Message:

UsbWebcam cleanups, part 4.

Location:

trunk

Files:

• include/VBox/vmm/pdmwebcaminfs.h (modified) (3 diffs)
• src/VBox/Main/src-client/UsbWebcamInterface.cpp (modified) (6 diffs)

trunk/include/VBox/vmm/pdmwebcaminfs.h

@@ -41 +41 @@
 
 /** Pointer to the web camera driver up interface. */
-typedef struct PDMIWEBCAMDOWN *PPDMIWEBCAMDOWN;
+typedef struct PDMIWEBCAMDRV *PPDMIWEBCAMDRV;
 /**
  * Web camera driver up (facing in the direction of the device) interface.
  * @todo correct name.
  */
-typedef struct PDMIWEBCAMDOWN
+typedef struct PDMIWEBCAMDRV
 {
     /**
@@ -54 +54 @@
      * @param fReady      Whether the device is ready.
      */
-    DECLR3CALLBACKMEMBER(void, pfnReady,(PPDMIWEBCAMDOWN pInterface, bool fReady));
+    DECLR3CALLBACKMEMBER(void, pfnReady,(PPDMIWEBCAMDRV pInterface, bool fReady));
 
     /**
@@ -68 +68 @@
      * @param cbCtrl        The size of the control data.
      */
-    DECLR3CALLBACKMEMBER(int, pfnControl,(PPDMIWEBCAMDOWN pInterface, void *pvUser, uint64_t idDevice,
+    DECLR3CALLBACKMEMBER(int, pfnControl,(PPDMIWEBCAMDRV pInterface, void *pvUser, uint64_t idDevice,
                                           struct VRDEVIDEOINCTRLHDR const *pCtrl, uint32_t cbCtrl));
-} PDMIWEBCAMDOWN;
-/** Interface ID for PDMIWEBCAMDOWN. */
-#define PDMIWEBCAMDOWN_IID "0d29b9a1-f4cd-4719-a564-38d5634ba9f8"
+} PDMIWEBCAMDRV;
+/** Interface ID for PDMIWEBCAMDRV. */
+#define PDMIWEBCAMDRV_IID "0d29b9a1-f4cd-4719-a564-38d5634ba9f8"
 
 

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

@@ -46 +46 @@
     EMWEBCAMREMOTE *pRemote;
     PPDMIWEBCAMDEV  pIWebcamUp;
-    PDMIWEBCAMDOWN IWebcamDown;
+    PDMIWEBCAMDRV   IWebcamDrv;
 } EMWEBCAMDRV, *PEMWEBCAMDRV;
 
@@ -56 +56 @@
 
 
-static DECLCALLBACK(void) drvEmWebcamReady(PPDMIWEBCAMDOWN pInterface,
+static DECLCALLBACK(void) drvEmWebcamReady(PPDMIWEBCAMDRV pInterface,
                                            bool fReady)
 {
     NOREF(fReady);
 
-    PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDown);
+    PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDrv);
     EMWEBCAMREMOTE *pRemote = pThis->pRemote;
 
@@ -77 +77 @@
 }
 
-static DECLCALLBACK(int) drvEmWebcamControl(PPDMIWEBCAMDOWN pInterface,
+static DECLCALLBACK(int) drvEmWebcamControl(PPDMIWEBCAMDRV pInterface,
                                             void *pvUser,
                                             uint64_t u64DeviceId,
@@ -83 +83 @@
                                             uint32_t cbCtrl)
 {
-    PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDown);
+    PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDrv);
     EMWEBCAMREMOTE *pRemote = pThis->pRemote;
 
@@ -363 +363 @@
 
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIWEBCAMDOWN, &pThis->IWebcamDown);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIWEBCAMDRV, &pThis->IWebcamDrv);
     return NULL;
 }
@@ -414 +414 @@
     pDrvIns->IBase.pfnQueryInterface = drvQueryInterface;
 
-    pThis->IWebcamDown.pfnReady   = drvEmWebcamReady;
-    pThis->IWebcamDown.pfnControl = drvEmWebcamControl;
+    pThis->IWebcamDrv.pfnReady   = drvEmWebcamReady;
+    pThis->IWebcamDrv.pfnControl = drvEmWebcamControl;
 
     return VINF_SUCCESS;