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

Timestamp:

Jun 19, 2013 3:30:23 PM (12 years ago)

Author:

vboxsync

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

86558

Message:

Main/idl: clarify IMachine.videoCaptureFile to be an absolute path, and many naming convention cleanups for method/attribute names starting with an uppercase letter or containing an acronym
Main/xml/Settings.cpp: clean up default video capture file handling and related path conversions, version handling of the new functionality
Main/Machine: handle default value for video capture file better, store relative path in settings if possible, cleanups
Main/src-client/VideoRec.cpp: do not overwrite a file ever
Main/Display: generate a unique name if there is a collision, matching cleanups for name changes
Frontends/VirtualBox: matching name changes
Frontends/VBoxManage: matching name changes, fixing the machine readable output

File:

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

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

@@ -1754 +1754 @@
           ulVideoCaptureVertRes(768),
           ulVideoCaptureRate(512),
-          ulVideoCaptureFps(25),
+          ulVideoCaptureFPS(25),
           fVideoCaptureEnabled(false),
           u64VideoCaptureScreens(UINT64_C(0xffffffffffffffff)),
-          strVideoCaptureFile("Test.webm"),
+          strVideoCaptureFile(""),
           firmwareType(FirmwareType_BIOS),
           pointingHIDType(PointingHIDType_PS2Mouse),
@@ -1832 +1832 @@
                   && (ulVideoCaptureVertRes     == h.ulVideoCaptureVertRes)
                   && (ulVideoCaptureRate        == h.ulVideoCaptureRate)
-                  && (ulVideoCaptureFps         == h.ulVideoCaptureFps)
+                  && (ulVideoCaptureFPS         == h.ulVideoCaptureFPS)
                   && (firmwareType              == h.firmwareType)
                   && (pointingHIDType           == h.pointingHIDType)
@@ -2731 +2731 @@
             pelmHwChild->getAttributeValue("enabled",   hw.fVideoCaptureEnabled);
             pelmHwChild->getAttributeValue("screens",   hw.u64VideoCaptureScreens);
-            pelmHwChild->getAttributeValue("file",      hw.strVideoCaptureFile);
+            pelmHwChild->getAttributeValuePath("file",  hw.strVideoCaptureFile);
             pelmHwChild->getAttributeValue("horzRes",   hw.ulVideoCaptureHorzRes);
             pelmHwChild->getAttributeValue("vertRes",   hw.ulVideoCaptureVertRes);
             pelmHwChild->getAttributeValue("rate",      hw.ulVideoCaptureRate);
-            pelmHwChild->getAttributeValue("fps",       hw.ulVideoCaptureFps);
+            pelmHwChild->getAttributeValue("fps",       hw.ulVideoCaptureFPS);
         }
         else if (pelmHwChild->nameEquals("RemoteDisplay"))
@@ -3916 +3916 @@
     xml::ElementNode *pelmVideoCapture = pelmHardware->createChild("VideoCapture");
 
-    if (m->sv >= SettingsVersion_v1_12)
+    if (m->sv >= SettingsVersion_v1_14)
     {
         pelmVideoCapture->setAttribute("enabled",   hw.fVideoCaptureEnabled);
         pelmVideoCapture->setAttribute("screens",   hw.u64VideoCaptureScreens);
-        pelmVideoCapture->setAttribute("file",      hw.strVideoCaptureFile);
+        if (!hw.strVideoCaptureFile.isEmpty())
+            pelmVideoCapture->setAttributePath("file",  hw.strVideoCaptureFile);
         pelmVideoCapture->setAttribute("horzRes",   hw.ulVideoCaptureHorzRes);
         pelmVideoCapture->setAttribute("vertRes",   hw.ulVideoCaptureVertRes);
         pelmVideoCapture->setAttribute("rate",      hw.ulVideoCaptureRate);
-        pelmVideoCapture->setAttribute("fps",       hw.ulVideoCaptureFps);
+        pelmVideoCapture->setAttribute("fps",       hw.ulVideoCaptureFPS);
     }
 
@@ -5052 +5053 @@
     {
         // VirtualBox 4.3 adds default frontend setting, graphics controller
-        // setting, explicit long mode setting.
+        // setting, explicit long mode setting and video capturing.
         if (   !hardwareMachine.strDefaultFrontend.isEmpty()
             || hardwareMachine.graphicsControllerType != GraphicsControllerType_VBoxVGA
             || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy
-            || machineUserData.ovIcon.length() > 0)
+            || machineUserData.ovIcon.length() > 0
+            || hardwareMachine.fVideoCaptureEnabled)
             m->sv = SettingsVersion_v1_14;
     }
@@ -5097 +5099 @@
     if (m->sv < SettingsVersion_v1_12)
     {
-        // 4.1: Emulated USB devices.
-        if (hardwareMachine.fEmulatedUSBCardReader)
-            m->sv = SettingsVersion_v1_12;
-    }
-
-    if (m->sv < SettingsVersion_v1_12)
-    {
-        // VirtualBox 4.1 adds PCI passthrough.
+        // VirtualBox 4.1 adds PCI passthrough and emulated USB Smart Card reader
         if (   hardwareMachine.pciAttachments.size()
-            || hardwareMachine.fVideoCaptureEnabled)
+            || hardwareMachine.fEmulatedUSBCardReader)
             m->sv = SettingsVersion_v1_12;
     }