Changeset 98621 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 17, 2023 3:21:52 PM (2 years ago)

Author:

vboxsync

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

155917

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CConsole wrapper usage step-by-step; This one is about webcams stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (1 diff)
• runtime/UIMachine.h (modified) (1 diff)
• runtime/UIMachineDefs.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (5 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -758 +758 @@
         QApplication::translate("UIMessageCenter", "Failed to acquire update agent parameter.") +
         UIErrorString::formatErrorInfo(comAgent));
+}
+
+/* static */
+void UINotificationMessage::cannotAcquireEmulatedUSBParameter(const CEmulatedUSB &comDispatcher)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Emulated USB failure ..."),
+        QApplication::translate("UIMessageCenter", "Failed to acquire emulated USB parameter.") +
+        UIErrorString::formatErrorInfo(comDispatcher));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -326 +326 @@
           * @param  comAgent  Brings the object parameter get acquired from. */
         static void cannotAcquireUpdateAgentParameter(const CUpdateAgent &comAgent);
+        /** Notifies about inability to acquire IEmulatedUSB parameter.
+          * @param  comDispatcher  Brings the object parameter get acquired from. */
+        static void cannotAcquireEmulatedUSBParameter(const CEmulatedUSB &comDispatcher);
         /** Notifies about inability to acquire IVirtualSystemDescription parameter.
           * @param  comVsd  Brings the object parameter get acquired from. */

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

@@ -559 +559 @@
 {
     return uisession()->detachUSBDevice(uId);
+}
+
+bool UIMachine::webcamDevices(QList<WebcamDeviceInfo> &guiWebcamDevices)
+{
+    return uisession()->webcamDevices(guiWebcamDevices);
+}
+
+bool UIMachine::webcamAttach(const QString &strPath, const QString &strName)
+{
+    return uisession()->webcamAttach(strPath, strName);
+}
+
+bool UIMachine::webcamDetach(const QString &strPath, const QString &strName)
+{
+    return uisession()->webcamDetach(strPath, strName);
 }
 

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

@@ -417 +417 @@
         /** Detaches USB device with passed @a uId. */
         bool detachUSBDevice(const QUuid &uId);
+
+        /** Returns a list of web cam devices. */
+        bool webcamDevices(QList<WebcamDeviceInfo> &guiWebcamDevices);
+        /** Attaches web cam device with passed @a strName and @a strPath. */
+        bool webcamAttach(const QString &strPath, const QString &strName);
+        /** Detaches web cam device with passed @a strName and @a strPath. */
+        bool webcamDetach(const QString &strPath, const QString &strName);
     /** @} */
 

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

@@ -88 +88 @@
 };
 
+/** Robust struct to bring web cam device info to machine-logic. */
+struct WebcamDeviceInfo
+{
+    QString  m_strName;
+    QString  m_strPath;
+    QString  m_strToolTip;
+    bool     m_fIsChecked;
+};
+
 #endif /* !FEQT_INCLUDED_SRC_runtime_UIMachineDefs_h */

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

@@ -1107 +1107 @@
     m_menuUpdateHandlers[UIActionIndexRT_M_Devices_M_Network] =         &UIMachineLogic::updateMenuDevicesNetwork;
     m_menuUpdateHandlers[UIActionIndexRT_M_Devices_M_USBDevices] =      &UIMachineLogic::updateMenuDevicesUSB;
-    m_menuUpdateHandlers[UIActionIndexRT_M_Devices_M_WebCams] =         &UIMachineLogic::updateMenuDevicesWebCams;
+    m_menuUpdateHandlers[UIActionIndexRT_M_Devices_M_WebCams] =         &UIMachineLogic::updateMenuDevicesWebcams;
     m_menuUpdateHandlers[UIActionIndexRT_M_Devices_M_SharedClipboard] = &UIMachineLogic::updateMenuDevicesSharedClipboard;
     m_menuUpdateHandlers[UIActionIndexRT_M_Devices_M_DragAndDrop] =     &UIMachineLogic::updateMenuDevicesDragAndDrop;
@@ -2280 +2280 @@
 }
 
