Changeset 49337 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Oct 30, 2013 4:53:58 PM (11 years ago)

Author:

vboxsync

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

90338

Message:

FE/Qt: 7037: Runtime UI: Fixing some webcams related stuff for r90326.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)

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

@@ -1084 +1084 @@
 {
     QStringList records;
-
-    QString strAlias = webcam.GetAlias();
-    if (!strAlias.isEmpty())
-        records << tr("<nobr>Alias: %1</nobr>", "webcam tooltip").arg(strAlias);
 
     QString strName = webcam.GetName();

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

@@ -1471 +1471 @@
     {
         /* Check whether there is an accessible video input devices pool: */
-        const CHostVideoInputDeviceVector &webcams = host.GetVideoInputDevices();
-        bool fWebCamsEnabled = host.isOk(); Q_UNUSED(webcams);
+        const CHostVideoInputDeviceVector &webcams = host.GetVideoInputDevices(); Q_UNUSED(webcams);
+        ULONG cOhciCtls = machine.GetUSBControllerCountByType(KUSBControllerType_OHCI);
+        bool fWebCamsEnabled = host.isOk() && cOhciCtls && machine.GetUSBProxyAvailable();
 
         /* Show/Hide WebCams menu depending on ExtPack availability: */