Changeset 75341 in vbox for trunk/src/VBox/Main/xml/Settings.cpp

Timestamp:

Nov 9, 2018 8:37:28 AM (6 years ago)

Author:

vboxsync

Message:

Recording: Renaming APIs ICapture* -> IRecord* and other terminology to better distinguish from features like mouse capturing and stuff.

File:

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

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

@@ -2371 +2371 @@
 }
 
-CaptureScreenSettings::CaptureScreenSettings(void)
+RecordScreenSettings::RecordScreenSettings(void)
 {
     applyDefaults();
 }
 
-CaptureScreenSettings::~CaptureScreenSettings()
-{
-
-}
-
-void CaptureScreenSettings::applyDefaults(void)
+RecordScreenSettings::~RecordScreenSettings()
+{
+
+}
+
+void RecordScreenSettings::applyDefaults(void)
 {
     /*
@@ -2388 +2388 @@
 
     fEnabled            = false;
-    enmDest             = CaptureDestination_File;
+    enmDest             = RecordDestination_File;
     ulMaxTimeS          = 0;
     strOptions          = "";
     File.ulMaxSizeMB    = 0;
     File.strName        = "";
-    Video.enmCodec      = CaptureVideoCodec_VP8;
+    Video.enmCodec      = RecordVideoCodec_VP8;
     Video.ulWidth       = 1024;
     Video.ulHeight      = 768;
     Video.ulRate        = 512;
     Video.ulFPS         = 25;
-    Audio.enmAudioCodec = CaptureAudioCodec_Opus;
+    Audio.enmAudioCodec = RecordAudioCodec_Opus;
     Audio.cBits         = 16;
     Audio.cChannels     = 2;
     Audio.uHz           = 22050;
 
-    featureMap[CaptureFeature_Video] = true;
-    featureMap[CaptureFeature_Audio] = false;
+    featureMap[RecordFeature_Video] = true;
+    featureMap[RecordFeature_Audio] = false;
 }
 
@@ -2410 +2410 @@
  * Check if all settings have default values.
  */
-bool CaptureScreenSettings::areDefaultSettings(void) const
+bool RecordScreenSettings::areDefaultSettings(void) const
 {
     return    fEnabled            == false
-           && enmDest             == CaptureDestination_File
+           && enmDest             == RecordDestination_File
            && ulMaxTimeS          == 0
            && strOptions          == ""
            && File.ulMaxSizeMB    == 0
            && File.strName        == ""
-           && Video.enmCodec      == CaptureVideoCodec_VP8
+           && Video.enmCodec      == RecordVideoCodec_VP8
            && Video.ulWidth       == 1024
            && Video.ulHeight      == 768
            && Video.ulRate        == 512
            && Video.ulFPS         == 25
-           && Audio.enmAudioCodec == CaptureAudioCodec_Opus
+           && Audio.enmAudioCodec == RecordAudioCodec_Opus
            && Audio.cBits         == 16
            && Audio.cChannels     == 2
@@ -2429 +2429 @@
 }
 
-bool CaptureScreenSettings::isFeatureEnabled(CaptureFeature_T enmFeature) const
-{
-    CaptureFeatureMap::const_iterator itFeature = featureMap.find(enmFeature);
+bool RecordScreenSettings::isFeatureEnabled(RecordFeature_T enmFeature) const
+{
+    RecordFeatureMap::const_iterator itFeature = featureMap.find(enmFeature);
     if (itFeature != featureMap.end())
         return itFeature->second;
@@ -2443 +2443 @@
  * machine settings have really changed and thus need to be written out to disk.
  */
-bool CaptureScreenSettings::operator==(const CaptureScreenSettings &d) const
+bool RecordScreenSettings::operator==(const RecordScreenSettings &d) const
 {
     return    fEnabled            == d.fEnabled
@@ -2465 +2465 @@
  * Constructor. Needs to set sane defaults which stand the test of time.
  */
-CaptureSettings::CaptureSettings()
+RecordSettings::RecordSettings()
 {
     applyDefaults();
@@ -2473 +2473 @@
  * Applies the default settings.
  */
-void CaptureSettings::applyDefaults(void)
+void RecordSettings::applyDefaults(void)
 {
     fEnabled = false;
@@ -2482 +2482 @@
     {
         /* Always add screen 0 to the default configuration. */
-        CaptureScreenSettings screenSettings; /* Apply default settings for screen 0. */
+        RecordScreenSettings screenSettings; /* Apply default settings for screen 0. */
         screenSettings.fEnabled = true;       /* Enabled by default. */
         mapScreens[0] = screenSettings;
@@ -2495 +2495 @@
  * Check if all settings have default values.
  */
-bool CaptureSettings::areDefaultSettings() const
+bool RecordSettings::areDefaultSettings() const
 {
     const bool fDefault =    fEnabled          == false
@@ -2502 +2502 @@
         return false;
 
-    CaptureScreenMap::const_iterator itScreen = mapScreens.begin();
+    RecordScreenMap::const_iterator itScreen = mapScreens.begin();
     return    itScreen->first == 0
            && itScreen->second.areDefaultSettings();
@@ -2512 +2512 @@
  * machine settings have really changed and thus need to be written out to disk.
  */
-bool CaptureSettings::operator==(const CaptureSettings &d) const
+bool RecordSettings::operator==(const RecordSettings &d) const
 {
     if (this == &d)
@@ -2521 +2521 @@
         return false;
 
-    CaptureScreenMap::const_iterator itScreen = mapScreens.begin();
+    RecordScreenMap::const_iterator itScreen = mapScreens.begin();
     uint32_t i = 0;
     while (itScreen != mapScreens.end())
     {
-        CaptureScreenMap::const_iterator itScreenThat = d.mapScreens.find(i);
+        RecordScreenMap::const_iterator itScreenThat = d.mapScreens.find(i);
         if (itScreen->second == itScreenThat->second)
         {
@@ -4409 +4409 @@
         else if (pelmHwChild->nameEquals("VideoCapture"))
         {
-            pelmHwChild->getAttributeValue("enabled",   hw.captureSettings.fEnabled);
+            pelmHwChild->getAttributeValue("enabled",   hw.recordSettings.fEnabled);
 
             /* Right now I don't want to bump the settings version, so just convert the enabled
@@ -4418 +4418 @@
             /* 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];
+            Assert(hw.recordSettings.mapScreens.size()); /* At least screen must be present. */
+            RecordScreenSettings &screen0Settings = hw.recordSettings.mapScreens[0];
 
             pelmHwChild->getAttributeValue("maxTime",   screen0Settings.ulMaxTimeS);
@@ -4433 +4433 @@
             {
                 /* Add screen i to config in any case. */
-                hw.captureSettings.mapScreens[i] = screen0Settings;
+                hw.recordSettings.mapScreens[i] = screen0Settings;
 
                 if (u64VideoCaptureScreens & RT_BIT_64(i)) /* Screen i enabled? */
-                    hw.captureSettings.mapScreens[i].fEnabled = true;
+                    hw.recordSettings.mapScreens[i].fEnabled = true;
             }
         }
@@ -5820 +5820 @@
     }
 
-    if (m->sv >= SettingsVersion_v1_14 && !hw.captureSettings.areDefaultSettings())
+    if (m->sv >= SettingsVersion_v1_14 && !hw.recordSettings.areDefaultSettings())
     {
         xml::ElementNode *pelmVideoCapture = pelmHardware->createChild("VideoCapture");
 
-        if (hw.captureSettings.fEnabled)
-            pelmVideoCapture->setAttribute("enabled", hw.captureSettings.fEnabled);
+        if (hw.recordSettings.fEnabled)
+            pelmVideoCapture->setAttribute("enabled", hw.recordSettings.fEnabled);
 
         /* Right now I don't want to bump the settings version, so just convert the enabled
          * screens to the former uint64t_t bit array and vice versa. */
         uint64_t u64VideoCaptureScreens = 0;
-        CaptureScreenMap::const_iterator itScreen = hw.captureSettings.mapScreens.begin();
-        while (itScreen != hw.captureSettings.mapScreens.end())
+        RecordScreenMap::const_iterator itScreen = hw.recordSettings.mapScreens.begin();
+        while (itScreen != hw.recordSettings.mapScreens.end())
         {
             if (itScreen->second.fEnabled)
@@ -5843 +5843 @@
         /* 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());
-        const CaptureScreenMap::const_iterator itScreen0Settings = hw.captureSettings.mapScreens.find(0);
-        Assert(itScreen0Settings != hw.captureSettings.mapScreens.end());
+        Assert(hw.recordSettings.mapScreens.size());
+        const RecordScreenMap::const_iterator itScreen0Settings = hw.recordSettings.mapScreens.find(0);
+        Assert(itScreen0Settings != hw.recordSettings.mapScreens.end());
 
         if (itScreen0Settings->second.ulMaxTimeS)
@@ -7442 +7442 @@
             || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy
             || machineUserData.ovIcon.size() > 0
-            || hardwareMachine.captureSettings.fEnabled)
+            || hardwareMachine.recordSettings.fEnabled)
         {
             m->sv = SettingsVersion_v1_14;