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

Timestamp:

May 16, 2013 1:40:20 PM (12 years ago)

Author:

vboxsync

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

85814

Message:

Main/VPX, VBoxManage: added IMachine::VideoCaptureScreens and IDisplay::{enableVideoCapture,disableVideoCapture}

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (3 diffs)
• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManageModifyVM.cpp (modified) (4 diffs)

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

@@ -1301 +1301 @@
             }
             int vrc;
-            uint32_t displayIdx = 0;
+            uint32_t iScreen = 0;
             if (a->argc == 4)
             {
-                vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &displayIdx);
+                vrc = RTStrToUInt32Ex(a->argv[3], NULL, 0, &iScreen);
                 if (vrc != VINF_SUCCESS)
                 {
@@ -1321 +1321 @@
             }
             ULONG width, height, bpp;
-            CHECK_ERROR_BREAK(pDisplay, GetScreenResolution(displayIdx, &width, &height, &bpp));
+            CHECK_ERROR_BREAK(pDisplay, GetScreenResolution(iScreen, &width, &height, &bpp));
             com::SafeArray<BYTE> saScreenshot;
-            CHECK_ERROR_BREAK(pDisplay, TakeScreenShotPNGToArray(displayIdx, width, height, ComSafeArrayAsOutParam(saScreenshot)));
+            CHECK_ERROR_BREAK(pDisplay, TakeScreenShotPNGToArray(iScreen, width, height, ComSafeArrayAsOutParam(saScreenshot)));
             RTFILE pngFile = NIL_RTFILE;
             vrc = RTFileOpen(&pngFile, a->argv[2], RTFILE_O_OPEN_CREATE | RTFILE_O_WRITE | RTFILE_O_TRUNCATE | RTFILE_O_DENY_ALL);
@@ -1340 +1340 @@
             RTFileClose(pngFile);
         }
+        else if (   !strcmp(a->argv[1], "enablevideocapture")
+                 || !strcmp(a->argv[1], "disablevideocapture"))
+        {
+            ULONG cMonitors = 64;
+            CHECK_ERROR_BREAK(machine, COMGETTER(MonitorCount)(&cMonitors));
+            com::SafeArray<BOOL> saScreenIds(cMonitors);
+            if (a->argc < 3)
+            {
+                /* default: handle all screens */
+                for (unsigned i = 0; i < cMonitors; i++)
+                    saScreenIds[i] = true;
+            }
+            else
+            {
+                /* handle selected screens */
+                for (unsigned i = 0; i < cMonitors; i++)
+                    saScreenIds[i] = false;
+                for (int i = 2; SUCCEEDED(rc) && i < a->argc; i++)
+                {
+                    uint32_t iScreen;
+                    int vrc = RTStrToUInt32Ex(a->argv[i], NULL, 0, &iScreen);
+                    RTPrintf("i = %d => %d => %Rrc\n", i, iScreen, vrc);
+                    if (vrc != VINF_SUCCESS)
+                    {
+                        errorArgument("Error parsing display number '%s'", a->argv[i]);
+                        rc = E_FAIL;
+                        break;
+                    }
+                    if (iScreen >= cMonitors)
+                    {
+                        errorArgument("Invalid screen ID specified '%u'", iScreen);
+                        rc = E_FAIL;
+                        break;
+                    }
+                    saScreenIds[iScreen] = true;
+                }
+            }
+            for (unsigned i = 0; i < cMonitors; i++)
+                RTPrintf("  %d\n", saScreenIds[i]);
+            ComPtr<IDisplay> pDisplay;
+            CHECK_ERROR_BREAK(console, COMGETTER(Display)(pDisplay.asOutParam()));
+            if (!pDisplay)
+            {
+                RTMsgError("Guest not running");
+                rc = E_FAIL;
+                break;
+            }
+            if (!strcmp(a->argv[1], "enablevideocapture"))
+                CHECK_ERROR_BREAK(pDisplay, EnableVideoCapture(ComSafeArrayAsInParam(saScreenIds)));
+            else
+                CHECK_ERROR_BREAK(pDisplay, DisableVideoCapture(ComSafeArrayAsInParam(saScreenIds)));
+        }
         else
         {

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

@@ -371 +371 @@
 #ifdef VBOX_WITH_VPX
                      "                            [--vcpenabled on|off]\n"
+                     "                            [--vcpscreens [<display>],...\n"
                      "                            [--vcpfile <filename>]\n"
                      "                            [--vcpwidth <width>]\n"
@@ -468 +469 @@
                      "                                              [<xorigin> <yorigin>]]] |\n"
                      "                            screenshotpng <file> [display] |\n"
+                     "                            enablevideocapture <screen>,[<screen>...]\n"
+                     "                            disablevideocapture <screen>,[<screen>...]\n"
                      "                            setcredentials <username>\n"
                      "                                           --passwordfile <file> | <password>\n"

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

@@ -2306 +2306 @@
         BOOL bActive = FALSE;
         CHECK_ERROR_RET(machine, COMGETTER(VideoCaptureEnabled)(&bActive), rc);
+        com::SafeArray<BOOL> screens;
+        CHECK_ERROR_RET(machine, COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(screens)), rc);
         ULONG Width;
         CHECK_ERROR_RET(machine, COMGETTER(VideoCaptureWidth)(&Width), rc);
