Changeset 46667 in vbox for trunk/src/VBox/Frontends

Timestamp:

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

Author:

vboxsync

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

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -2315 +2315 @@
         CHECK_ERROR_RET(machine, COMGETTER(VideoCaptureRate)(&Rate), rc);
         ULONG Fps;
-        CHECK_ERROR_RET(machine, COMGETTER(VideoCaptureFps)(&Fps), rc);
+        CHECK_ERROR_RET(machine, COMGETTER(VideoCaptureFPS)(&Fps), rc);
         Bstr File;
         CHECK_ERROR_RET(machine, COMGETTER(VideoCaptureFile)(File.asOutParam()), rc);
         if (details == VMINFO_MACHINEREADABLE)
         {
-            RTPrintf("VideoCaptureEnabled=\"%s\"\n", bActive ? "on" : "off");
-            RTPrintf("VideoCaptureScreens=");
+            RTPrintf("vcpenabled=\"%s\"\n", bActive ? "on" : "off");
+            RTPrintf("vcpscreens=");
             bool fComma = false;
             for (unsigned i = 0; i < screens.size(); i++)
@@ -2330 +2330 @@
                 }
             RTPrintf("\n");
-            RTPrintf("VideoCaptureWidth=%u\n", (unsigned)Width);
-            RTPrintf("VideoCaptureFile=\"%ls\"\n", File.raw());
-            RTPrintf("VideoCaptureHeight=%u\n", (unsigned)Height);
-            RTPrintf("VideoCaptureRate=%u\n", (unsigned)Rate);
-            RTPrintf("VideoCaptureFps=%u\n", (unsigned)Fps);
+            RTPrintf("vcpfile=\"%ls\"\n", File.raw());
+            RTPrintf("vcpwidth=%u\n", (unsigned)Width);
+            RTPrintf("vcpheight=%u\n", (unsigned)Height);
+            RTPrintf("vcprate=%u\n", (unsigned)Rate);
+            RTPrintf("vcpfps=%u\n", (unsigned)Fps);
         }
         else

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -2517 +2517 @@
             case MODIFYVM_VCP_FPS:
             {
-                CHECK_ERROR(machine, COMSETTER(VideoCaptureFps)(ValueUnion.u32));
+                CHECK_ERROR(machine, COMSETTER(VideoCaptureFPS)(ValueUnion.u32));
                 break;
             }

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -119 +119 @@
     displayData.m_iVideoCaptureFrameWidth = m_machine.GetVideoCaptureWidth();
     displayData.m_iVideoCaptureFrameHeight = m_machine.GetVideoCaptureHeight();
-    displayData.m_iVideoCaptureFrameRate = m_machine.GetVideoCaptureFps();
+    displayData.m_iVideoCaptureFrameRate = m_machine.GetVideoCaptureFPS();
     displayData.m_iVideoCaptureBitRate = m_machine.GetVideoCaptureRate();
     displayData.m_screens = m_machine.GetVideoCaptureScreens();
@@ -275 +275 @@
                 m_machine.SetVideoCaptureWidth(displayData.m_iVideoCaptureFrameWidth);
                 m_machine.SetVideoCaptureHeight(displayData.m_iVideoCaptureFrameHeight);
-                m_machine.SetVideoCaptureFps(displayData.m_iVideoCaptureFrameRate);
+                m_machine.SetVideoCaptureFPS(displayData.m_iVideoCaptureFrameRate);
                 m_machine.SetVideoCaptureRate(displayData.m_iVideoCaptureBitRate);
                 m_machine.SetVideoCaptureScreens(displayData.m_screens);
@@ -290 +290 @@
             m_machine.SetVideoCaptureWidth(displayData.m_iVideoCaptureFrameWidth);
             m_machine.SetVideoCaptureHeight(displayData.m_iVideoCaptureFrameHeight);
-            m_machine.SetVideoCaptureFps(displayData.m_iVideoCaptureFrameRate);
+            m_machine.SetVideoCaptureFPS(displayData.m_iVideoCaptureFrameRate);
             m_machine.SetVideoCaptureRate(displayData.m_iVideoCaptureBitRate);
             m_machine.SetVideoCaptureScreens(displayData.m_screens);