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

Timestamp:

Nov 18, 2019 8:42:02 PM (5 years ago)

Author:

vboxsync

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

134761

Message:

Main/GraphicsAdapter: Split off a few attributes from Machine interface, which affects quite a few other interfaces.
Frontends/VirtualBox+VBoxManage+VBoxSDL+VBoxShell: Adapt accordingly.

File:

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

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

@@ -2769 +2769 @@
  * Constructor. Needs to set sane defaults which stand the test of time.
  */
+GraphicsAdapter::GraphicsAdapter() :
+    graphicsControllerType(GraphicsControllerType_VBoxVGA),
+    ulVRAMSizeMB(8),
+    cMonitors(1),
+    fAccelerate3D(false),
+    fAccelerate2DVideo(false)
+{
+}
+
+/**
+ * Check if all settings have default values.
+ */
+bool GraphicsAdapter::areDefaultSettings() const
+{
+    return graphicsControllerType == GraphicsControllerType_VBoxVGA
+        && ulVRAMSizeMB == 8
+        && cMonitors <= 1
+        && !fAccelerate3D
+        && !fAccelerate2DVideo;
+}
+
+/**
+ * Comparison operator. This gets called from MachineConfigFile::operator==,
+ * which in turn gets called from Machine::saveSettings to figure out whether
+ * machine settings have really changed and thus need to be written out to disk.
+ */
+bool GraphicsAdapter::operator==(const GraphicsAdapter &g) const
+{
+    return (this == &g)
+        || (   graphicsControllerType         == g.graphicsControllerType
+            && ulVRAMSizeMB                   == g.ulVRAMSizeMB
+            && cMonitors                      == g.cMonitors
+            && fAccelerate3D                  == g.fAccelerate3D
+            && fAccelerate2DVideo             == g.fAccelerate2DVideo);
+}
+
+/**
+ * Constructor. Needs to set sane defaults which stand the test of time.
+ */
 USBController::USBController() :
     enmType(USBControllerType_Null)
@@ -3305 +3344 @@
     strCpuProfile("host"),
     ulMemorySizeMB((uint32_t)-1),
-    graphicsControllerType(GraphicsControllerType_VBoxVGA),
-    ulVRAMSizeMB(8),
-    cMonitors(1),
-    fAccelerate3D(false),
-    fAccelerate2DVideo(false),
     firmwareType(FirmwareType_BIOS),
     pointingHIDType(PointingHIDType_PS2Mouse),
@@ -3375 +3409 @@
            && (it1 != mapBootOrder.end() && it1->second == DeviceType_DVD)
            && (it2 != mapBootOrder.end() && it2->second == DeviceType_HardDisk);
-}
-
-/**
- * Check if all Display settings have default values.
- */
-bool Hardware::areDisplayDefaultSettings() const
-{
-    return graphicsControllerType == GraphicsControllerType_VBoxVGA
-        && ulVRAMSizeMB == 8
-        && cMonitors <= 1
-        && !fAccelerate3D
-        && !fAccelerate2DVideo;
 }
 
@@ -3445 +3467 @@
             && ulMemorySizeMB                 == h.ulMemorySizeMB
             && mapBootOrder                   == h.mapBootOrder
-            && graphicsControllerType         == h.graphicsControllerType
-            && ulVRAMSizeMB                   == h.ulVRAMSizeMB
-            && cMonitors                      == h.cMonitors
-            && fAccelerate3D                  == h.fAccelerate3D
-            && fAccelerate2DVideo             == h.fAccelerate2DVideo
             && firmwareType                   == h.firmwareType
             && pointingHIDType                == h.pointingHIDType
@@ -3459 +3476 @@
             && vrdeSettings                   == h.vrdeSettings
             && biosSettings                   == h.biosSettings
+            && graphicsAdapter                == h.graphicsAdapter
             && usbSettings                    == h.usbSettings
             && llNetworkAdapters              == h.llNetworkAdapters
@@ -4645 +4663 @@
             Utf8Str strGraphicsControllerType;
             if (!pelmHwChild->getAttributeValue("controller", strGraphicsControllerType))
