Changeset 48607 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

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

Author:

vboxsync

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

89180

Message:

VBoxManage,Main: VideoCaptureDevice -> VideoInputDevice

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (3 diffs)
• HostVideoInputDeviceImpl.cpp (moved) (moved from trunk/src/VBox/Main/src-server/HostVideoCaptureDeviceImpl.cpp ) (10 diffs)

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);