Changeset 81964 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

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.

Location:

trunk/include/VBox

Files:

• log.h (modified) (2 diffs)
• settings.h (modified) (3 diffs)

trunk/include/VBox/log.h

@@ -431 +431 @@
     /** Main group, IFsObjInfo. */
     LOG_GROUP_MAIN_FSOBJINFO,
+    /** Main group, IGraphicsAdapter. */
+    LOG_GROUP_MAIN_GRAPHICSADAPTER,
     /** Main group, IGuest. */
     LOG_GROUP_MAIN_GUEST,
@@ -944 +946 @@
     "MAIN_FRAMEBUFFEROVERLAY", \
     "MAIN_FSOBJINFO", \
+    "MAIN_GRAPHICSADAPTER", \
     "MAIN_GUEST", \
     "MAIN_GUESTDIRECTORY", \

trunk/include/VBox/settings.h

@@ -653 +653 @@
      *  The key specifies the screen ID. */
     RecordingScreenMap mapScreens;
+};
+
+/**
+ * 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 GraphicsAdapter
+{
+    GraphicsAdapter();
+
+    bool areDefaultSettings() const;
+
+    bool operator==(const GraphicsAdapter &g) const;
+
+    GraphicsControllerType_T graphicsControllerType;
+    uint32_t            ulVRAMSizeMB;
+    uint32_t            cMonitors;
+    bool                fAccelerate3D,
+                        fAccelerate2DVideo;     // requires settings version 1.8 (VirtualBox 3.1)
 };
 
@@ -1112 +1132 @@
     BootOrderMap        mapBootOrder;           // item 0 has highest priority
 
-    GraphicsControllerType_T graphicsControllerType;
-    uint32_t            ulVRAMSizeMB;
-    uint32_t            cMonitors;
-    bool                fAccelerate3D,
-                        fAccelerate2DVideo;     // requires settings version 1.8 (VirtualBox 3.1)
-
     FirmwareType_T      firmwareType;           // requires settings version 1.9 (VirtualBox 3.1)
 
@@ -1133 +1147 @@
     BIOSSettings        biosSettings;
     RecordingSettings   recordingSettings;
+    GraphicsAdapter     graphicsAdapter;
     USB                 usbSettings;
     NetworkAdaptersList llNetworkAdapters;