Changeset 98829 in vbox

Timestamp:

Mar 3, 2023 12:20:45 PM (2 years ago)

Author:

vboxsync

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

156151

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Remaining USB related stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (4 diffs)
• UIMachine.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -794 +794 @@
 {
     return uisession()->updateMachineStorage(target, pActionPool);
+}
+
+void UIMachine::acquireWhetherUSBControllerEnabled(bool &fEnabled)
+{
+    return uisession()->acquireWhetherUSBControllerEnabled(fEnabled);
+}
+
+void UIMachine::acquireWhetherVideoInputDevicesEnabled(bool &fEnabled)
+{
+    return uisession()->acquireWhetherVideoInputDevicesEnabled(fEnabled);
 }
 
@@ -1815 +1825 @@
 {
     /* Get host and prepare restrictions: */
-    const CHost comHost = uiCommon().host();
     UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictionForMachine =
         UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Invalid;
@@ -1885 +1894 @@
     {
         /* Check whether there is at least one USB controller with an available proxy. */
-        const bool fUSBEnabled =    !uisession()->machine().GetUSBDeviceFilters().isNull()
-                                 && !uisession()->machine().GetUSBControllers().isEmpty()
-                                 && uisession()->machine().GetUSBProxyAvailable();
+        bool fUSBEnabled = false;
+        acquireWhetherUSBControllerEnabled(fUSBEnabled);
         if (!fUSBEnabled)
             restrictionForDevices = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)
@@ -1896 +1904 @@
     {
         /* Check whether there is an accessible video input devices pool: */
-        comHost.GetVideoInputDevices();
-        const bool fWebCamsEnabled = comHost.isOk() && !uisession()->machine().GetUSBControllers().isEmpty();
+        bool fWebCamsEnabled = false;
+        acquireWhetherVideoInputDevicesEnabled(fWebCamsEnabled);
         if (!fWebCamsEnabled)
             restrictionForDevices = (UIExtraDataMetaDefs::RuntimeMenuDevicesActionType)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -544 +544 @@
     /** @name USB stuff.
      ** @{ */
+        /** Acquires whether USB controller is enabled. */
+        void acquireWhetherUSBControllerEnabled(bool &fEnabled);
+        /** Acquires whether video input devices are enabled. */
+        void acquireWhetherVideoInputDevicesEnabled(bool &fEnabled);
+
         /** Returns a list of USB devices. */
         bool usbDevices(QList<USBDeviceInfo> &guiUSBDevices);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -909 +909 @@
     CMachine comMachine = machine();
     uiCommon().updateMachineStorage(comMachine, target, pActionPool);
+}
+
+void UISession::acquireWhetherUSBControllerEnabled(bool &fEnabled)
+{
+    fEnabled = false;
+
+    /* Check whether USB device filters are available: */
+    CMachine comMachine = machine();
+    CUSBDeviceFilters comUSBDeviceFilters = comMachine.GetUSBDeviceFilters();
+    if (!comMachine.isOk() || comUSBDeviceFilters.isNull())
+        return;
+    /* Check whether USB controllers are available: */
+    CUSBControllerVector comUSBControllers = comMachine.GetUSBControllers();
+    if (!comMachine.isOk() || comUSBControllers.isEmpty())
+        return;
+    /* Check whether USB proxy is available: */
+    const BOOL fUSBProxyAvailable = comMachine.GetUSBProxyAvailable();
+    if (!comMachine.isOk() || fUSBProxyAvailable == FALSE)
+        return;
+
+    fEnabled = true;
+}
+
+void UISession::acquireWhetherVideoInputDevicesEnabled(bool &fEnabled)
+{
+    fEnabled = false;
+
+    /* Check whether video input devices are available: */
+    CHost comHost = uiCommon().host();
+    CHostVideoInputDeviceVector comVideoInputDevices = comHost.GetVideoInputDevices();
+    if (!comHost.isOk() || comVideoInputDevices.isEmpty())
+        return;
+    /* Check whether USB controllers are available: */
+    CMachine comMachine = machine();
+    CUSBControllerVector comUSBControllers = comMachine.GetUSBControllers();
+    if (!comMachine.isOk() || comUSBControllers.isEmpty())
+        return;
+
+    fEnabled = true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -354 +354 @@
     /** @name USB stuff.
      ** @{ */
+        /** Acquires whether USB controller is enabled. */
+        void acquireWhetherUSBControllerEnabled(bool &fEnabled);
+        /** Acquires whether video input devices are enabled. */
+        void acquireWhetherVideoInputDevicesEnabled(bool &fEnabled);
+
         /** Returns a list of USB devices. */
         bool usbDevices(QList<USBDeviceInfo> &guiUSBDevices);