Changeset 105266 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 11, 2024 7:49:37 AM (9 months ago)

Author:

vboxsync

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

163915

Message:

Recording: Implemented support for a dedicated progress object, which is exposed to API clients. This can be used for better tracking the recording progress as well as for error reporting. The RecordingSettings API also now has a dedicated start() method to start recording, as well as support for attaching to an already ongoing recording by retrieving the progress object at a later time. Adapted FE/Qt (draft, see @todos), FE/VBoxManage and the Validation Kit testdriver to the new APIs. VBoxManage also can attach to an ongoing recording now. The recording progress object also will have multiple operations to get the recording progress for convenience. bugref:10718

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDetailsGenerator.cpp (modified) (2 diffs)
• globals/UIMainEventListener.cpp (modified) (1 diff)
• runtime/UIConsoleEventHandler.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDetailsGenerator.cpp

@@ -527 +527 @@
     {
         CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
-        if (comRecordingSettings.GetEnabled())
+        CProgress comProgress = comRecordingSettings.GetProgress(); /** @todo r=andy Revamp this. */
+        /** @r=andy Check if recording is running: if not completed AND not canceled. */
+        if (comProgress.isOk() && !comProgress.GetCompleted() && !comProgress.GetCanceled())
         {
             /* For now all screens have the same config: */
@@ -1462 +1464 @@
     /* Get recording settings: */
     CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
-    fRecordingEnabled = comRecordingSettings.GetEnabled();
+    CProgress comProgress = comRecordingSettings.GetProgress(); /** r=andy Revamp this. */
+    /** @r=andy Check if recording is running: if not completed AND not canceled. */
+    fRecordingEnabled = comProgress.isOk() && !comProgress.GetCompleted() && !comProgress.GetCanceled();
     if (fRecordingEnabled)
     {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

@@ -481 +481 @@
             break;
         }
-        case KVBoxEventType_OnRecordingChanged:
+        case KVBoxEventType_OnRecordingStateChanged:
         {
             emit sigRecordingChange();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp

@@ -217 +217 @@
         << KVBoxEventType_OnVRDEServerChanged
         << KVBoxEventType_OnVRDEServerInfoChanged
-        << KVBoxEventType_OnRecordingChanged
+        << KVBoxEventType_OnRecordingStateChanged
         << KVBoxEventType_OnUSBControllerChanged
         << KVBoxEventType_OnUSBDeviceStateChanged

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1939 +1939 @@
     else
     {
-        const BOOL fSettingsEnabled = comSettings.GetEnabled();
-        fSuccess = comSettings.isOk();
-        if (!fSuccess)
-            UINotificationMessage::cannotAcquireRecordingSettingsParameter(comSettings);
-        else
-            fEnabled = fSettingsEnabled == TRUE;
+        /** @todo r=andy Revamp this. */
+        CProgress comProgress = comSettings.GetProgress();
+        fEnabled = comProgress.isOk() && !comProgress.GetCompleted() && !comProgress.GetCanceled();
     }
     return fSuccess;
@@ -1958 +1955 @@
     else
     {
-        comSettings.SetEnabled(fEnabled);
-        fSuccess = comSettings.isOk();
-        if (!fSuccess)
-            UINotificationMessage::cannotToggleRecording(comSettings, machineName(), fEnabled);
+        /** @todo r=andy Revamp this function to better use the progress object.
+         *               Probably also needs a bit of refactoring of the overall handling within FE/Qt. */
+        CProgress comProgress;
+        if (fEnabled)
+        {
+            comProgress = comSettings.Start();
+            fSuccess = comSettings.isOk();
+            if (!fSuccess)
+                UINotificationMessage::cannotToggleRecording(comSettings, machineName(), fEnabled);
+        }
+        else
+        {
+            comProgress = comSettings.GetProgress();
+            if (comProgress.isOk())
+                comProgress.Cancel();
+            else
+                UINotificationMessage::cannotToggleRecording(comSettings, machineName(), fEnabled);
+        }
+
     }
     return fSuccess;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -53 +53 @@
 #include "CExtPackManager.h"
 #include "CGraphicsAdapter.h"
+#include "CProgress.h" /* For starting recording. */
 #include "CRecordingScreenSettings.h"
 #include "CRecordingSettings.h"
@@ -1329 +1330 @@
                     fSuccess = comRecordingScreenSettings.isOk();
                 }
-
                 if (!fSuccess)
                 {
@@ -1344 +1344 @@
                 recordingSettings.SetEnabled(newDisplayData.m_fRecordingEnabled);
                 fSuccess = recordingSettings.isOk();
+                if (fSuccess)
+                {
+                    /* Start recording when recording got enabled. */
+                    /** @todo r=andy Not sure if this is the right place for it. */
+                    CProgress comProgress = recordingSettings.Start();
+                    fSuccess = recordingSettings.isOk();
+                }
             }
         }