Changeset 44191 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Dec 20, 2012 5:36:56 PM (12 years ago)

Author:

vboxsync

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

82916

Message:

include,ExtPacks\Puel\UsbWebcam,Main,VRDP,VBoxManage: emulated USB webcam.

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1617 +1617 @@
           keyboardHIDType(KeyboardHIDType_PS2Keyboard),
           chipsetType(ChipsetType_PIIX3),
+          fEmulatedUSBWebcam(false),
           fEmulatedUSBCardReader(false),
           clipboardMode(ClipboardMode_Disabled),
@@ -1685 +1686 @@
                   && (keyboardHIDType           == h.keyboardHIDType)
                   && (chipsetType               == h.chipsetType)
+                  && (fEmulatedUSBWebcam        == h.fEmulatedUSBWebcam)
                   && (fEmulatedUSBCardReader    == h.fEmulatedUSBCardReader)
                   && (vrdeSettings              == h.vrdeSettings)
@@ -2873 +2875 @@
         else if (pelmHwChild->nameEquals("EmulatedUSB"))
         {
-            const xml::ElementNode *pelmCardReader;
+            const xml::ElementNode *pelmCardReader, *pelmWebcam;
 
             if ((pelmCardReader = pelmHwChild->findChildElement("CardReader")))
             {
                 pelmCardReader->getAttributeValue("enabled", hw.fEmulatedUSBCardReader);
+            }
+
+            if ((pelmWebcam = pelmHwChild->findChildElement("Webcam")))
+            {
+                pelmWebcam->getAttributeValue("enabled", hw.fEmulatedUSBWebcam);
             }
         }
@@ -4188 +4195 @@
     {
         xml::ElementNode *pelmEmulatedUSB = pelmHardware->createChild("EmulatedUSB");
+
         xml::ElementNode *pelmCardReader = pelmEmulatedUSB->createChild("CardReader");
-
         pelmCardReader->setAttribute("enabled", hw.fEmulatedUSBCardReader);
+
+        if (m->sv >= SettingsVersion_v1_13)
+        {
+            xml::ElementNode *pelmWebcam = pelmEmulatedUSB->createChild("Webcam");
+            pelmWebcam->setAttribute("enabled", hw.fEmulatedUSBWebcam);
+        }
     }
 
@@ -4880 +4893 @@
     }
 
+    if (m->sv < SettingsVersion_v1_13)
+    {
+        /* 4.2: Emulated USB Webcam. */
+        if (hardwareMachine.fEmulatedUSBWebcam)
+            m->sv = SettingsVersion_v1_13;
+    }
+
     if (m->sv < SettingsVersion_v1_12)
     {