-                hw.graphicsControllerType = GraphicsControllerType_VBoxVGA;
+                hw.graphicsAdapter.graphicsControllerType = GraphicsControllerType_VBoxVGA;
             else
             {
@@ -4660 +4678 @@
                 else
                     throw ConfigFileError(this, pelmHwChild, N_("Invalid value '%s' in Display/@controller attribute"), strGraphicsControllerType.c_str());
-                hw.graphicsControllerType = type;
-            }
-            pelmHwChild->getAttributeValue("VRAMSize", hw.ulVRAMSizeMB);
-            if (!pelmHwChild->getAttributeValue("monitorCount", hw.cMonitors))
-                pelmHwChild->getAttributeValue("MonitorCount", hw.cMonitors);       // pre-v1.5 variant
-            if (!pelmHwChild->getAttributeValue("accelerate3D", hw.fAccelerate3D))
-                pelmHwChild->getAttributeValue("Accelerate3D", hw.fAccelerate3D);   // pre-v1.5 variant
-            pelmHwChild->getAttributeValue("accelerate2DVideo", hw.fAccelerate2DVideo);
+                hw.graphicsAdapter.graphicsControllerType = type;
+            }
+            pelmHwChild->getAttributeValue("VRAMSize", hw.graphicsAdapter.ulVRAMSizeMB);
+            if (!pelmHwChild->getAttributeValue("monitorCount", hw.graphicsAdapter.cMonitors))
+                pelmHwChild->getAttributeValue("MonitorCount", hw.graphicsAdapter.cMonitors);       // pre-v1.5 variant
+            if (!pelmHwChild->getAttributeValue("accelerate3D", hw.graphicsAdapter.fAccelerate3D))
+                pelmHwChild->getAttributeValue("Accelerate3D", hw.graphicsAdapter.fAccelerate3D);   // pre-v1.5 variant
+            pelmHwChild->getAttributeValue("accelerate2DVideo", hw.graphicsAdapter.fAccelerate2DVideo);
         }
         else if (pelmHwChild->nameEquals("VideoCapture"))
@@ -4692 +4710 @@
             pelmHwChild->getAttributeValue("fps",       screen0Settings.Video.ulFPS);
 
-            for (unsigned i = 0; i < hw.cMonitors; i++) /* Don't add more settings than we have monitors configured. */
+            for (unsigned i = 0; i < hw.graphicsAdapter.cMonitors; i++) /* Don't add more settings than we have monitors configured. */
             {
                 /* Add screen i to config in any case. */
@@ -6080 +6098 @@
     }
 
-    if (!hw.areDisplayDefaultSettings())
+    if (!hw.graphicsAdapter.areDefaultSettings())
     {
         xml::ElementNode *pelmDisplay = pelmHardware->createChild("Display");
-        if (hw.graphicsControllerType != GraphicsControllerType_VBoxVGA)
+        if (hw.graphicsAdapter.graphicsControllerType != GraphicsControllerType_VBoxVGA)
         {
             const char *pcszGraphics;
-            switch (hw.graphicsControllerType)
+            switch (hw.graphicsAdapter.graphicsControllerType)
             {
                 case GraphicsControllerType_VBoxVGA:            pcszGraphics = "VBoxVGA"; break;
@@ -6095 +6113 @@
             pelmDisplay->setAttribute("controller", pcszGraphics);
         }
-        if (hw.ulVRAMSizeMB != 8)
-            pelmDisplay->setAttribute("VRAMSize", hw.ulVRAMSizeMB);
-        if (hw.cMonitors > 1)
-            pelmDisplay->setAttribute("monitorCount", hw.cMonitors);
-        if (hw.fAccelerate3D)
-            pelmDisplay->setAttribute("accelerate3D", hw.fAccelerate3D);
+        if (hw.graphicsAdapter.ulVRAMSizeMB != 8)
+            pelmDisplay->setAttribute("VRAMSize", hw.graphicsAdapter.ulVRAMSizeMB);
+        if (hw.graphicsAdapter.cMonitors > 1)
+            pelmDisplay->setAttribute("monitorCount", hw.graphicsAdapter.cMonitors);
+        if (hw.graphicsAdapter.fAccelerate3D)
+            pelmDisplay->setAttribute("accelerate3D", hw.graphicsAdapter.fAccelerate3D);
 
         if (m->sv >= SettingsVersion_v1_8)
         {
-            if (hw.fAccelerate2DVideo)
-                pelmDisplay->setAttribute("accelerate2DVideo", hw.fAccelerate2DVideo);
+            if (hw.graphicsAdapter.fAccelerate2DVideo)
+                pelmDisplay->setAttribute("accelerate2DVideo", hw.graphicsAdapter.fAccelerate2DVideo);
         }
     }
@@ -7786 +7804 @@
         // setting, explicit long mode setting, (video) capturing and NAT networking.
         if (   !hardwareMachine.strDefaultFrontend.isEmpty()
-            || hardwareMachine.graphicsControllerType != GraphicsControllerType_VBoxVGA
+            || hardwareMachine.graphicsAdapter.graphicsControllerType != GraphicsControllerType_VBoxVGA
             || hardwareMachine.enmLongMode != Hardware::LongMode_Legacy
             || machineUserData.ovIcon.size() > 0
@@ -8171 +8189 @@
     // "accelerate 2d video" requires settings version 1.8
     if (    (m->sv < SettingsVersion_v1_8)
-         && (hardwareMachine.fAccelerate2DVideo)
+         && (hardwareMachine.graphicsAdapter.fAccelerate2DVideo)
        )
         m->sv = SettingsVersion_v1_8;