Changeset 75287 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 6, 2018 2:10:14 PM (6 years ago)

Author:

vboxsync

Message:

Capturing/Main: Bugfixes for startup.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (10 diffs)

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

@@ -5607 +5607 @@
  * @param   pAutoLock           Pointer to auto write lock to use for attaching/detaching required driver(s) at runtime.
  */
-int Console::i_videoCaptureEnable(BOOL fEnable, util::AutoWriteLock *pAutoLock)
+int Console::i_videoRecEnable(BOOL fEnable, util::AutoWriteLock *pAutoLock)
 {
     AssertPtrReturn(pAutoLock, VERR_INVALID_POINTER);
@@ -5616 +5616 @@
     if (pDisplay)
     {
-        if (RT_BOOL(fEnable) != Capture.mpVideoRecCtx->IsStarted())
+        const bool fEnabled =    Capture.mpVideoRecCtx
+                              && Capture.mpVideoRecCtx->IsStarted();
+
+        if (RT_BOOL(fEnable) != fEnabled)
         {
             LogRel(("VideoRec: %s\n", fEnable ? "Enabling" : "Disabling"));
@@ -5624 +5627 @@
             if (fEnable)
             {
+                vrc = i_videoRecCreate();
+                if (RT_SUCCESS(vrc))
+                {
 # ifdef VBOX_WITH_AUDIO_VIDEOREC
-                /* Attach the video recording audio driver if required. */
-                if (   Capture.mpVideoRecCtx->IsFeatureEnabled(CaptureFeature_Audio)
-                    && Capture.mAudioVideoRec)
-                {
-                    vrc = Capture.mAudioVideoRec->applyConfiguration(Capture.mpVideoRecCtx->GetConfig());
-                    if (RT_SUCCESS(vrc))
-                        vrc = Capture.mAudioVideoRec->doAttachDriverViaEmt(mpUVM, pAutoLock);
-                }
+                    /* Attach the video recording audio driver if required. */
+                    if (   Capture.mpVideoRecCtx->IsFeatureEnabled(CaptureFeature_Audio)
+                        && Capture.mAudioVideoRec)
+                    {
+                        vrc = Capture.mAudioVideoRec->applyConfiguration(Capture.mpVideoRecCtx->GetConfig());
+                        if (RT_SUCCESS(vrc))
+                            vrc = Capture.mAudioVideoRec->doAttachDriverViaEmt(mpUVM, pAutoLock);
+                    }
 # endif
-                if (   RT_SUCCESS(vrc)
-                    && Capture.mpVideoRecCtx->IsReady()) /* Any video recording (audio and/or video) feature enabled? */
-                {
-                    vrc = i_videoRecStart();
+                    if (   RT_SUCCESS(vrc)
+                        && Capture.mpVideoRecCtx->IsReady()) /* Any video recording (audio and/or video) feature enabled? */
+                    {
+                        vrc = i_videoRecStart();
+                    }
                 }
             }
@@ -5646 +5653 @@
                 Capture.mAudioVideoRec->doDetachDriverViaEmt(mpUVM, pAutoLock);
 # endif
+                i_videoRecDestroy();
             }
 
@@ -5680 +5688 @@
         AssertComRCReturnRC(rc);
 
-        int vrc = i_videoCaptureEnable(fEnabled, &alock);
+        int vrc = i_videoRecEnable(fEnabled, &alock);
         if (RT_SUCCESS(vrc))
         {
@@ -6884 +6892 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-int Console::i_videoRecLoad(settings::CaptureSettings &Settings)
+int Console::i_videoRecGetSettings(settings::CaptureSettings &Settings)
 {
     Assert(mMachine.isNotNull());
@@ -6930 +6938 @@
 
 /**
+ * Creates the recording context.
+ *
+ * @returns IPRT status code.
+ */
+int Console::i_videoRecCreate(void)
+{
+    AssertReturn(Capture.mpVideoRecCtx == NULL, VERR_WRONG_ORDER);
+
+    int rc = VINF_SUCCESS;
+
+    try
+    {
+        Capture.mpVideoRecCtx = new CaptureContext(this);
+    }
+    catch (std::bad_alloc &)
+    {
+        return VERR_NO_MEMORY;
+    }
+    catch (int &rc2)
+    {
+        return rc2;
+    }
+
+    return rc;
+}
+
+/**
+ * Destroys the recording context.
+ */
+void Console::i_videoRecDestroy(void)
+{
+    if (Capture.mpVideoRecCtx)
+        delete Capture.mpVideoRecCtx;
+}
+
+/**
  * Starts capturing. Does nothing if capturing is already active.
  *
@@ -6936 +6980 @@
 int Console::i_videoRecStart(void)
 {
-    if (Capture.mpVideoRecCtx && Capture.mpVideoRecCtx->IsStarted())
+    AssertPtrReturn(Capture.mpVideoRecCtx, VERR_WRONG_ORDER);
+
+    if (Capture.mpVideoRecCtx->IsStarted())
         return VINF_SUCCESS;
 
     LogRel(("VideoRec: Starting ...\n"));
 
-    try
-    {
-        Capture.mpVideoRecCtx = new CaptureContext(this);
-    }
-    catch (std::bad_alloc &)
-    {
-        return VERR_NO_MEMORY;
-    }
-    catch (int &rc)
-    {
-        return rc;
-    }
-
     settings::CaptureSettings Settings;
-    int rc = i_videoRecLoad(Settings);
+    int rc = i_videoRecGetSettings(Settings);
     if (RT_SUCCESS(rc))
     {
@@ -6977 +7010 @@
 int Console::i_videoRecStop(void)
 {
-    if (!Capture.mpVideoRecCtx || !Capture.mpVideoRecCtx->IsStarted())
+    AssertPtrReturn(Capture.mpVideoRecCtx, VERR_WRONG_ORDER);
+
+    if (!Capture.mpVideoRecCtx->IsStarted())
         return VINF_SUCCESS;
 
@@ -10098 +10133 @@
         if (fCaptureEnabled)
         {
-            int vrc2 = pConsole->i_videoCaptureEnable(fCaptureEnabled, &alock);
+            int vrc2 = pConsole->i_videoRecEnable(fCaptureEnabled, &alock);
             if (RT_SUCCESS(vrc2))
             {