Changeset 48607 in vbox for trunk

Timestamp:

Sep 20, 2013 3:47:37 PM (11 years ago)

Author:

vboxsync

Message:

VBoxManage,Main: VideoCaptureDevice -> VideoInputDevice

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (modified) (5 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (3 diffs)
• src/VBox/Main/include/HostImpl.h (modified) (1 diff)
• src/VBox/Main/include/HostVideoInputDeviceImpl.h (moved) (moved from trunk/src/VBox/Main/include/HostVideoCaptureDeviceImpl.h ) (3 diffs)
• src/VBox/Main/src-server/HostImpl.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp (moved) (moved from trunk/src/VBox/Main/src-server/HostVideoCaptureDeviceImpl.cpp ) (10 diffs)

trunk/include/VBox/log.h

@@ -376 +376 @@
     /** Main group, IHostUSBDeviceFilter. */
     LOG_GROUP_MAIN_HOSTUSBDEVICEFILTER,
-    /** Main group, IHostVideoCaptureDevice. */
-    LOG_GROUP_MAIN_HOSTVIDEOCAPTUREDEVICE,
+    /** Main group, IHostVideoInputDevice. */
+    LOG_GROUP_MAIN_HOSTVIDEOINPUTDEVICE,
     /** Main group, IInternalMachineControl. */
     LOG_GROUP_MAIN_INTERNALMACHINECONTROL,
@@ -845 +845 @@
     "MAIN_HOSTUSBDEVICE", \
     "MAIN_HOSTUSBDEVICEFILTER", \
-    "MAIN_HOSTVIDEOCAPTUREDEVICE", \
+    "MAIN_HOSTVIDEOINPUTDEVICE", \
     "MAIN_INTERNALMACHINECONTROL", \
     "MAIN_INTERNALSESSIONCONTROL", \

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -738 +738 @@
  * @param   pVirtualBox         Reference to the IVirtualBox pointer.
  */
-static HRESULT listVideoCaptureDevices(const ComPtr<IVirtualBox> pVirtualBox)
+static HRESULT listVideoInputDevices(const ComPtr<IVirtualBox> pVirtualBox)
 {
     HRESULT rc;
     ComPtr<IHost> host;
     CHECK_ERROR(pVirtualBox, COMGETTER(Host)(host.asOutParam()));
-    com::SafeIfaceArray<IHostVideoCaptureDevice> hostVideoCaptureDevices;
-    CHECK_ERROR(host, COMGETTER(VideoCaptureDevices)(ComSafeArrayAsOutParam(hostVideoCaptureDevices)));
-    RTPrintf("Video Capture Devices: %u\n", hostVideoCaptureDevices.size());
-    for (size_t i = 0; i < hostVideoCaptureDevices.size(); ++i)
-    {
-        ComPtr<IHostVideoCaptureDevice> p = hostVideoCaptureDevices[i];
+    com::SafeIfaceArray<IHostVideoInputDevice> hostVideoInputDevices;
+    CHECK_ERROR(host, COMGETTER(VideoInputDevices)(ComSafeArrayAsOutParam(hostVideoInputDevices)));
+    RTPrintf("Video Input Devices: %u\n", hostVideoInputDevices.size());
+    for (size_t i = 0; i < hostVideoInputDevices.size(); ++i)
+    {
+        ComPtr<IHostVideoInputDevice> p = hostVideoInputDevices[i];
         Bstr name;
         p->COMGETTER(Name)(name.asOutParam());
@@ -790 +790 @@
     kListGroups,
     kListNatNetworks,
-    kListVideoCaptureDevices
+    kListVideoInputDevices
 };
 
@@ -1124 +1124 @@
         }
 
-        case kListVideoCaptureDevices:
-            rc = listVideoCaptureDevices(pVirtualBox);
+        case kListVideoInputDevices:
+            rc = listVideoInputDevices(pVirtualBox);
             break;
 
@@ -1176 +1176 @@
         { "extpacks",           kListExtPacks,           RTGETOPT_REQ_NOTHING },
         { "groups",             kListGroups,             RTGETOPT_REQ_NOTHING },
-        { "webcams",            kListVideoCaptureDevices, RTGETOPT_REQ_NOTHING },
+        { "webcams",            kListVideoInputDevices,  RTGETOPT_REQ_NOTHING },
     };
 
@@ -1222 +1222 @@
             case kListGroups:
             case kListNatNetworks:
-            case kListVideoCaptureDevices:
+            case kListVideoInputDevices:
                 enmOptCommand = (enum enmListType)ch;
                 if (fOptMultiple)

trunk/src/VBox/Main/Makefile.kmk

@@ -350 +350 @@
         src-server/HostNetworkInterfaceImpl.cpp \
         src-server/HostPower.cpp \
-        src-server/HostVideoCaptureDeviceImpl.cpp \
+        src-server/HostVideoInputDeviceImpl.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"
+    name="IHostVideoInputDevice" extends="$unknown"
+    uuid="a1ceae44-d65e-4156-9359-d390f93ee9a0"
     wsmap="managed"
     >
@@ -8332 +8332 @@
   <interface
     name="IHost" extends="$unknown"
-    uuid="e1e3150d-1764-4819-b53a-c09a75a8b8f0"
+    uuid="93269330-48ca-4096-b4a2-1189df336267"
     wsmap="managed"
     >
@@ -8788 +8788 @@
     </method>
 
-    <attribute name="videoCaptureDevices" type="IHostVideoCaptureDevice" safearray="yes" readonly="yes">
+    <attribute name="videoInputDevices" type="IHostVideoInputDevice" safearray="yes" readonly="yes">
       <desc>List of currently available host video capture devices.</desc>
     </attribute>

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));
+    STDMETHOD(COMGETTER(VideoInputDevices))(ComSafeArrayOut(IHostVideoInputDevice*, aVideoInputDevices));
 
     // IHost methods

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

