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

Timestamp:

Nov 9, 2018 10:03:36 AM (6 years ago)

Author:

vboxsync

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

126475

Message:

Recording: VBOX_WITH_VIDEOREC -> VBOX_WITH_RECORDING.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -41 +41 @@
         $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
-        $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC) \
-        $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC) \
+        $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING) \
+        $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING) \
         $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
         $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)

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

@@ -1854 +1854 @@
             RTFileClose(pngFile);
         }
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
         else if (!strcmp(a->argv[1], "record"))
         {
@@ -2075 +2075 @@
             }
         }
-#endif /* VBOX_WITH_VIDEOREC */
+#endif /* VBOX_WITH_RECORDING */
         else if (!strcmp(a->argv[1], "webcam"))
         {

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

@@ -712 +712 @@
                      "                                             acpishutdown]\n"
 #endif
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
                      "                            [--record on|off]\n"
                      "                            [--record screens all|<screen ID> [<screen ID> ...]]\n"
@@ -831 +831 @@
                      "                            setscreenlayout <display> on|primary <xorigin> <yorigin> <xres> <yres> <bpp> | off\n"
                      "                            screenshotpng <file> [display] |\n"
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
                      "                            record on|off |\n"
                      "                            record screens all|none|<screen>,[<screen>...] |\n"
@@ -840 +840 @@
                      "                            record maxtime <s> |\n"
                      "                            record maxfilesize <MB> |\n"
-#endif /* VBOX_WITH_VIDEOREC */
+#endif /* VBOX_WITH_RECORDING */
                      "                            setcredentials <username>\n"
                      "                                           --passwordfile <file> | <password>\n"

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

@@ -2371 +2371 @@
     }
 
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
     {
         /* Video capture */
         BOOL fCaptureVideo = FALSE;
-# ifdef VBOX_WITH_AUDIO_VIDEOREC
+# ifdef VBOX_WITH_AUDIO_RECORDING
         BOOL fCaptureAudio = FALSE;
 # endif
@@ -2412 +2412 @@
             else if (key.compare("ac_enabled", Utf8Str::CaseInsensitive) == 0)
             {
-# ifdef VBOX_WITH_AUDIO_VIDEOREC
+# ifdef VBOX_WITH_AUDIO_RECORDING
                 fCaptureAudio = value.compare("true", Utf8Str::CaseInsensitive) == 0;
 # endif
@@ -2419 +2419 @@
 
         SHOW_BOOL_VALUE_EX("videocap", "Capturing:", fCaptureVideo, "active", "not active");
-# ifdef VBOX_WITH_AUDIO_VIDEOREC
+# ifdef VBOX_WITH_AUDIO_RECORDING
         SHOW_BOOL_VALUE_EX("videocapaudio", "Capture audio:", fCaptureAudio, "active", "not active");
 # endif
@@ -2442 +2442 @@
         /** @todo Add more audio capturing profile / information here. */
     }
-#endif /* VBOX_WITH_VIDEOREC */
+#endif /* VBOX_WITH_RECORDING */
 
     if (    details == VMINFO_STANDARD

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

@@ -214 +214 @@
     MODIFYVM_USBCARDREADER,
 #endif
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
     MODIFYVM_RECORD,
     MODIFYVM_RECORD_FEATURES,
@@ -394 +394 @@
     { "--faulttolerancesyncinterval", MODIFYVM_FAULT_TOLERANCE_SYNC_INTERVAL, RTGETOPT_REQ_UINT32 },
     { "--chipset",                  MODIFYVM_CHIPSET,                   RTGETOPT_REQ_STRING },
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
     { "--record",                   MODIFYVM_RECORD,                    RTGETOPT_REQ_BOOL_ONOFF },
     { "--recordscreens",            MODIFYVM_RECORD_SCREENS,            RTGETOPT_REQ_STRING },
@@ -464 +464 @@
 }
 
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
 static int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens)
 {
@@ -2927 +2927 @@
                 break;
             }
-#ifdef VBOX_WITH_VIDEOREC
+#ifdef VBOX_WITH_RECORDING
             case MODIFYVM_RECORD:
                 RT_FALL_THROUGH();