Changeset 96172 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Aug 12, 2022 1:27:46 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Changed IRecordingScreenSettings::features attribute to get/set a safe array of RecordingFeature entries instead of an anonymous ULONG. Makes it much easier to use. bugref:10275

File:

• trunk/src/VBox/Main/src-server/RecordingScreenSettingsImpl.cpp (modified) (4 diffs)

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

@@ -304 +304 @@
 }
 
-HRESULT RecordingScreenSettings::getFeatures(ULONG *aFeatures)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aFeatures = 0;
+HRESULT RecordingScreenSettings::getFeatures(std::vector<RecordingFeature_T> &aFeatures)
+{
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aFeatures.clear();
 
     settings::RecordingFeatureMap::const_iterator itFeature = m->bd->featureMap.begin();
@@ -317 +317 @@
     {
         if (itFeature->second) /* Is feature enable? */
-            *aFeatures |= (ULONG)itFeature->first;
+            aFeatures.push_back(itFeature->first);
 
         ++itFeature;
@@ -325 +325 @@
 }
 
-HRESULT RecordingScreenSettings::setFeatures(ULONG aFeatures)
+HRESULT RecordingScreenSettings::setFeatures(const std::vector<RecordingFeature_T> &aFeatures)
 {
     AutoCaller autoCaller(this);
@@ -340 +340 @@
     m->bd->featureMap.clear();
 
-    if (aFeatures & RecordingFeature_Audio)
-        m->bd->featureMap[RecordingFeature_Audio] = true;
-    if (aFeatures & RecordingFeature_Video)
-        m->bd->featureMap[RecordingFeature_Video] = true;
+    for (size_t i = 0; i < aFeatures.size(); i++)
+    {
+        switch (aFeatures[i])
+        {
+            case RecordingFeature_Audio:
+                m->bd->featureMap[RecordingFeature_Audio] = true;
+                break;
+
+            case RecordingFeature_Video:
+                m->bd->featureMap[RecordingFeature_Video] = true;
+                break;
+
+            default:
+                break;
+        }
+    }
 
     if (m->bd->featureMap != featureMapOld)