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

Timestamp:

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

Author:

vboxsync

Message:

UsbWebcam cleanups, part 4.

File:

• trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp (modified) (6 diffs)

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;