Changeset 54400 in vbox

Timestamp:

Feb 23, 2015 7:39:05 PM (10 years ago)

Author:

vboxsync

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

98500

Message:

FE/VBoxManage: Unified/renamed video recording options, implemented missing functionality.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (6 diffs)
• VBoxManageHelp.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1357 +1357 @@
             if (RT_FAILURE(vrc))
             {
-                RTMsgError("Failed to create file '%s'. rc=%Rrc", a->argv[2], vrc);
+                RTMsgError("Failed to create file '%s' (%Rrc)", a->argv[2], vrc);
                 rc = E_FAIL;
                 break;
@@ -1364 +1364 @@
             if (RT_FAILURE(vrc))
             {
-                RTMsgError("Failed to write screenshot to file '%s'. rc=%Rrc", a->argv[2], vrc);
+                RTMsgError("Failed to write screenshot to file '%s' (%Rrc)", a->argv[2], vrc);
                 rc = E_FAIL;
             }
             RTFileClose(pngFile);
         }
-        else if (   !strcmp(a->argv[1], "vcpenabled"))
+#ifdef VBOX_WITH_VPX
+        else if (!strcmp(a->argv[1], "videocap"))
         {
             if (a->argc != 3)
             {
-                errorArgument("Missing argument to '%s'", a->argv[1]);
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
                 rc = E_FAIL;
                 break;
@@ -1392 +1393 @@
             }
         }
-        else if (   !strcmp(a->argv[1], "videocapturescreens"))
+        else if (   !strcmp(a->argv[1], "videocapscreens"))
         {
             ULONG cMonitors = 64;
@@ -1410 +1411 @@
                 for (unsigned i = 0; i < cMonitors; i++)
                     saScreens[i] = false;
+
+                /** @todo r=andy What if this is specified? */
             }
             else
@@ -1438 +1441 @@
             CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureScreens)(ComSafeArrayAsInParam(saScreens)));
         }
+        else if (!strcmp(a->argv[1], "videocapfile"))
+        {
+            if (a->argc != 3)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            }
+
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureFile)(Bstr(a->argv[3]).raw()));
+        }
+        else if (!strcmp(a->argv[1], "videocapres"))
+        {
+            if (a->argc != 4)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            }
+
+            uint32_t uVal;
+            int vrc = RTStrToUInt32Ex(a->argv[2], NULL, 0, &uVal);
+            if (RT_FAILURE(vrc))
+            {
+                errorArgument("Error parsing width '%s'", a->argv[2]);
+                rc = E_FAIL;
+                break;
+            }
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureWidth)(uVal));
+
+            vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uVal);
+            if (RT_FAILURE(vrc))
+            {
+                errorArgument("Error parsing height '%s'", a->argv[3]);
+                rc = E_FAIL;
+                break;
+            }
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureHeight)(uVal));
+        }
+        else if (!strcmp(a->argv[1], "videocaprate"))
+        {
+            if (a->argc != 3)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            }
+
+            uint32_t uVal;
+            int vrc = RTStrToUInt32Ex(a->argv[2], NULL, 0, &uVal);
+            if (RT_FAILURE(vrc))
+            {
+                errorArgument("Error parsing rate '%s'", a->argv[2]);
+                rc = E_FAIL;
+                break;
+            }
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureRate)(uVal));
+        }
+        else if (!strcmp(a->argv[1], "videocapfps"))
+        {
+            if (a->argc != 3)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            }   
+
+            uint32_t uVal;
+            int vrc = RTStrToUInt32Ex(a->argv[2], NULL, 0, &uVal);
+            if (RT_FAILURE(vrc))
+            {
+                errorArgument("Error parsing FPS '%s'", a->argv[2]);
+                rc = E_FAIL;
+                break;
+            }
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureFPS)(uVal));
+        }
+        else if (!strcmp(a->argv[1], "videocapmaxtime"))
+        {
+            if (a->argc != 3)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            } 
+
+            uint32_t uVal;
+            int vrc = RTStrToUInt32Ex(a->argv[2], NULL, 0, &uVal);
+            if (RT_FAILURE(vrc))
+            {
+                errorArgument("Error parsing maximum time '%s'", a->argv[2]);
+                rc = E_FAIL;
+                break;
+            }
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureMaxTime)(uVal));
+        }
+        else if (!strcmp(a->argv[1], "videocapmaxsize"))
+        {
+            if (a->argc != 3)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            }   
+
+            uint32_t uVal;
+            int vrc = RTStrToUInt32Ex(a->argv[2], NULL, 0, &uVal);
+            if (RT_FAILURE(vrc))
+            {
+                errorArgument("Error parsing maximum file size '%s'", a->argv[2]);
+                rc = E_FAIL;
+                break;
+            }
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureMaxFileSize)(uVal));
+        }
+        else if (!strcmp(a->argv[1], "videocapopts"))
+        {
+            if (a->argc != 3)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
+                rc = E_FAIL;
+                break;
+            }   
+
+            CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureOptions)(Bstr(a->argv[3]).raw()));
+        }
+#endif /* VBOX_WITH_VPX */
         else if (!strcmp(a->argv[1], "webcam"))
         {

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2014 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -377 +377 @@
 #endif
 #ifdef VBOX_WITH_VPX
-                     "                            [--vcpenabled on|off]\n"
-                     "                            [--vcpscreens [<display>],...\n"
-                     "                            [--vcpfile <filename>]\n"
-                     "                            [--vcpwidth <width>]\n"
-                     "                            [--vcpheight <height>]\n"
-                     "                            [--vcprate <rate>]\n"
-                     "                            [--vcpfps <fps>]\n"
-                     "                            [--vcpmaxtime <time>]\n"
-                     "                            [--vcpmaxsize <size>]\n"
-                     "                            [--vcpoptions <options>]\n"
+                     "                            [--videocap on|off]\n"
+                     "                            [--videocapscreens all|<screen ID> [<screen ID> ...]]\n"
+                     "                            [--videocapfile <filename>]\n"
+                     "                            [--videocapres <width> <height>]\n"
+                     "                            [--videocaprate <rate>]\n"
+                     "                            [--videocapfps <fps>]\n"
+                     "                            [--videocapmaxtime <time>]\n"
+                     "                            [--videocapmaxsize <MB>]\n"
+                     "                            [--videocapopts <key=value> [<key=value> ...]]\n"
 #endif
                      "                            [--defaultfrontend default|<name>]\n"