Changeset 75279 in vbox

Timestamp:

Nov 6, 2018 12:37:11 PM (6 years ago)

Author:

vboxsync

Message:

Capturing: Use uint32_t as internal screen settings screen ID.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• src/VBox/Main/include/CaptureScreenSettingsImpl.h (modified) (1 diff)
• src/VBox/Main/include/CaptureSettingsImpl.h (modified) (1 diff)
• src/VBox/Main/src-server/CaptureScreenSettingsImpl.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/CaptureSettingsImpl.cpp (modified) (2 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (2 diffs)

trunk/include/VBox/settings.h

@@ -549 +549 @@
 
 /** Map for keeping settings per virtual screen. */
-typedef std::map<unsigned long, CaptureScreenSettings> CaptureScreenMap;
+typedef std::map<uint32_t, CaptureScreenSettings> CaptureScreenMap;
 
 /**

trunk/src/VBox/Main/include/CaptureScreenSettingsImpl.h

@@ -39 +39 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Machine *aParent, unsigned long uScreenId, const settings::CaptureScreenSettings& data);
+    HRESULT init(Machine *aParent, uint32_t uScreenId, const settings::CaptureScreenSettings& data);
     HRESULT init(Machine *aParent, CaptureScreenSettings *that);
     HRESULT initCopy(Machine *aParent, CaptureScreenSettings *that);

trunk/src/VBox/Main/include/CaptureSettingsImpl.h

@@ -68 +68 @@
 
     /** Map of screen settings objects. The key specifies the screen ID. */
-    typedef std::map <ULONG, ComObjPtr<CaptureScreenSettings> > CaptureScreenSettingsMap;
+    typedef std::map <uint32_t, ComObjPtr<CaptureScreenSettings> > CaptureScreenSettingsMap;
 
     struct Data;

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

@@ -43 +43 @@
     Machine * const                  pMachine;
     ComObjPtr<CaptureScreenSettings> pPeer;
-    unsigned long                    uScreenId;
+    uint32_t                         uScreenId;
 
     // use the XML settings structure in the members for simplicity
@@ -73 +73 @@
  * @returns COM result indicator
  */
-HRESULT CaptureScreenSettings::init(Machine *aParent, unsigned long uScreenId, const settings::CaptureScreenSettings &data)
+HRESULT CaptureScreenSettings::init(Machine *aParent, uint32_t uScreenId, const settings::CaptureScreenSettings& data)
 {
     LogFlowThisFuncEnter();

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

@@ -292 +292 @@
     HRESULT rc = S_OK;
 
+    m->mapScreenSettings.clear();
+
     settings::CaptureScreenMap::const_iterator itScreen = data.mapScreens.begin();
     while (itScreen != data.mapScreens.end())
@@ -303 +305 @@
         if (FAILED(rc))
             break;
+
+        m->mapScreenSettings[itScreen->first] = captureScreenSettings;
 
         ++itScreen;

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

@@ -2479 +2479 @@
 
     CaptureScreenSettings screenSettings; /* Apply default settings. */
-    for (unsigned long l = 0; l < SchemaDefs::MaxGuestMonitors; l++)
+    for (uint32_t l = 0; l < SchemaDefs::MaxGuestMonitors; l++)
     {
         mapScreens[l] = screenSettings;
@@ -2517 +2517 @@
 
     CaptureScreenMap::const_iterator itScreen = mapScreens.begin();
-    unsigned long i = 0;
+    uint32_t i = 0;
     while (itScreen != mapScreens.end())
     {