Changeset 50580 in vbox for trunk/src/VBox/Main/src-client
- Timestamp:
- Feb 25, 2014 3:22:04 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 92447
- Location:
- trunk/src/VBox/Main/src-client
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp
r49234 r50580 157 157 CFGMR3InsertNode(pConfig, "EmulatedUSB", &pEUSB); 158 158 CFGMR3InsertString(pEUSB, "Id", pThis->mszUuid); 159 CFGMR3InsertInteger(pEUSB, "pfnCallback", (uintptr_t)EmulatedUSB:: eusbCallback);159 CFGMR3InsertInteger(pEUSB, "pfnCallback", (uintptr_t)EmulatedUSB::i_eusbCallback); 160 160 CFGMR3InsertInteger(pEUSB, "pvCallback", (uintptr_t)pThis->mpEmulatedUSB); 161 161 … … 442 442 const com::Utf8Str &aSettings) 443 443 { 444 return webcamAttachInternal(aPath, aSettings, "HostWebcam", NULL);445 } 446 447 HRESULT EmulatedUSB:: webcamAttachInternal(const com::Utf8Str &aPath,448 const com::Utf8Str &aSettings,449 const char *pszDriver,450 void *pvObject)444 return i_webcamAttachInternal(aPath, aSettings, "HostWebcam", NULL); 445 } 446 447 HRESULT EmulatedUSB::i_webcamAttachInternal(const com::Utf8Str &aPath, 448 const com::Utf8Str &aSettings, 449 const char *pszDriver, 450 void *pvObject) 451 451 { 452 452 HRESULT hrc = S_OK; … … 524 524 HRESULT EmulatedUSB::webcamDetach(const com::Utf8Str &aPath) 525 525 { 526 return webcamDetachInternal(aPath);527 } 528 529 HRESULT EmulatedUSB:: webcamDetachInternal(const com::Utf8Str &aPath)526 return i_webcamDetachInternal(aPath); 527 } 528 529 HRESULT EmulatedUSB::i_webcamDetachInternal(const com::Utf8Str &aPath) 530 530 { 531 531 HRESULT hrc = S_OK; … … 605 605 } 606 606 607 /* static */ DECLCALLBACK(int) EmulatedUSB:: eusbCallback(void *pv, const char *pszId, uint32_t iEvent,608 const void *pvData, uint32_t cbData)607 /* static */ DECLCALLBACK(int) EmulatedUSB::i_eusbCallback(void *pv, const char *pszId, uint32_t iEvent, 608 const void *pvData, uint32_t cbData) 609 609 { 610 610 /* 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
r49120 r50580 259 259 /* Try to attach the device. */ 260 260 EmulatedUSB *pEUSB = mParent->getConsole()->getEmulatedUSB(); 261 pEUSB-> webcamAttachInternal("", "", "EmWebcam", pRemote);261 pEUSB->i_webcamAttachInternal("", "", "EmWebcam", pRemote); 262 262 } 263 263 else
Note:
See TracChangeset
for help on using the changeset viewer.