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

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/src/VBox/Main/src-server

Files:

• CaptureScreenSettingsImpl.cpp (modified) (2 diffs)
• CaptureSettingsImpl.cpp (modified) (2 diffs)

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;