-void UIMachineLogic::sltAttachWebCamDevice()
+void UIMachineLogic::sltAttachWebcamDevice()
 {
     /* Get and check sender action object: */
@@ -2289 +2289 @@
     WebCamTarget target = pAction->data().value<WebCamTarget>();
 
-    /* Get current emulated USB: */
-    CEmulatedUSB dispatcher = console().GetEmulatedUSB();
-
     /* Attach webcam device: */
     if (target.attach)
-    {
-        /* Try to attach corresponding device: */
-        dispatcher.WebcamAttach(target.path, "");
-        /* Check if dispatcher is OK: */
-        if (!dispatcher.isOk())
-            UINotificationMessage::cannotAttachWebCam(dispatcher, target.name, machineName());
-    }
+        uimachine()->webcamAttach(target.path, target.name);
     /* Detach webcam device: */
     else
-    {
-        /* Try to detach corresponding device: */
-        dispatcher.WebcamDetach(target.path);
-        /* Check if dispatcher is OK: */
-        if (!dispatcher.isOk())
-            UINotificationMessage::cannotDetachWebCam(dispatcher, target.name, machineName());
-    }
+        uimachine()->webcamDetach(target.path, target.name);
 }
 
@@ -2818 +2803 @@
 }
 
-void UIMachineLogic::updateMenuDevicesWebCams(QMenu *pMenu)
+void UIMachineLogic::updateMenuDevicesWebcams(QMenu *pMenu)
 {
     /* Clear contents: */
     pMenu->clear();
 
-    /* Get current host: */
-    const CHost host = uiCommon().host();
-    /* Get host webcam list: */
-    const CHostVideoInputDeviceVector webcams = host.GetVideoInputDevices();
+    /* Acquire device list: */
+    QList<WebcamDeviceInfo> guiWebcamDevices;
+    const bool fSuccess = uimachine()->webcamDevices(guiWebcamDevices);
 
     /* If webcam list is empty: */
-    if (webcams.isEmpty())
+    if (!fSuccess || guiWebcamDevices.isEmpty())
     {
         /* Add only one - "empty" action: */
@@ -2842 +2826 @@
     {
         /* Populate menu with host webcams: */
-        const QVector<QString> attachedWebcamPaths = console().GetEmulatedUSB().GetWebcams();
-        foreach (const CHostVideoInputDevice &webcam, webcams)
-        {
-            /* Get webcam data: */
-            const QString strWebcamName = webcam.GetName();
-            const QString strWebcamPath = webcam.GetPath();
-
-            /* Create/configure webcam action: */
-            QAction *pAttachWebcamAction = pMenu->addAction(strWebcamName,
-                                                            this, SLOT(sltAttachWebCamDevice()));
-            pAttachWebcamAction->setToolTip(uiCommon().usbToolTip(webcam));
+        foreach (const WebcamDeviceInfo &guiWebcamDevice, guiWebcamDevices)
+        {
+            /* Create webcam device action: */
+            QAction *pAttachWebcamAction = pMenu->addAction(guiWebcamDevice.m_strName,
+                                                            this, SLOT(sltAttachWebcamDevice()));
+            pAttachWebcamAction->setToolTip(guiWebcamDevice.m_strToolTip);
             pAttachWebcamAction->setCheckable(true);
-
-            /* Check if that webcam was already attached to this session: */
-            pAttachWebcamAction->setChecked(attachedWebcamPaths.contains(strWebcamPath));
-
-            /* Set USB attach data: */
-            pAttachWebcamAction->setData(QVariant::fromValue(WebCamTarget(!pAttachWebcamAction->isChecked(), strWebcamName, strWebcamPath)));
+            pAttachWebcamAction->setChecked(guiWebcamDevice.m_fIsChecked);
+            pAttachWebcamAction->setData(QVariant::fromValue(WebCamTarget(!pAttachWebcamAction->isChecked(),
+                                                                          guiWebcamDevice.m_strName,
+                                                                          guiWebcamDevice.m_strPath)));
         }
     }

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

@@ -302 +302 @@
     void sltOpenSettingsDialogSharedFolders();
     void sltAttachUSBDevice();
-    void sltAttachWebCamDevice();
+    void sltAttachWebcamDevice();
     void sltChangeSharedClipboardType(QAction *pAction);
     void sltToggleNetworkAdapterConnection();
@@ -353 +353 @@
     void updateMenuDevicesUSB(QMenu *pMenu);
     /** Update 'Devices' : 'Web Cams' menu routine. */
-    void updateMenuDevicesWebCams(QMenu *pMenu);
+    void updateMenuDevicesWebcams(QMenu *pMenu);
     /** Update 'Devices' : 'Shared Clipboard' menu routine. */
     void updateMenuDevicesSharedClipboard(QMenu *pMenu);

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

@@ -57 +57 @@
 
 /* COM includes: */
+#include "CEmulatedUSB.h"
 #include "CGraphicsAdapter.h"
 #include "CHostNetworkInterface.h"
 #include "CHostUSBDevice.h"
+#include "CHostVideoInputDevice.h"
 #include "CMedium.h"
 #include "CMediumAttachment.h"
@@ -466 +468 @@
         UINotificationMessage::cannotDetachUSBDevice(comConsole, uiCommon().usbDetails(comUSBDevice));
         /// @todo make sure UICommon::usbDetails is checked for errors as well
+    }
+    return fSuccess;
+}
+
+bool UISession::webcamDevices(QList<WebcamDeviceInfo> &guiWebcamDevices)
+{
+    const CHost comHost = uiCommon().host();
+    const CHostVideoInputDeviceVector comHostVideoInputDevices = comHost.GetVideoInputDevices();
+    bool fSuccess = comHost.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireHostParameter(comHost);
+    else
+    {
+        CConsole comConsole = console();
+        CEmulatedUSB comEmulatedUSB = comConsole.GetEmulatedUSB();
+        fSuccess = comConsole.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireConsoleParameter(comConsole);
+        else
+        {
+            const QVector<QString> attachedWebcamPaths = comEmulatedUSB.GetWebcams();
+            fSuccess = comEmulatedUSB.isOk();
+            if (!fSuccess)
+                UINotificationMessage::cannotAcquireEmulatedUSBParameter(comEmulatedUSB);
+            else
+            {
+                foreach (const CHostVideoInputDevice &comHostVideoInputDevice, comHostVideoInputDevices)
+                {
+                    /* Fill structure fields: */
+                    WebcamDeviceInfo guiWebcamDevice;
+                    if (fSuccess)
+                    {
+                        guiWebcamDevice.m_strName = comHostVideoInputDevice.GetName();
+                        fSuccess = comHostVideoInputDevice.isOk();
+                    }
+                    if (fSuccess)
+                    {
+                        guiWebcamDevice.m_strPath = comHostVideoInputDevice.GetPath();
+                        fSuccess = comHostVideoInputDevice.isOk();
+                    }
+                    if (fSuccess)
+                    {
+                        /// @todo make sure UICommon::usbToolTip is checked for errors as well
+                        guiWebcamDevice.m_strToolTip = uiCommon().usbToolTip(comHostVideoInputDevice);
+                        fSuccess = comHostVideoInputDevice.isOk();
+                    }
+                    if (fSuccess)
+                        guiWebcamDevice.m_fIsChecked = attachedWebcamPaths.contains(guiWebcamDevice.m_strPath);
+
+                    /* Append or break if necessary: */
+                    if (fSuccess)
+                        guiWebcamDevices << guiWebcamDevice;
+                    else
+                        break;
+                }
+            }
+        }
+    }
+    return fSuccess;
+}
+
+bool UISession::webcamAttach(const QString &strPath, const QString &strName)
+{
+    CConsole comConsole = console();
+    CEmulatedUSB comDispatcher = comConsole.GetEmulatedUSB();
+    bool fSuccess = comConsole.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireConsoleParameter(comConsole);
+    else
+    {
+        comDispatcher.WebcamAttach(strPath, "");
+        fSuccess = comDispatcher.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAttachWebCam(comDispatcher, strName, machineName());
+    }
+    return fSuccess;
+}
+
+bool UISession::webcamDetach(const QString &strPath, const QString &strName)
+{
+    CConsole comConsole = console();
+    CEmulatedUSB comDispatcher = comConsole.GetEmulatedUSB();
+    bool fSuccess = comConsole.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireConsoleParameter(comConsole);
+    else
+    {
+        comDispatcher.WebcamDetach(strPath);
+        fSuccess = comDispatcher.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotDetachWebCam(comDispatcher, strName, machineName());
     }
     return fSuccess;

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

@@ -282 +282 @@
         /** Detaches USB device with passed @a uId. */
         bool detachUSBDevice(const QUuid &uId);
+
+        /** Returns a list of web cam devices. */
+        bool webcamDevices(QList<WebcamDeviceInfo> &guiWebcamDevices);
+        /** Attaches web cam device with passed @a strName and @a strPath. */
+        bool webcamAttach(const QString &strPath, const QString &strName);
+        /** Detaches web cam device with passed @a strName and @a strPath. */
+        bool webcamDetach(const QString &strPath, const QString &strName);
     /** @} */