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

Timestamp:

Jul 21, 2022 10:19:46 AM (3 years ago)

Author:

vboxsync

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

152481

Message:

Main/Recording: Make it a bit more convenient for API clients by always setting screen 0 to enabled by default. Otherwise no screen would be enabled for recording by default (when forgotten to set), even when recording gets enabled then. bugref:9286

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

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

@@ -2870 +2870 @@
 /**
  * Check if all settings have default values.
- */
-bool RecordingScreenSettings::areDefaultSettings(void) const
-{
-    return    fEnabled                                        == false
+ *
+ * @returns \c true if default, \c false if not.
+ * @param   idScreen            Screen ID of screen settings to check.
+ *                              Set to UINT32_MAX if not specified / optional.
+ */
+bool RecordingScreenSettings::areDefaultSettings(uint32_t idScreen /* = UINT32_MAX */) const
+{
+    return    (   fEnabled                                    == false
+               /* Screen 0 is special: There we ALWAYS enable recording by default. */
+               || (   idScreen                                == 0
+                   && fEnabled                                == true)
+              )
            && enmDest                                         == RecordingDestination_File
            && ulMaxTimeS                                      == 0
@@ -2995 +3003 @@
         /* Always add screen 0 to the default configuration. */
         RecordingScreenSettings screenSettings;
+
+        /* Make sure to enable this per default.
+         * Otherwise enabling recording without any screen enabled at all makes no sense.
+         *
+         * Note: When tweaking this, make sure to also alter RecordingScreenSettings::areDefaultSettings(). */
+        screenSettings.fEnabled = true;
+
         mapScreens[0] = screenSettings;
     }
@@ -3016 +3031 @@
     while (itScreen != mapScreens.end())
     {
-        if (!itScreen->second.areDefaultSettings())
+        if (!itScreen->second.areDefaultSettings(itScreen->first /* Screen ID */))
             return false;
         ++itScreen;