Changeset 68871 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 26, 2017 10:24:37 AM (7 years ago)

Author:

vboxsync

Message:

VideoRec/DisplayImpl: Moved getting IMachine::VideoCaptureEnabled to Display::videoCaptureInvalidate().

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (2 diffs)

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

@@ -2410 +2410 @@
     Assert(pMachine.isNotNull());
 
-    mVideoRecCfg.fEnabled = true;
-    mVideoRecCfg.enmDst   = VIDEORECDEST_FILE; /** @todo Make this configurable once we have more variations. */
+    mVideoRecCfg.enmDst = VIDEORECDEST_FILE; /** @todo Make this configurable once we have more variations. */
 
     /*
      * Get parameters from API.
      */
+    BOOL fValue;
+    HRESULT rc = pMachine->COMGETTER(VideoCaptureEnabled)(&fValue);
+    AssertComRCReturn(rc, VERR_COM_UNEXPECTED);
+    mVideoRecCfg.fEnabled = RT_BOOL(fValue);
+
     com::SafeArray<BOOL> aScreens;
-    HRESULT rc = pMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(aScreens));
+    rc = pMachine->COMGETTER(VideoCaptureScreens)(ComSafeArrayAsOutParam(aScreens));
     AssertComRCReturn(rc, VERR_COM_UNEXPECTED);
 
@@ -4540 +4544 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-    ComPtr<IMachine> pMachine = pDisplay->mParent->i_machine();
-    BOOL fEnabled = false;
-    HRESULT hrc = pMachine->COMGETTER(VideoCaptureEnabled)(&fEnabled);
-    AssertComRCReturn(hrc, VERR_COM_UNEXPECTED);
-
-    if (fEnabled)
-    {
-        int rc2 = pDisplay->i_videoCaptureInvalidate();
+    int rc2 = pDisplay->i_videoCaptureInvalidate();
+    if (pDisplay->i_videoCaptureGetEnabled())
+    {
+        rc2 = pDisplay->i_videoCaptureStart();
         if (RT_SUCCESS(rc2))
-        {
-            rc2 = pDisplay->i_videoCaptureStart();
-            if (RT_SUCCESS(rc2))
-                fireVideoCaptureChangedEvent(pDisplay->mParent->i_getEventSource());
-        }
+            fireVideoCaptureChangedEvent(pDisplay->mParent->i_getEventSource());
 
         /* If video capturing fails for whatever reason here, this is