Changeset 75390 in vbox

Timestamp:

Nov 12, 2018 8:54:38 AM (6 years ago)

Author:

vboxsync

Message:

Recording/FE/VBoxManage: Fixes for "recording filename" and "recording videores"; a bit of cleanup / renaming.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (12 diffs)
• VBoxManageModifyVM.cpp (modified) (2 diffs)

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

@@ -1935 +1935 @@
             else if (!strcmp(a->argv[2], "filename"))
             {
-                if (a->argc != 3)
+                if (a->argc != 4)
                 {
                     errorSyntax(USAGE_CONTROLVM, "Incorrect number of parameters");
@@ -1943 +1943 @@
 
                 for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(FileName)(Bstr(a->argv[2]).raw()));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(FileName)(Bstr(a->argv[3]).raw()));
             }
             else if (   !strcmp(a->argv[2], "videores")
@@ -1955 +1955 @@
                 }
 
-                uint32_t uVal;
-                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uVal);
+                uint32_t uWidth;
+                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uWidth);
                 if (RT_FAILURE(vrc))
                 {
-                    errorArgument("Error parsing width '%s'", a->argv[3]);
-                    rc = E_FAIL;
-                    break;
-                }
-
-                vrc = RTStrToUInt32Ex(a->argv[4], NULL, 0, &uVal);
+                    errorArgument("Error parsing video width '%s'", a->argv[3]);
+                    rc = E_FAIL;
+                    break;
+                }
+
+                uint32_t uHeight;
+                vrc = RTStrToUInt32Ex(a->argv[4], NULL, 0, &uHeight);
                 if (RT_FAILURE(vrc))
                 {
-                    errorArgument("Error parsing height '%s'", a->argv[4]);
+                    errorArgument("Error parsing video height '%s'", a->argv[4]);
                     rc = E_FAIL;
                     break;
@@ -1974 +1975 @@
                 for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
                 {
-                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoWidth)(uVal));
-                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoHeight)(uVal));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoWidth)(uWidth));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoHeight)(uHeight));
                 }
             }
@@ -1987 +1988 @@
                 }
 
-                uint32_t uVal;
-                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uVal);
+                uint32_t uRate;
+                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uRate);
                 if (RT_FAILURE(vrc))
                 {
-                    errorArgument("Error parsing rate '%s'", a->argv[3]);
+                    errorArgument("Error parsing video rate '%s'", a->argv[3]);
                     rc = E_FAIL;
                     break;
@@ -1997 +1998 @@
 
                 for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoRate)(uVal));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoRate)(uRate));
             }
             else if (!strcmp(a->argv[2], "videofps"))
@@ -2008 +2009 @@
                 }
 
-                uint32_t uVal;
-                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uVal);
+                uint32_t uFPS;
+                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uFPS);
                 if (RT_FAILURE(vrc))
                 {
-                    errorArgument("Error parsing FPS '%s'", a->argv[3]);
+                    errorArgument("Error parsing video FPS '%s'", a->argv[3]);
                     rc = E_FAIL;
                     break;
@@ -2018 +2019 @@
 
                 for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoFPS)(uVal));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoFPS)(uFPS));
             }
             else if (!strcmp(a->argv[2], "maxtime"))
@@ -2029 +2030 @@
                 }
 
-                uint32_t uVal;
-                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uVal);
+                uint32_t uMaxTime;
+                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uMaxTime);
                 if (RT_FAILURE(vrc))
                 {
@@ -2039 +2040 @@
 
                 for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(MaxTime)(uVal));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(MaxTime)(uMaxTime));
             }
             else if (!strcmp(a->argv[2], "maxfilesize"))
@@ -2050 +2051 @@
                 }
 
-                uint32_t uVal;
-                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uVal);
+                uint32_t uMaxFileSize;
+                int vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &uMaxFileSize);
                 if (RT_FAILURE(vrc))
                 {
@@ -2060 +2061 @@
 
                 for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(MaxFileSize)(uVal));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(MaxFileSize)(uMaxFileSize));
             }
             else if (!strcmp(a->argv[2], "opts"))

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

@@ -3022 +3022 @@
                         if (RT_FAILURE(vrc) || vrc != VWRN_TRAILING_CHARS || !pszNext || *pszNext != 'x')
                         {
-                            errorArgument("Error parsing geomtry '%s' (expected <width>x<height>)", ValueUnion.psz);
+                            errorArgument("Error parsing video resolution '%s' (expected <width>x<height>)", ValueUnion.psz);
                             rc = E_FAIL;
                             break;
@@ -3030 +3030 @@
                         if (vrc != VINF_SUCCESS)
                         {
-                            errorArgument("Error parsing geomtry '%s' (expected <width>x<height>)", ValueUnion.psz);
+                            errorArgument("Error parsing video resolution '%s' (expected <width>x<height>)", ValueUnion.psz);
                             rc = E_FAIL;
                             break;