@@ -18 +18 @@
  */
 
-#ifndef HOSTVIDEOCAPTUREDEVICE_IMPL_H_
-#define HOSTVIDEOCAPTUREDEVICE_IMPL_H_
+#ifndef HOSTVIDEOINPUTDEVICE_IMPL_H_
+#define HOSTVIDEOINPUTDEVICE_IMPL_H_
 
-#include "HostVideoCaptureDeviceWrap.h"
+#include "HostVideoInputDeviceWrap.h"
 
 #include <list>
 
-class HostVideoCaptureDevice;
+class HostVideoInputDevice;
 
-typedef std::list<ComObjPtr<HostVideoCaptureDevice> > HostVideoCaptureDeviceList;
+typedef std::list<ComObjPtr<HostVideoInputDevice> > HostVideoInputDeviceList;
 
-class ATL_NO_VTABLE HostVideoCaptureDevice :
-    public HostVideoCaptureDeviceWrap
+class ATL_NO_VTABLE HostVideoInputDevice :
+    public HostVideoInputDeviceWrap
 {
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR(HostVideoCaptureDevice)
+    DECLARE_EMPTY_CTOR_DTOR(HostVideoInputDevice)
 
     HRESULT FinalConstruct();
@@ -43 +43 @@
     void uninit();
 
-    static HRESULT queryHostDevices(HostVideoCaptureDeviceList *pList);
+    static HRESULT queryHostDevices(HostVideoInputDeviceList *pList);
 
 private:
 
-    // wrapped IHostVideoCaptureDevice properties
+    // wrapped IHostVideoInputDevice properties
     virtual HRESULT getName(com::Utf8Str &aName) { aName = m.name; return S_OK; }
     virtual HRESULT getPath(com::Utf8Str &aPath) { aPath = m.path; return S_OK; }
@@ -67 +67 @@
 };
 
-#endif // HOSTVIDEOCAPTUREDEVICE_IMPL_H_
+#endif // HOSTVIDEOINPUTDEVICE_IMPL_H_
 
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -32 +32 @@
 
 #include "HostNetworkInterfaceImpl.h"
-#include "HostVideoCaptureDeviceImpl.h"
+#include "HostVideoInputDeviceImpl.h"
 #include "MachineImpl.h"
 #include "AutoCaller.h"
@@ -1731 +1731 @@
  *
  * @returns COM status code