@@ -2319 +2321 @@
         {
             RTPrintf("VideoCaptureEnabled=\"%s\"\n", bActive ? "on" : "off");
+            RTPrintf("VideoCaptureScreens=");
+            bool fComma = false;
+            for (unsigned i = 0; i < screens.size(); i++)
+                if (screens[i])
+                {
+                    RTPrintf("%s%u", fComma ? "," : "", i);
+                    fComma = true;
+                }
+            RTPrintf("\n");
             RTPrintf("VideoCaptureWidth=%u\n", (unsigned)Width);
             RTPrintf("VideoCaptureFile=\"%ls\"\n", File.raw());
@@ -2328 +2339 @@
         {
             RTPrintf("Video capturing:    %s\n", bActive ? "active" : "not active");
+            RTPrintf("Capture screens:    ");
+            bool fComma = false;
+            for (unsigned i = 0; i < screens.size(); i++)
+                if (screens[i])
+                {
+                    RTPrintf("%s%u", fComma ? "," : "", i);
+                    fComma = true;
+                }
+            RTPrintf("\n");
             RTPrintf("Capture file:       %ls\n", File.raw());
             RTPrintf("Capture dimensions: %ux%u\n", Width, Height);
-            RTPrintf("Capture rate:       %ukbps\n", Rate);
+            RTPrintf("Capture rate:       %u kbps\n", Rate);
             RTPrintf("Capture FPS:        %u\n", Fps);
             RTPrintf("\n");

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

@@ -196 +196 @@
 #ifdef VBOX_WITH_VPX
     MODIFYVM_VCP,
+    MODIFYVM_VCP_SCREENS,
     MODIFYVM_VCP_FILENAME,
     MODIFYVM_VCP_WIDTH,
@@ -344 +345 @@
 #ifdef VBOX_WITH_VPX
     { "--vcpenabled",               MODIFYVM_VCP,                       RTGETOPT_REQ_BOOL_ONOFF },
+    { "--vcpscreens",               MODIFYVM_VCP_SCREENS,               RTGETOPT_REQ_STRING },
     { "--vcpfile",                  MODIFYVM_VCP_FILENAME,              RTGETOPT_REQ_STRING },
     { "--vcpwidth",                 MODIFYVM_VCP_WIDTH,                 RTGETOPT_REQ_UINT32 },
@@ -409 +411 @@
         }
     }
+}
+
+int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens)
+{
+    while (pcszScreens && *pcszScreens)
+    {
+        char *pszNext;
+        uint32_t iScreen;
+        int rc = RTStrToUInt32Ex(pcszScreens, &pszNext, 0, &iScreen);
+        if (RT_FAILURE(rc))
+            return 1;
+        if (iScreen >= pScreens->size())
+            return 1;
+        if (pszNext && *pszNext)
+        {
+            pszNext = RTStrStripL(pszNext);
+            if (*pszNext != ',')
+                return 1;
+            pszNext++;
+        }
+        (*pScreens)[iScreen] = true;
+        pcszScreens = pszNext;
+    }
+    return 0;
 }
 
@@ -2449 +2475 @@
                 break;
             }
+            case MODIFYVM_VCP_SCREENS:
+            {
+                ULONG cMonitors = 64;
+                CHECK_ERROR(machine, COMGETTER(MonitorCount)(&cMonitors));
+                com::SafeArray<BOOL> screens(cMonitors);
+                if (parseScreens(ValueUnion.psz, &screens))
+                {
+                    errorArgument("Invalid list of screens specified\n");
+                    rc = E_FAIL;
+                    break;
+                }
+                CHECK_ERROR(machine, COMSETTER(VideoCaptureScreens)(ComSafeArrayAsInParam(screens)));
+                break;
+            }
             case MODIFYVM_VCP_FILENAME:
             {