Changeset 73938 in vbox for trunk

Timestamp:

Aug 29, 2018 7:31:32 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8472. Change media enumeration function so that it accepts a CMediumVector to start enumeration with

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• medium/UIMediumEnumerator.cpp (modified) (2 diffs)
• medium/UIMediumEnumerator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2414 +2414 @@
 }
 
-void VBoxGlobal::startMediumEnumeration()
+void VBoxGlobal::startMediumEnumeration(const CMediumVector &mediaList /* = CMediumVector() */)
 {
     /* Make sure VBoxGlobal is already valid: */
@@ -2440 +2440 @@
         /* Redirect request to medium-enumerator: */
         if (m_pMediumEnumerator)
-            m_pMediumEnumerator->enumerateMedia();
+            m_pMediumEnumerator->enumerateMedia(mediaList);
         m_meCleanupProtectionToken.unlock();
     }

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -34 +34 @@
 /* COM includes: */
 #include "VBox/com/Guid.h"
+#include "CGuestOSType.h"
 #include "CHost.h"
+#include "CMedium.h"
+#include "CSession.h"
 #include "CVirtualBoxClient.h"
 #include "CVirtualBox.h"
-#include "CSession.h"
-#include "CGuestOSType.h"
 
 /* Other includes: */
@@ -53 +54 @@
 class CHostVideoInputDevice;
 class CMachine;
-class CMedium;
 class CUSBDevice;
 class UIMedium;
@@ -477 +477 @@
      * @{ */
         /** Starts medium enumeration. */
-        void startMediumEnumeration();
+        void startMediumEnumeration(const CMediumVector &mediaList = CMediumVector());
         /** Calls refresh for each medium which has been already enumerated. */
         void refreshMedia();

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -136 +136 @@
 }
 
-void UIMediumEnumerator::enumerateMedia()
+void UIMediumEnumerator::enumerateMedia(const CMediumVector &mediaList /* = CMediumVector() */)
 {
     /* Make sure we are not already in progress: */
@@ -145 +145 @@
     UIMediumMap media;
     addNullMediumToMap(media);
-    addMediaToMap(vboxGlobal().virtualBox().GetHardDisks(), media);
-    addMediaToMap(vboxGlobal().host().GetDVDDrives(), media);
-    addMediaToMap(vboxGlobal().virtualBox().GetDVDImages(), media);
-    addMediaToMap(vboxGlobal().host().GetFloppyDrives(), media);
-    addMediaToMap(vboxGlobal().virtualBox().GetFloppyImages(), media);
+    /* If @p mediaList is empty we start the media enumeration with all known media: */
+    if (mediaList.isEmpty())
+    {
+        addMediaToMap(vboxGlobal().virtualBox().GetHardDisks(), media);
+        addMediaToMap(vboxGlobal().host().GetDVDDrives(), media);
+        addMediaToMap(vboxGlobal().virtualBox().GetDVDImages(), media);
+        addMediaToMap(vboxGlobal().host().GetFloppyDrives(), media);
+        addMediaToMap(vboxGlobal().virtualBox().GetFloppyImages(), media);
+    }
+    else
+        addMediaToMap(mediaList, media);
     if (VBoxGlobal::isCleaningUp())
         return; /* VBoxGlobal is cleaning up, abort immediately. */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -65 +65 @@
     /* API: Medium-enumeration stuff: */
     bool isMediumEnumerationInProgress() const { return m_fMediumEnumerationInProgress; }
-    void enumerateMedia();
+    void enumerateMedia(const CMediumVector &mediaList = CMediumVector());
     void refreshMedia();