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

Timestamp:

Jul 28, 2022 2:56:13 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Integrated r152624 from 6.1 into trunk (More code for per-screen settings. ​As we always want to have screen 0 enabled by default (if not explicitly set otherwise), the per-screen settings need to know which screen ID it's assigned to, to treat the defaults right). bugref:9286

Location:

trunk/src/VBox/Main

Files:

• src-client/RecordingStream.cpp (modified) (2 diffs)
• src-server/RecordingSettingsImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (7 diffs)

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

@@ -37 +37 @@
     , enmState(RECORDINGSTREAMSTATE_UNINITIALIZED)
     , tsStartMs(0)
+    , ScreenSettings(UINT32_MAX)
 {
     File.pWEBM = NULL;
@@ -45 +46 @@
     : enmState(RECORDINGSTREAMSTATE_UNINITIALIZED)
     , tsStartMs(0)
+    , ScreenSettings(uScreen)
 {
     File.pWEBM = NULL;

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

@@ -773 +773 @@
         if (m->mapScreenObj.find(i) == m->mapScreenObj.end())
         {
-            settings::RecordingScreenSettings defaultScreenSettings; /* Apply default settings. */
+            settings::RecordingScreenSettings defaultScreenSettings(i /* Screen ID */); /* Apply default settings. */
 
             int vrc2 = i_createScreenObj(m->mapScreenObj, i /* Screen ID */, defaultScreenSettings);

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

@@ -2769 +2769 @@
 }
 
-RecordingScreenSettings::RecordingScreenSettings(void)
+RecordingScreenSettings::RecordingScreenSettings(uint32_t a_idScreen /* = UINT32_MAX */)
+    : idScreen(a_idScreen)
 {
     applyDefaults();
@@ -2781 +2782 @@
 /**
  * Returns the default options string for screen recording settings.
+ *
+ * @returns Default options string for a given screen.
  */
 /* static */
@@ -2846 +2849 @@
      */
 
-    fEnabled             = false;
+    /*
+     * Enable screen 0 by default.
+     * Otherwise enabling recording without any screen enabled at all makes no sense.
+     *
+     * Note: When tweaking this, make sure to also alter RecordingScreenSettings::areDefaultSettings().
+     */
+    fEnabled             = idScreen == 0 ? true : false;;
     enmDest              = RecordingDestination_File;
     ulMaxTimeS           = 0;
@@ -2872 +2881 @@
  *
  * @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
+ */
+bool RecordingScreenSettings::areDefaultSettings(void) const
 {
     return    (   fEnabled                                    == false
@@ -3002 +3009 @@
     {
         /* 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;
+        RecordingScreenSettings screenSettings(0 /* Screen ID */);
+
+        mapScreens[0 /* Screen ID */] = screenSettings;
     }
     catch (std::bad_alloc &)
@@ -3031 +3032 @@
     while (itScreen != mapScreens.end())
     {
-        if (!itScreen->second.areDefaultSettings(itScreen->first /* Screen ID */))
+        if (!itScreen->second.areDefaultSettings())
             return false;
         ++itScreen;
@@ -6147 +6148 @@
             recording.mapScreens[i] = screen0;
 
-            if (uScreensBitmap & RT_BIT_64(i)) /* Screen i enabled? */
-                recording.mapScreens[i].fEnabled = true;
+            /* Screen i enabled? */
+            recording.mapScreens[i].idScreen = i;
+            recording.mapScreens[i].fEnabled = RT_BOOL(uScreensBitmap & RT_BIT_64(i));
         }
     }