Changeset 48406 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Sep 10, 2013 12:53:50 PM (12 years ago)

Author:

vboxsync

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

88844

Message:

Main,VBoxManage: Implemented IConsole::EmulatedUSB. Removed IMachine::emulatedUSBWebcameraEnabled.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageModifyVM.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -77 +77 @@
         $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
         $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
-        $(if $(VBOX_WITH_USB_VIDEO),VBOX_WITH_USB_VIDEO) \
         $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \

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

@@ -1408 +1408 @@
             CHECK_ERROR_BREAK(sessionMachine, COMSETTER(VideoCaptureScreens)(ComSafeArrayAsInParam(saScreens)));
         }
+        else if (!strcmp(a->argv[1], "webcam"))
+        {
+            if (a->argc < 3)
+            {
+                errorArgument("Missing argument to '%s'", a->argv[1]);
+                rc = E_FAIL;
+                break;
+            }
+
+            ComPtr<IEmulatedUSB> pEmulatedUSB;
+            CHECK_ERROR_BREAK(console, COMGETTER(EmulatedUSB)(pEmulatedUSB.asOutParam()));
+            if (!pEmulatedUSB)
+            {
+                RTMsgError("Guest not running");
+                rc = E_FAIL;
+                break;
+            }
+
+            if (!strcmp(a->argv[2], "attach"))
+            {
+                Bstr path("");
+                if (a->argc >= 4)
+                    path = a->argv[3];
+                Bstr settings("");
+                if (a->argc >= 5)
+                    settings = a->argv[4];
+                CHECK_ERROR_BREAK(pEmulatedUSB, WebcamAttach(path.raw(), settings.raw()));
+            }
+            else if (!strcmp(a->argv[2], "detach"))
+            {
+                Bstr path("");
+                if (a->argc >= 4)
+                    path = a->argv[3];
+                CHECK_ERROR_BREAK(pEmulatedUSB, WebcamDetach(path.raw()));
+            }
+            else if (!strcmp(a->argv[2], "list"))
+            {
+                com::SafeArray <BSTR> webcams;
+                CHECK_ERROR_BREAK(pEmulatedUSB, COMGETTER(Webcams)(ComSafeArrayAsOutParam(webcams)));
+                for (size_t i = 0; i < webcams.size(); ++i)
+                {
+                    RTPrintf("%ls\n", webcams[i][0]? webcams[i]: Bstr("default").raw());
+                }
+            }
+            else
+            {
+                errorArgument("Invalid argument to '%s'", a->argv[1]);
+                rc = E_FAIL;
+                break;
+            }
+            
+        }
         else
         {

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

@@ -356 +356 @@
                      "                            [--faulttolerancesyncinterval <msec>]\n"
                      "                            [--faulttolerancepassword <password>]\n"
-#endif
-#ifdef VBOX_WITH_USB_VIDEO
-                     "                            [--usbwebcam on|off]\n"
 #endif
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -483 +480 @@
                      "                            unplugcpu <id> |\n"
                      "                            cpuexecutioncap <1-100>\n"
+                     "                            webcam attach [path [settings]] | detach [path] | list]\n"
                      "\n", SEP);
     }

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

@@ -186 +186 @@
     MODIFYVM_ATTACH_PCI,
     MODIFYVM_DETACH_PCI,
-#endif
-#ifdef VBOX_WITH_USB_VIDEO
-    MODIFYVM_USBWEBCAM,
 #endif
 #ifdef VBOX_WITH_USB_CARDREADER
@@ -359 +356 @@
     { "--pcidetach",                MODIFYVM_DETACH_PCI,                RTGETOPT_REQ_STRING },
 #endif
-#ifdef VBOX_WITH_USB_VIDEO
-    { "--usbwebcam",                MODIFYVM_USBWEBCAM,                 RTGETOPT_REQ_BOOL_ONOFF },
-#endif
 #ifdef VBOX_WITH_USB_CARDREADER
     { "--usbcardreader",            MODIFYVM_USBCARDREADER,             RTGETOPT_REQ_BOOL_ONOFF },
@@ -2659 +2653 @@
 #endif
 
-#ifdef VBOX_WITH_USB_VIDEO
-            case MODIFYVM_USBWEBCAM:
-            {
-                CHECK_ERROR(machine, COMSETTER(EmulatedUSBWebcameraEnabled)(ValueUnion.f));
-                break;
-            }
-#endif /* VBOX_WITH_USB_VIDEO */
-
 #ifdef VBOX_WITH_USB_CARDREADER
             case MODIFYVM_USBCARDREADER: