Changeset 46123 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (3 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (3 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (4 diffs)
• src/VBox/Main/glue/glue-java.xsl (modified) (3 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (5 diffs)
• src/VBox/Main/include/DisplayImpl.h (modified) (2 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (2 diffs)
• src/VBox/Main/src-client/DisplayImpl.cpp (modified) (5 diffs)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (4 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/include/VBox/settings.h

@@ -826 +826 @@
     uint32_t            ulVideoCaptureFps;      // requires settings version 1.12 (VirtualBox 4.3)
     bool                fVideoCaptureEnabled;   // requires settings version 1.12 (VirtualBox 4.3)
+    uint64_t            u64VideoCaptureScreens; // requires settings version 1.12 (VirtualBox 4.3)
     com::Utf8Str        strVideoCaptureFile;    // requires settings version 1.12 (VirtualBox 4.3)
+
     FirmwareType_T      firmwareType;           // requires settings version 1.9 (VirtualBox 3.1)
 

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:
             {

trunk/src/VBox/Main/glue/glue-java.xsl

@@ -2628 +2628 @@
         List<Long> ret = new ArrayList<Long>(vals.length);
         for (long v : vals) {
-                ret.add(v);
+            ret.add(v);
+        }
+        return ret;
+    }
+
+    public static List<Boolean> wrap(boolean[] vals) {
+        if (vals==null)
+            return null;
+
+        List<Boolean> ret = new ArrayList<Boolean>(vals.length);
+        for (boolean v: vals) {
+        ret.add(v);
         }
         return ret;
@@ -2781 +2792 @@
 
     @SuppressWarnings( "unchecked")
-    public static <T> T[] unwrap(Class<T> wrapperClass, List<T> thisPtrs) {
+    public static <T> T[] unwrap(Class<T> wrapperClass, List<T> thisPtrs)
+    {
         if (thisPtrs==null)
             return null;
@@ -2797 +2809 @@
     public static Object queryInterface(Object obj, String uuid)
     {
-         try {
-            /* Kind of ugly, but does the job of casting */
-            org.mozilla.xpcom.Mozilla moz = org.mozilla.xpcom.Mozilla.getInstance();
-            long xpobj = moz.wrapJavaObject(obj, uuid);
-            return moz.wrapXPCOMObject(xpobj, uuid);
-         } catch (Exception e) {
-             return null;
-         }
+        try {
+           /* Kind of ugly, but does the job of casting */
+           org.mozilla.xpcom.Mozilla moz = org.mozilla.xpcom.Mozilla.getInstance();
+           long xpobj = moz.wrapJavaObject(obj, uuid);
+           return moz.wrapXPCOMObject(xpobj, uuid);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     @SuppressWarnings("unchecked")
-    public static <T1 extends IUnknown,T2> T2[] unwrap2(Class<T1> wrapperClass1, Class<T2> wrapperClass2, List<T1> thisPtrs) {
+    public static <T1 extends IUnknown,T2> T2[] unwrap2(Class<T1> wrapperClass1, Class<T2> wrapperClass2, List<T1> thisPtrs)
+    {
         if (thisPtrs==null)  return null;
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3980 +3980 @@
   <interface
     name="IMachine" extends="$unknown"
-    uuid="55bf39d3-ac8f-4a77-90d8-1e2c726170ce"
+    uuid="258f4e55-40f6-4804-a162-60c302a34d99"
     wsmap="managed"
     >
@@ -4242 +4242 @@
     </attribute>
 
+    <attribute name="VideoCaptureScreens" type="boolean" safearray="yes">
+      <desc>
+        This setting determines for which screens video recording is
+        enabled.</desc>
+    </attribute>
+
     <attribute name="VideoCaptureFile" type="wstring" default="Test.webm">
       <desc>
@@ -6272 +6278 @@
         <desc>VirtualSystemDescription object which is created for this machine.</desc>
       </param>
-    </method >
+    </method>
 
     <method name="findSnapshot">
@@ -14669 +14675 @@
   <interface
     name="IDisplay" extends="$unknown"
-    uuid="b83ee395-8679-40ca-8d60-1a0cbe724930"
+    uuid="0598a3df-3dc0-43c7-a79c-237fb5bb633d"
     wsmap="managed"
     >
@@ -14874 +14880 @@
         <desc>
           Array with resulting screen data.
+        </desc>
+      </param>
+    </method>
+
+    <method name="enableVideoCapture">
+      <desc>
+        Start/continue video capture.
+      </desc>
+      <param name="screens" type="boolean" safearray="yes" dir="in">
+        <desc>
+          The screens to start/continue capturing.
+        </desc>
+      </param>
+    </method>
+
+    <method name="disableVideoCapture">
+      <desc>
+        Stop video capture.
+      </desc>
+      <param name="screens" type="boolean" safearray="yes" dir="in">
+        <desc>
+          The screens to stop capturing.
         </desc>
       </param>

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -170 +170 @@
     STDMETHOD(TakeScreenShotToArray)(ULONG aScreenId, ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
     STDMETHOD(TakeScreenShotPNGToArray)(ULONG aScreenId, ULONG width, ULONG height, ComSafeArrayOut(BYTE, aScreenData));
+    STDMETHOD(EnableVideoCapture)(ComSafeArrayIn(BOOL, aScreens));
+    STDMETHOD(DisableVideoCapture)(ComSafeArrayIn(BOOL, aScreens));
     STDMETHOD(DrawToScreen)(ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
     STDMETHOD(InvalidateAndUpdate)();
@@ -304 +306 @@
 #ifdef VBOX_WITH_VPX
     VIDEORECCONTEXT *mpVideoRecCtx;
+    bool maVideoRecEnabled[SchemaDefs::MaxGuestMonitors];
 #endif
 };

trunk/src/VBox/Main/include/MachineImpl.h

@@ -263 +263 @@
         Bstr                mVideoCaptureFile;
         BOOL                mVideoCaptureEnabled;
+        BOOL                maVideoCaptureScreens[SchemaDefs::MaxGuestMonitors];
         ULONG               mMonitorCount;
         BOOL                mHWVirtExEnabled;
@@ -435 +436 @@
     STDMETHOD(COMGETTER(VideoCaptureEnabled))(BOOL *u8VideoRecEnabled);
     STDMETHOD(COMSETTER(VideoCaptureEnabled))(BOOL  u8VideoRecEnabled);
+    STDMETHOD(COMGETTER(VideoCaptureScreens))(ComSafeArrayOut(BOOL, aScreens));
+    STDMETHOD(COMSETTER(VideoCaptureScreens))(ComSafeArrayIn(BOOL, aScreens));
     STDMETHOD(COMGETTER(VideoCaptureFile))(BSTR * ppChVideoRecFilename);
     STDMETHOD(COMSETTER(VideoCaptureFile))(IN_BSTR pChVideoRecFilename);

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -134 +134 @@
 #ifdef VBOX_WITH_VPX
     mpVideoRecCtx = NULL;
+    for (unsigned i = 0; i < RT_ELEMENTS(maVideoRecEnabled); i++)
+        maVideoRecEnabled[i] = true;
 #endif
 
@@ -2672 +2674 @@
 }
 
-
-int Display::drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height)
+STDMETHODIMP Display::EnableVideoCapture(ComSafeArrayIn(BOOL, aScreens))
+{
+#ifdef VBOX_WITH_VPX
+    com::SafeArray<LONG> Screens(ComSafeArrayInArg(aScreens));
+    for (unsigned i = 0; i < Screens.size(); i++)
+        if (Screens[i])
+            maVideoRecEnabled[i] = true;
+    return S_OK;
+#else
+    return E_NOTIMPL;
+#endif
+}
+
+STDMETHODIMP Display::DisableVideoCapture(ComSafeArrayIn(BOOL, aScreens))
+{
+#ifdef VBOX_WITH_VPX
+    com::SafeArray<LONG> Screens(ComSafeArrayInArg(aScreens));
+    for (unsigned i = 0; i < Screens.size(); i++)
+        if (Screens[i])
+            maVideoRecEnabled[i] = false;
+    return S_OK;
+#else
+    return E_NOTIMPL;
+#endif
+}
+
+int Display::drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address,
+                             ULONG x, ULONG y, ULONG width, ULONG height)
 {
     int rc = VINF_SUCCESS;
@@ -2777 +2805 @@
 }
 
-STDMETHODIMP Display::DrawToScreen (ULONG aScreenId, BYTE *address, ULONG x, ULONG y,
-                                    ULONG width, ULONG height)
+STDMETHODIMP Display::DrawToScreen(ULONG aScreenId, BYTE *address,
+                                   ULONG x, ULONG y, ULONG width, ULONG height)
 {
     /// @todo (r=dmik) this function may take too long to complete if the VM
@@ -3364 +3392 @@
         for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++)
         {
+            if (!pDisplay->maVideoRecEnabled[uScreenId])
+                continue;
+
             DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId];
 
@@ -4435 +4466 @@
             return E_FAIL;
         }
+        com::SafeArray<BOOL> screens;
+        int hrc = pMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(screens));
+        AssertComRCReturnRC(hrc);
+        for (unsigned i = 0; i < RT_ELEMENTS(pDisplay->maVideoRecEnabled); i++)
+            pDisplay->maVideoRecEnabled[i] = i < screens.size() && screens[i];
         ULONG ulWidth;
-        int hrc = pMachine->COMGETTER(VideoCaptureWidth)(&ulWidth);
+        hrc = pMachine->COMGETTER(VideoCaptureWidth)(&ulWidth);
         AssertComRCReturnRC(hrc);
         ULONG ulHeight;

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -173 +173 @@
     mVideoCaptureFps = 25;
     mVideoCaptureEnabled = false;
+    for (unsigned i = 0; i < RT_ELEMENTS(maVideoCaptureScreens); i++)
+        maVideoCaptureScreens[i] = true;
 
     mHWVirtExEnabled = true;
@@ -1723 +1725 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     mHWData->mVideoCaptureEnabled = fEnabled;
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMGETTER(VideoCaptureScreens)(ComSafeArrayOut(BOOL, aScreens))
+{
+    CheckComArgOutSafeArrayPointerValid(aScreens);
+
+    SafeArray<BOOL> screens(mHWData->mMonitorCount);
+    for (unsigned i = 0; i < screens.size(); i++)
+        screens[i] = mHWData->maVideoCaptureScreens[i];
+    screens.detachTo(ComSafeArrayOutArg(aScreens));
+    return S_OK;
+}
+
+STDMETHODIMP Machine::COMSETTER(VideoCaptureScreens)(ComSafeArrayIn(BOOL, aScreens))
+{
+    SafeArray<BOOL> screens(ComSafeArrayInArg(aScreens));
+    AssertReturn(screens.size() <= RT_ELEMENTS(mHWData->maVideoCaptureScreens), E_INVALIDARG);
+    for (unsigned i = 0; i < screens.size(); i++)
+        mHWData->maVideoCaptureScreens[i] = RT_BOOL(screens[i]);
     return S_OK;
 }
@@ -8902 +8924 @@
         mHWData->mVideoCaptureHeight = data.ulVideoCaptureVertRes;
         mHWData->mVideoCaptureEnabled = data.fVideoCaptureEnabled;
+        for (unsigned i = 0; i < RT_ELEMENTS(mHWData->maVideoCaptureScreens); i++)
+            mHWData->maVideoCaptureScreens[i] = ASMBitTest(&data.u64VideoCaptureScreens, i);
+        AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8);
         mHWData->mVideoCaptureRate = data.ulVideoCaptureRate;
         mHWData->mVideoCaptureFps = data.ulVideoCaptureFps;
@@ -10124 +10149 @@
         data.ulVideoCaptureFps = mHWData->mVideoCaptureFps;
         data.fVideoCaptureEnabled  = !!mHWData->mVideoCaptureEnabled;
+        for (unsigned i = 0; i < sizeof(data.u64VideoCaptureScreens) * 8; i++)
+        {
+            if (mHWData->maVideoCaptureScreens)
+                ASMBitSet(&data.fVideoCaptureEnabled, i);
+            else
+                ASMBitClear(&data.fVideoCaptureEnabled, i);
+        }
         data.strVideoCaptureFile = mHWData->mVideoCaptureFile;
 

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1753 +1753 @@
           ulVideoCaptureFps(25),
           fVideoCaptureEnabled(false),
+          u64VideoCaptureScreens(UINT64_C(0xffffffffffffffff)),
           strVideoCaptureFile("Test.webm"),
           firmwareType(FirmwareType_BIOS),
@@ -1823 +1824 @@
                   && (fAccelerate2DVideo        == h.fAccelerate2DVideo)
                   && (fVideoCaptureEnabled      == h.fVideoCaptureEnabled)
+                  && (u64VideoCaptureScreens    == h.u64VideoCaptureScreens)
                   && (strVideoCaptureFile       == h.strVideoCaptureFile)
                   && (ulVideoCaptureHorzRes     == h.ulVideoCaptureHorzRes)
@@ -2724 +2726 @@
         else if (pelmHwChild->nameEquals("VideoCapture"))
         {
-            pelmHwChild->getAttributeValue("enabled", hw.fVideoCaptureEnabled);
-            pelmHwChild->getAttributeValue("file",    hw.strVideoCaptureFile);
-            pelmHwChild->getAttributeValue("horzRes", hw.ulVideoCaptureHorzRes);
-            pelmHwChild->getAttributeValue("vertRes", hw.ulVideoCaptureVertRes);
-            pelmHwChild->getAttributeValue("rate",    hw.ulVideoCaptureRate);
-            pelmHwChild->getAttributeValue("fps",     hw.ulVideoCaptureFps);
+            pelmHwChild->getAttributeValue("enabled",   hw.fVideoCaptureEnabled);
+            pelmHwChild->getAttributeValue("screens",   hw.u64VideoCaptureScreens);
+            pelmHwChild->getAttributeValue("file",      hw.strVideoCaptureFile);
+            pelmHwChild->getAttributeValue("horzRes",   hw.ulVideoCaptureHorzRes);
+            pelmHwChild->getAttributeValue("vertRes",   hw.ulVideoCaptureVertRes);
+            pelmHwChild->getAttributeValue("rate",      hw.ulVideoCaptureRate);
+            pelmHwChild->getAttributeValue("fps",       hw.ulVideoCaptureFps);
         }
         else if (pelmHwChild->nameEquals("RemoteDisplay"))
@@ -3911 +3914 @@
     if (m->sv >= SettingsVersion_v1_12)
     {
-        pelmVideoCapture->setAttribute("enabled", hw.fVideoCaptureEnabled);
-        pelmVideoCapture->setAttribute("file",    hw.strVideoCaptureFile);
-        pelmVideoCapture->setAttribute("horzRes", hw.ulVideoCaptureHorzRes);
-        pelmVideoCapture->setAttribute("vertRes", hw.ulVideoCaptureVertRes);
-        pelmVideoCapture->setAttribute("rate",    hw.ulVideoCaptureRate);
-        pelmVideoCapture->setAttribute("fps",     hw.ulVideoCaptureFps);
+        pelmVideoCapture->setAttribute("enabled",   hw.fVideoCaptureEnabled);
+        pelmVideoCapture->setAttribute("screens",   hw.u64VideoCaptureScreens);
+        pelmVideoCapture->setAttribute("file",      hw.strVideoCaptureFile);
+        pelmVideoCapture->setAttribute("horzRes",   hw.ulVideoCaptureHorzRes);
+        pelmVideoCapture->setAttribute("vertRes",   hw.ulVideoCaptureVertRes);
+        pelmVideoCapture->setAttribute("rate",      hw.ulVideoCaptureRate);
+        pelmVideoCapture->setAttribute("fps",       hw.ulVideoCaptureFps);
     }