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

Timestamp:

Feb 25, 2014 3:22:04 PM (11 years ago)

Author:

vboxsync

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

92447

Message:

6813 - src-client/EmulatedUSBImpl.cpp

Location:

trunk/src/VBox/Main/src-client

Files:

• EmulatedUSBImpl.cpp (modified) (4 diffs)
• UsbWebcamInterface.cpp (modified) (1 diff)

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

@@ -157 +157 @@
     CFGMR3InsertNode(pConfig,       "EmulatedUSB", &pEUSB);
     CFGMR3InsertString(pEUSB,         "Id", pThis->mszUuid);
-    CFGMR3InsertInteger(pEUSB,        "pfnCallback", (uintptr_t)EmulatedUSB::eusbCallback);
+    CFGMR3InsertInteger(pEUSB,        "pfnCallback", (uintptr_t)EmulatedUSB::i_eusbCallback);
     CFGMR3InsertInteger(pEUSB,        "pvCallback", (uintptr_t)pThis->mpEmulatedUSB);
 
@@ -442 +442 @@
                                   const com::Utf8Str &aSettings)
 {
-    return webcamAttachInternal(aPath, aSettings, "HostWebcam", NULL);
-}
-
-HRESULT EmulatedUSB::webcamAttachInternal(const com::Utf8Str &aPath,
-                                          const com::Utf8Str &aSettings,
-                                          const char *pszDriver,
-                                          void *pvObject)
+    return i_webcamAttachInternal(aPath, aSettings, "HostWebcam", NULL);
+}
+
+HRESULT EmulatedUSB::i_webcamAttachInternal(const com::Utf8Str &aPath,
+                                            const com::Utf8Str &aSettings,
+                                            const char *pszDriver,
+                                            void *pvObject)
 {
     HRESULT hrc = S_OK;
@@ -524 +524 @@
 HRESULT EmulatedUSB::webcamDetach(const com::Utf8Str &aPath)
 {
-    return webcamDetachInternal(aPath);
-}
-
-HRESULT EmulatedUSB::webcamDetachInternal(const com::Utf8Str &aPath)
+    return i_webcamDetachInternal(aPath);
+}
+
+HRESULT EmulatedUSB::i_webcamDetachInternal(const com::Utf8Str &aPath)
 {
     HRESULT hrc = S_OK;
@@ -605 +605 @@
 }
 
-/* static */ DECLCALLBACK(int) EmulatedUSB::eusbCallback(void *pv, const char *pszId, uint32_t iEvent,
-                                                         const void *pvData, uint32_t cbData)
+/* static */ DECLCALLBACK(int) EmulatedUSB::i_eusbCallback(void *pv, const char *pszId, uint32_t iEvent,
+                                                           const void *pvData, uint32_t cbData)
 {
     /* Make a copy of parameters, forward to EMT and leave the callback to not hold any lock in the device. */

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

@@ -259 +259 @@
         /* Try to attach the device. */
         EmulatedUSB *pEUSB = mParent->getConsole()->getEmulatedUSB();
-        pEUSB->webcamAttachInternal("", "", "EmWebcam", pRemote);
+        pEUSB->i_webcamAttachInternal("", "", "EmWebcam", pRemote);
     }
     else