Changeset 95770 in vbox

Timestamp:

Jul 21, 2022 10:05:38 AM (3 years ago)

Author:

vboxsync

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

152480

Message:

Main/Recording: Also serialize the screen settings feature map; we might want to use this later as well. bugref:9286

Location:

trunk

Files:

• include/VBox/settings.h (modified) (4 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (3 diffs)

trunk/include/VBox/settings.h

@@ -626 +626 @@
 /**
  * Recording settings for a single screen (e.g. virtual monitor).
+ *
+ * NOTE: If you add any fields in here, you must update a) the constructor and b)
+ * the operator== which is used by MachineConfigFile::operator==(), or otherwise
+ * your settings might never get saved.
  */
 struct RecordingScreenSettings
@@ -640 +644 @@
 
     static const char *getDefaultOptions(void);
+
+    static int featuresFromString(const com::Utf8Str &strFeatures, RecordingFeatureMap &featureMap);
+
+    static void featuresToString(const RecordingFeatureMap &featureMap, com::Utf8Str &strFeatures);
 
     bool operator==(const RecordingScreenSettings &d) const;
@@ -648 +656 @@
     RecordingDestination_T enmDest;
     /** Which features are enable or not. */
-    RecordingFeatureMap    featureMap; /** @todo Implement with next settings version bump. */
+    RecordingFeatureMap    featureMap; // requires settings version 1.19 (VirtualBox 7.0)
     /** Maximum time (in s) to record. If set to 0, no time limit is set. */
     uint32_t               ulMaxTimeS; // requires settings version 1.14 (VirtualBox 4.3)
@@ -711 +719 @@
 /**
  * Common recording settings, shared among all per-screen recording settings.
+ *
+ * NOTE: If you add any fields in here, you must update a) the constructor and b)
+ * the operator== which is used by MachineConfigFile::operator==(), or otherwise
+ * your settings might never get saved.
  */
 struct RecordingCommonSettings

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

@@ -2787 +2787 @@
     /* Note: Needs to be kept in sync with FE/Qt's UIMachineSettingsDisplay::putToCache()! */
     return "vc_enabled=true,ac_enabled=false,ac_profile=med";
+}
+
+/**
+ * Returns a recording settings feature map from a given string.
+ *
+ * @returns VBox status code.
+ * @param   strFeatures         String of features to convert.
+ * @param   featureMap          Where to return the converted features on success.
+ */
+/* static */
+int RecordingScreenSettings::featuresFromString(const com::Utf8Str &strFeatures, RecordingFeatureMap &featureMap)
+{
+    featureMap.clear();
+
+    RTCList<RTCString> lstFeatures = strFeatures.split(" ");
+    for (size_t i = 0; i < lstFeatures.size(); i++)
+    {
+        if (lstFeatures.at(i).compare("video", RTCString::CaseInsensitive))
+            featureMap[RecordingFeature_Video] = true;
+        else if (lstFeatures.at(i).compare("audio", RTCString::CaseInsensitive))
+            featureMap[RecordingFeature_Audio] = true;
+        /* ignore everything else */
+    }
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Converts a feature map to a serializable string.
+ *
+ * @param   featureMap          Feature map to convert.
+ * @param   strFeatures         Where to return the features converted as a string.
+ */
+/* static */
+void RecordingScreenSettings::featuresToString(const RecordingFeatureMap &featureMap, com::Utf8Str &strFeatures)
+{
+    RecordingFeatureMap::const_iterator itFeature = featureMap.begin();
+    while (itFeature != featureMap.end())
+    {
+        if (itFeature->first == RecordingFeature_Video && itFeature->second)
+            strFeatures += "video ";
+        if (itFeature->first == RecordingFeature_Audio && itFeature->second)
+            strFeatures += "audio ";
+        strFeatures += " ";
+
+        ++itFeature;
+    }
+    strFeatures.strip();
 }
 
@@ -6019 +6067 @@
 
             (*itScreen)->getAttributeValue("enabled",   screenSettings.fEnabled);
+            Utf8Str strFeatures;
+            (*itScreen)->getAttributeValue("featuresEnabled", strFeatures);
+            RecordingScreenSettings::featuresFromString(strFeatures, screenSettings.featureMap);
             (*itScreen)->getAttributeValue("maxTimeS",  screenSettings.ulMaxTimeS);
             (*itScreen)->getAttributeValue("options",   screenSettings.strOptions);
@@ -8054 +8105 @@
                 pelmScreen->setAttribute("id",                  itScreen->first); /* The key equals the monitor ID. */
                 pelmScreen->setAttribute("enabled",             itScreen->second.fEnabled);
+                com::Utf8Str strFeatures;
+                RecordingScreenSettings::featuresToString(itScreen->second.featureMap, strFeatures);
+                pelmScreen->setAttribute("featuresEnabled",     strFeatures);
                 if (itScreen->second.ulMaxTimeS)
                     pelmScreen->setAttribute("maxTimeS",        itScreen->second.ulMaxTimeS);