Changeset 75307 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Nov 7, 2018 1:56:14 PM (6 years ago)

Author:

vboxsync

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

126417

Message:

Recording: Bugfixes for Main and FE/Qt.

File:

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

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

@@ -2387 +2387 @@
      */
 
-    fEnabled            = true;
+    fEnabled            = false;
     enmDest             = CaptureDestination_File;
     ulMaxTimeS          = 0;
     strOptions          = "";
     File.ulMaxSizeMB    = 0;
+    File.strName        = "";
     Video.enmCodec      = CaptureVideoCodec_VP8;
     Video.ulWidth       = 1024;
@@ -2404 +2405 @@
     featureMap[CaptureFeature_Video] = true;
     featureMap[CaptureFeature_Audio] = false;
-
-    //i_calculateFullPath
 }
 
@@ -2413 +2412 @@
 bool CaptureScreenSettings::areDefaultSettings(void) const
 {
-    const bool fDefault =    fEnabled            == true
-                          && enmDest             == CaptureDestination_File
-                          && ulMaxTimeS          == 0
-                          && strOptions          == ""
-                          && File.ulMaxSizeMB    == 0
-                          && Video.enmCodec      == CaptureVideoCodec_VP8
-                          && Video.ulWidth       == 1024
-                          && Video.ulHeight      == 768
-                          && Video.ulRate        == 512
-                          && Video.ulFPS         == 25
-                          && Audio.enmAudioCodec == CaptureAudioCodec_Opus
-                          && Audio.cBits         == 16
-                          && Audio.cChannels     == 2
-                          && Audio.uHz           == 22050;
-
-    return fDefault;
+    return    fEnabled            == false
+           && enmDest             == CaptureDestination_File
+           && ulMaxTimeS          == 0
+           && strOptions          == ""
+           && File.ulMaxSizeMB    == 0
+           && File.strName        == ""
+           && Video.enmCodec      == CaptureVideoCodec_VP8
+           && Video.ulWidth       == 1024
+           && Video.ulHeight      == 768
+           && Video.ulRate        == 512
+           && Video.ulFPS         == 25
+           && Audio.enmAudioCodec == CaptureAudioCodec_Opus
+           && Audio.cBits         == 16
+           && Audio.cChannels     == 2
+           && Audio.uHz           == 22050;
 }
 
@@ -2472 +2470 @@
 }
 
+/**
+ * Applies the default settings.
+ */
 void CaptureSettings::applyDefaults(void)
 {
@@ -2478 +2479 @@
     mapScreens.clear();
 
-    CaptureScreenSettings screenSettings; /* Apply default settings. */
-    for (uint32_t l = 0; l < SchemaDefs::MaxGuestMonitors; l++)
-    {
-        mapScreens[l] = screenSettings;
+    try
+    {
+        /* Always add screen 0 to the default configuration. */
+        CaptureScreenSettings screenSettings; /* Apply default settings for screen 0. */
+        mapScreens[0] = screenSettings;
+    }
+    catch (std::bad_alloc &)
+    {
+        AssertFailed();
     }
 }
@@ -2490 +2496 @@
 bool CaptureSettings::areDefaultSettings() const
 {
+    const bool fDefault =    fEnabled          == false
+                          && mapScreens.size() == 1;
+    if (!fDefault)
+        return false;
+
     CaptureScreenMap::const_iterator itScreen = mapScreens.begin();
-    while (itScreen != mapScreens.end())
-    {
-        if (!itScreen->second.areDefaultSettings())
-            return false;
-
-        ++itScreen;
-    }
-
-    return true;
+    return    itScreen->first == 0
+           && itScreen->second.areDefaultSettings();
 }
 
@@ -4413 +4417 @@
             /* At the moment we only support one capturing configuration, that is, all screens
              * have the same configuration. So load/save to/from screen 0. */
+            Assert(hw.captureSettings.mapScreens.size()); /* At least screen must be present. */
             CaptureScreenSettings &screen0Settings = hw.captureSettings.mapScreens[0];
 
@@ -4424 +4429 @@
             pelmHwChild->getAttributeValue("fps",       screen0Settings.Video.ulFPS);
 
-            for (unsigned i = 0; i < 64; i++)
+            for (unsigned i = 0; i < hw.cMonitors; i++) /* Don't add more settings than we have monitors configured. */
             {
                 if (u64VideoCaptureScreens & RT_BIT_64(i)) /* Screen i enabled? */
@@ -5839 +5844 @@
         Assert(hw.captureSettings.mapScreens.size());
         const CaptureScreenMap::const_iterator itScreen0Settings = hw.captureSettings.mapScreens.find(0);
+        Assert(itScreen0Settings != hw.captureSettings.mapScreens.end());
 
         if (itScreen0Settings->second.ulMaxTimeS)