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

Timestamp:

Nov 9, 2018 1:55:30 PM (6 years ago)

Author:

vboxsync

Message:

Recording: Also adapted the VBoxManage commands to the "recording" prefix.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageModifyVM.cpp (modified) (13 diffs)

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

@@ -1855 +1855 @@
         }
 #ifdef VBOX_WITH_RECORDING
-        else if (!strcmp(a->argv[1], "record"))
+        else if (!strcmp(a->argv[1], "recording"))
         {
             if (a->argc < 3)

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

@@ -713 +713 @@
 #endif
 #ifdef VBOX_WITH_RECORDING
-                     "                            [--record on|off]\n"
-                     "                            [--record screens all|<screen ID> [<screen ID> ...]]\n"
-                     "                            [--record filename <filename>]\n"
-                     "                            [--record videores <width> <height>]\n"
-                     "                            [--record videorate <rate>]\n"
-                     "                            [--record videofps <fps>]\n"
-                     "                            [--record maxtime <ms>]\n"
-                     "                            [--record maxfilesize <MB>]\n"
-                     "                            [--record opts <key=value> [,<key=value> ...]]\n"
+                     "                            [--recording on|off]\n"
+                     "                            [--recording screens all|<screen ID> [<screen ID> ...]]\n"
+                     "                            [--recording filename <filename>]\n"
+                     "                            [--recording videores <width> <height>]\n"
+                     "                            [--recording videorate <rate>]\n"
+                     "                            [--recording videofps <fps>]\n"
+                     "                            [--recording maxtime <s>]\n"
+                     "                            [--recording maxfilesize <MB>]\n"
+                     "                            [--recording opts <key=value> [,<key=value> ...]]\n"
 #endif
                      "                            [--defaultfrontend default|<name>]\n"
@@ -832 +832 @@
                      "                            screenshotpng <file> [display] |\n"
 #ifdef VBOX_WITH_RECORDING
-                     "                            record on|off |\n"
-                     "                            record screens all|none|<screen>,[<screen>...] |\n"
-                     "                            record filename <file> |\n"
-                     "                            record videores <width>x<height> |\n"
-                     "                            record videorate <rate> |\n"
-                     "                            record videofps <fps> |\n"
-                     "                            record maxtime <s> |\n"
-                     "                            record maxfilesize <MB> |\n"
+                     "                            recording on|off |\n"
+                     "                            recording screens all|none|<screen>,[<screen>...] |\n"
+                     "                            recording filename <file> |\n"
+                     "                            recording videores <width>x<height> |\n"
+                     "                            recording videorate <rate> |\n"
+                     "                            recording videofps <fps> |\n"
+                     "                            recording maxtime <s> |\n"
+                     "                            recording maxfilesize <MB> |\n"
 #endif /* VBOX_WITH_RECORDING */
                      "                            setcredentials <username>\n"

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

@@ -215 +215 @@
 #endif
 #ifdef VBOX_WITH_RECORDING
-    MODIFYVM_RECORD,
-    MODIFYVM_RECORD_FEATURES,
-    MODIFYVM_RECORD_SCREENS,
-    MODIFYVM_RECORD_FILENAME,
-    MODIFYVM_RECORD_VIDEO_WIDTH,
-    MODIFYVM_RECORD_VIDEO_HEIGHT,
-    MODIFYVM_RECORD_VIDEO_RES,
-    MODIFYVM_RECORD_VIDEO_RATE,
-    MODIFYVM_RECORD_VIDEO_FPS,
-    MODIFYVM_RECORD_MAXTIME,
-    MODIFYVM_RECORD_MAXSIZE,
-    MODIFYVM_RECORD_OPTIONS,
+    MODIFYVM_RECORDING,
+    MODIFYVM_RECORDING_FEATURES,
+    MODIFYVM_RECORDING_SCREENS,
+    MODIFYVM_RECORDING_FILENAME,
+    MODIFYVM_RECORDING_VIDEO_WIDTH,
+    MODIFYVM_RECORDING_VIDEO_HEIGHT,
+    MODIFYVM_RECORDING_VIDEO_RES,
+    MODIFYVM_RECORDING_VIDEO_RATE,
+    MODIFYVM_RECORDING_VIDEO_FPS,
+    MODIFYVM_RECORDING_MAXTIME,
+    MODIFYVM_RECORDING_MAXSIZE,
+    MODIFYVM_RECORDING_OPTIONS,
 #endif
     MODIFYVM_CHIPSET,
@@ -395 +395 @@
     { "--chipset",                  MODIFYVM_CHIPSET,                   RTGETOPT_REQ_STRING },
 #ifdef VBOX_WITH_RECORDING
-    { "--record",                   MODIFYVM_RECORD,                    RTGETOPT_REQ_BOOL_ONOFF },
-    { "--recordscreens",            MODIFYVM_RECORD_SCREENS,            RTGETOPT_REQ_STRING },
-    { "--recordfile",               MODIFYVM_RECORD_FILENAME,           RTGETOPT_REQ_STRING },
-    { "--recordmaxtime",            MODIFYVM_RECORD_MAXTIME,            RTGETOPT_REQ_INT32  },
-    { "--recordmaxsize",            MODIFYVM_RECORD_MAXSIZE,            RTGETOPT_REQ_INT32  },
-    { "--recordopts",               MODIFYVM_RECORD_OPTIONS,            RTGETOPT_REQ_STRING },
-    { "--recordoptions",            MODIFYVM_RECORD_OPTIONS,            RTGETOPT_REQ_STRING },
-    { "--recordvideores",           MODIFYVM_RECORD_VIDEO_RES,          RTGETOPT_REQ_STRING },
-    { "--recordvideorate",          MODIFYVM_RECORD_VIDEO_RATE,         RTGETOPT_REQ_UINT32 },
-    { "--recordvideofps",           MODIFYVM_RECORD_VIDEO_FPS,          RTGETOPT_REQ_UINT32 },
+    { "--recording",                MODIFYVM_RECORDING,                 RTGETOPT_REQ_BOOL_ONOFF },
+    { "--recordingscreens",         MODIFYVM_RECORDING_SCREENS,         RTGETOPT_REQ_STRING },
+    { "--recordingfile",            MODIFYVM_RECORDING_FILENAME,        RTGETOPT_REQ_STRING },
+    { "--recordingmaxtime",         MODIFYVM_RECORDING_MAXTIME,         RTGETOPT_REQ_INT32  },
+    { "--recordingmaxsize",         MODIFYVM_RECORDING_MAXSIZE,         RTGETOPT_REQ_INT32  },
+    { "--recordingopts",            MODIFYVM_RECORDING_OPTIONS,         RTGETOPT_REQ_STRING },
+    { "--recordingoptions",         MODIFYVM_RECORDING_OPTIONS,         RTGETOPT_REQ_STRING },
+    { "--recordingvideores",        MODIFYVM_RECORDING_VIDEO_RES,       RTGETOPT_REQ_STRING },
+    { "--recordingvideoresolution", MODIFYVM_RECORDING_VIDEO_RES,       RTGETOPT_REQ_STRING },
+    { "--recordingvideorate",       MODIFYVM_RECORDING_VIDEO_RATE,      RTGETOPT_REQ_UINT32 },
+    { "--recordingvideofps",        MODIFYVM_RECORDING_VIDEO_FPS,       RTGETOPT_REQ_UINT32 },
 #endif
     { "--autostart-enabled",        MODIFYVM_AUTOSTART_ENABLED,         RTGETOPT_REQ_BOOL_ONOFF },
@@ -2928 +2929 @@
             }
 #ifdef VBOX_WITH_RECORDING
