Changeset 48578 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 20, 2013 10:35:43 AM (11 years ago)

Author:

vboxsync

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

89135

Message:

IHost::VideoCaptureDevices

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/HostImpl.h (modified) (1 diff)
• include/HostVideoCaptureDeviceImpl.h (added)
• src-server/HostImpl.cpp (modified) (2 diffs)
• src-server/HostVideoCaptureDeviceImpl.cpp (added)

trunk/src/VBox/Main/Makefile.kmk

@@ -349 +349 @@
         src-server/HostNetworkInterfaceImpl.cpp \
         src-server/HostPower.cpp \
+        src-server/HostVideoCaptureDeviceImpl.cpp \
         src-server/MachineImpl.cpp \
         src-server/MachineImplCloneVM.cpp \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8309 +8309 @@
 
   <interface
+    name="IHostVideoCaptureDevice" extends="$unknown"
+    uuid="b3979ea4-bf32-4a03-8158-44d64a59487d"
+    wsmap="managed"
+    >
+    <desc>
+      Represents one of host's video capture devices, for example a webcam.
+    </desc>
+    <attribute name="name" type="wstring" readonly="yes">
+      <desc>User friendly name.</desc>
+    </attribute>
+
+    <attribute name="path" type="wstring" readonly="yes">
+      <desc>The host path of the device.</desc>
+    </attribute>
+
+    <attribute name="alias" type="wstring" readonly="yes">
+      <desc>An alias which can be used for IConsole::webcamAttach</desc>
+    </attribute>
+
+  </interface>
+
+  <interface
     name="IHost" extends="$unknown"
-    uuid="a6107246-f939-42c4-82b6-8aca40327b6d"
+    uuid="e1e3150d-1764-4819-b53a-c09a75a8b8f0"
     wsmap="managed"
     >
@@ -8765 +8787 @@
       </param>
     </method>
+
+    <attribute name="videoCaptureDevices" type="IHostVideoCaptureDevice" safearray="yes" readonly="yes">
+      <desc>List of currently available host video capture devices.</desc>
+    </attribute>
 
   </interface>

trunk/src/VBox/Main/include/HostImpl.h

@@ -78 +78 @@
     STDMETHOD(COMGETTER(UTCTime))(LONG64 *aUTCTime);
     STDMETHOD(COMGETTER(Acceleration3DAvailable))(BOOL *aSupported);
+    STDMETHOD(COMGETTER(VideoCaptureDevices))(ComSafeArrayOut(IHostVideoCaptureDevice*, aVideoCaptureDevices));
 
     // IHost methods

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -32 +32 @@
 
 #include "HostNetworkInterfaceImpl.h"
+#include "HostVideoCaptureDeviceImpl.h"
 #include "MachineImpl.h"
 #include "AutoCaller.h"
@@ -1724 +1725 @@
     Bstr(mac).cloneTo(aAddress);
     return S_OK;
+}
+
+/**
+ * Returns a list of host video capture devices (webcams, etc).
+ *
+ * @returns COM status code
+ * @param aVideoCaptureDevices Array of interface pointers to be filled.
+ */
+STDMETHODIMP Host::COMGETTER(VideoCaptureDevices)(ComSafeArrayOut(IHostVideoCaptureDevice*, aVideoCaptureDevices))
+{
+    if (ComSafeArrayOutIsNull(aVideoCaptureDevices))
+        return E_POINTER;
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    HostVideoCaptureDeviceList list;
+
+    HRESULT hr = HostVideoCaptureDevice::queryHostDevices(&list);
+
+    if (SUCCEEDED(hr))
+    {
+        SafeIfaceArray<IHostVideoCaptureDevice> devices(list);
+        devices.detachTo(ComSafeArrayOutArg(aVideoCaptureDevices));
+    }
+
+    return hr;
 }