- * @param aVideoCaptureDevices Array of interface pointers to be filled.
- */
-STDMETHODIMP Host::COMGETTER(VideoCaptureDevices)(ComSafeArrayOut(IHostVideoCaptureDevice*, aVideoCaptureDevices))
-{
-    if (ComSafeArrayOutIsNull(aVideoCaptureDevices))
+ * @param aVideoInputDevices Array of interface pointers to be filled.
+ */
+STDMETHODIMP Host::COMGETTER(VideoInputDevices)(ComSafeArrayOut(IHostVideoInputDevice*, aVideoInputDevices))
+{
+    if (ComSafeArrayOutIsNull(aVideoInputDevices))
         return E_POINTER;
 
@@ -1742 +1742 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    HostVideoCaptureDeviceList list;
-
-    HRESULT hr = HostVideoCaptureDevice::queryHostDevices(&list);
+    HostVideoInputDeviceList list;
+
+    HRESULT hr = HostVideoInputDevice::queryHostDevices(&list);
 
     if (SUCCEEDED(hr))
     {
-        SafeIfaceArray<IHostVideoCaptureDevice> devices(list);
-        devices.detachTo(ComSafeArrayOutArg(aVideoCaptureDevices));
+        SafeIfaceArray<IHostVideoInputDevice> devices(list);
+        devices.detachTo(ComSafeArrayOutArg(aVideoInputDevices));
     }
 

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

@@ -17 +17 @@
  */
 
-#include "HostVideoCaptureDeviceImpl.h"
+#include "HostVideoInputDeviceImpl.h"
 #include "Logging.h"
 
@@ -25 +25 @@
 
 /*
- * HostVideoCaptureDevice implementation.
- */
-DEFINE_EMPTY_CTOR_DTOR(HostVideoCaptureDevice)
-
-HRESULT HostVideoCaptureDevice::FinalConstruct()
+ * HostVideoInputDevice implementation.
+ */
+DEFINE_EMPTY_CTOR_DTOR(HostVideoInputDevice)
+
+HRESULT HostVideoInputDevice::FinalConstruct()
 {
     return BaseFinalConstruct();
 }
 
-void HostVideoCaptureDevice::FinalRelease()
+void HostVideoInputDevice::FinalRelease()
 {
     uninit();
@@ -44 +44 @@
  * Initializes the instance.
  */
-HRESULT HostVideoCaptureDevice::init(const com::Utf8Str &name, const com::Utf8Str &path, const com::Utf8Str &alias)
+HRESULT HostVideoInputDevice::init(const com::Utf8Str &name, const com::Utf8Str &path, const com::Utf8Str &alias)
 {
     LogFlowThisFunc(("\n"));
@@ -66 +66 @@
  * Called either from FinalRelease() or by the parent when it gets destroyed.
  */
-void HostVideoCaptureDevice::uninit()
+void HostVideoInputDevice::uninit()
 {
     LogFlowThisFunc(("\n"));
@@ -80 +80 @@
 }
 
-static HRESULT hostVideoCaptureDeviceAdd(HostVideoCaptureDeviceList *pList,
-                                         const com::Utf8Str &name,
-                                         const com::Utf8Str &path,
-                                         const com::Utf8Str &alias)
-{
-    ComObjPtr<HostVideoCaptureDevice> obj;
+static HRESULT hostVideoInputDeviceAdd(HostVideoInputDeviceList *pList,
+                                       const com::Utf8Str &name,
+                                       const com::Utf8Str &path,
+                                       const com::Utf8Str &alias)
+{
+    ComObjPtr<HostVideoInputDevice> obj;
     HRESULT hr = obj.createObject();
     if (SUCCEEDED(hr))
@@ -110 +110 @@
 }
 
-static HRESULT hvcdFillList(HostVideoCaptureDeviceList *pList, IEnumMoniker *pEnumMoniker)
+static HRESULT hvcdFillList(HostVideoInputDeviceList *pList, IEnumMoniker *pEnumMoniker)
 {
     int iDevice = 0;
@@ -159 +159 @@
         com::Utf8Str alias = com::Utf8StrFmt(".%d", iDevice);
 
-        hr = hostVideoCaptureDeviceAdd(pList, name, path, alias);
+        hr = hostVideoInputDeviceAdd(pList, name, path, alias);
 
         pPropBag->Release();
@@ -171 +171 @@
 }
 
-static HRESULT fillDeviceList(HostVideoCaptureDeviceList *pList)
+static HRESULT fillDeviceList(HostVideoInputDeviceList *pList)
 {
     IEnumMoniker *pEnumMoniker = NULL;
@@ -191 +191 @@
 }
 #else
-static HRESULT fillDeviceList(HostVideoCaptureDeviceList *pList)
+static HRESULT fillDeviceList(HostVideoInputDeviceList *pList)
 {
     NOREF(pList);
@@ -198 +198 @@
 #endif /* RT_OS_WINDOWS */
 
-/* static */ HRESULT HostVideoCaptureDevice::queryHostDevices(HostVideoCaptureDeviceList *pList)
+/* static */ HRESULT HostVideoInputDevice::queryHostDevices(HostVideoInputDeviceList *pList)
 {
     HRESULT hr = fillDeviceList(pList);