-            case MODIFYVM_RECORD:
+            case MODIFYVM_RECORDING:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_SCREENS:
+            case MODIFYVM_RECORDING_SCREENS:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_FILENAME:
+            case MODIFYVM_RECORDING_FILENAME:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_VIDEO_WIDTH:
+            case MODIFYVM_RECORDING_VIDEO_WIDTH:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_VIDEO_HEIGHT:
+            case MODIFYVM_RECORDING_VIDEO_HEIGHT:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_VIDEO_RES:
+            case MODIFYVM_RECORDING_VIDEO_RES:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_VIDEO_RATE:
+            case MODIFYVM_RECORDING_VIDEO_RATE:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_VIDEO_FPS:
+            case MODIFYVM_RECORDING_VIDEO_FPS:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_MAXTIME:
+            case MODIFYVM_RECORDING_MAXTIME:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_MAXSIZE:
+            case MODIFYVM_RECORDING_MAXSIZE:
                 RT_FALL_THROUGH();
-            case MODIFYVM_RECORD_OPTIONS:
+            case MODIFYVM_RECORDING_OPTIONS:
             {
                 ComPtr<IRecordingSettings> recordingSettings;
@@ -2957 +2958 @@
                 switch (c)
                 {
-                    case MODIFYVM_RECORD:
+                    case MODIFYVM_RECORDING:
                     {
                         CHECK_ERROR(recordingSettings, COMSETTER(Enabled)(ValueUnion.f));
                         break;
                     }
-                    case MODIFYVM_RECORD_SCREENS:
+                    case MODIFYVM_RECORDING_SCREENS:
                     {
                         ULONG cMonitors = 64;
@@ -2981 +2982 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_FILENAME:
+                    case MODIFYVM_RECORDING_FILENAME:
                     {
                         Bstr bstr;
@@ -3002 +3003 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_VIDEO_WIDTH:
+                    case MODIFYVM_RECORDING_VIDEO_WIDTH:
                     {
                         for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
@@ -3008 +3009 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_VIDEO_HEIGHT:
+                    case MODIFYVM_RECORDING_VIDEO_HEIGHT:
                     {
                         for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
@@ -3014 +3015 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_VIDEO_RES:
+                    case MODIFYVM_RECORDING_VIDEO_RES:
                     {
                         uint32_t uWidth = 0;
@@ -3041 +3042 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_VIDEO_RATE:
+                    case MODIFYVM_RECORDING_VIDEO_RATE:
                     {
                         for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
@@ -3047 +3048 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_VIDEO_FPS:
+                    case MODIFYVM_RECORDING_VIDEO_FPS:
                     {
                         for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
@@ -3053 +3054 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_MAXTIME:
+                    case MODIFYVM_RECORDING_MAXTIME:
                     {
                         for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
@@ -3059 +3060 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_MAXSIZE:
+                    case MODIFYVM_RECORDING_MAXSIZE:
                     {
                         for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
@@ -3065 +3066 @@
                         break;
                     }
-                    case MODIFYVM_RECORD_OPTIONS:
+                    case MODIFYVM_RECORDING_OPTIONS:
                     {
                         Bstr bstr(ValueUnion.psz);