Index: /trunk/Config.kmk =================================================================== --- /trunk/Config.kmk (revision 75344) +++ /trunk/Config.kmk (revision 75345) @@ -686,11 +686,11 @@ VBOX_WITH_VBOX_IMG = if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64) - # Enables the video capturing support. - VBOX_WITH_VIDEOREC = 1 + # Enables recording support. + VBOX_WITH_RECORDING = 1 # Enable VPX (VP8 / VP9 codec), used for video capturing. VBOX_WITH_LIBVPX = 1 - # Enables audio support for VM video capturing. - VBOX_WITH_AUDIO_VIDEOREC = 1 - # Enables libopus (Opus), used for encoding audio into VM video capturing files. + # Enables audio support for recording. + VBOX_WITH_AUDIO_RECORDING = 1 + # Enables libopus (Opus), used for encoding audio into recorded data. VBOX_WITH_LIBOPUS = 1 # Enable SEE (+ AVX) optimizations for Opus. @@ -1208,7 +1208,7 @@ VBOX_WITH_LIBVPX= VBOX_WITH_LIBOPUS= - # Disable video recording (with audio support). - VBOX_WITH_VIDEOREC= - VBOX_WITH_AUDIO_VIDEOREC= + # Disable recording (with audio support). + VBOX_WITH_RECORDING= + VBOX_WITH_AUDIO_RECORDING= endif # branding @@ -3621,15 +3621,11 @@ endif - ## Sign an application bundle, framework or kernel extension. - # @param 1 The bundle to sign. - # @param 2 Identifier, optional. - # @param 3 Additional codesign command line parameters, optional. + # The above version with complicated requirements is what Xcode 5.0.1GM suggest for kexts. ifdef VBOX_WITH_CORP_CODE_SIGNING ## @todo cannot handle $(2), the identifier. $(3) is hopefully either empty or --deep VBOX_SIGN_BUNDLE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \ - ditto -c -k --keepParent "$(1)" "$(1).zip"$(NLTAB) \ - $(call VBOX_CCS_SIGN_CMD,apple,$(1).zip,,$(if $(eq $(3),--deep),-deep,))$(NLTAB) \ - ditto -x -k "$(1).zip" "$(1)/../"$(NLTAB) \ - $(RM) -f -- "$(1).zip" + ditto -c -k $(1) $(1).zip$(NLTAB) \ + $(call VBOX_CCS_SIGN_CMD,apple,$(1).zip,,$(3))$(NLTAB) \ + ditto -x -k $(1).zip $(1) else VBOX_SIGN_BUNDLE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \ @@ -3638,5 +3634,5 @@ --file-list - \ $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \ - $(3) \ + $(3) \ $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \ $(1) $(if $(2),--identifier "$(2)",) @@ -3644,11 +3640,7 @@ ## Sign a Mach-O image. - # @param 1 The file to sign. + # @param 1 The bundle to sign. # @param 2 Identifier, optional. - ifdef VBOX_WITH_CORP_CODE_SIGNING - ## @todo cannot handle $(2), the identifier. - VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,binary,$(1)) - else - VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \ + VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \ --verbose=9 \ --force \ @@ -3658,19 +3650,14 @@ $(1) \ $(if $(2),--identifier "$(2)",) - endif ## Sign a VMM Mach-O image. - # @param 1 The file to sign. + # @param 1 The bundle to sign. # @param 2 Identifier, optional. VBOX_SIGN_VMM_MOD_FN = $(VBOX_SIGN_MACHO_FN) ## Sign a non-executable file. - # @param 1 The file to sign. + # @param 1 The bundle to sign. # @param 2 Identifier, optional. - ifdef VBOX_WITH_CORP_CODE_SIGNING - ## @todo cannot handle $(2), the identifier. - VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,binary,$(1)) - else - VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \ + VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \ --verbose=9 \ --force \ @@ -3680,26 +3667,4 @@ $(1) \ $(if $(2),--identifier "$(2)",) - endif - - ## Sign a DMG image. - # @param 1 The file to sign. - # @param 2 Identifier, optional. - ifdef VBOX_WITH_CORP_CODE_SIGNING - ## @todo cannot handle $(2), the identifier. - VBOX_SIGN_DMG_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \ - $(call VBOX_CCS_SIGN_CMD,mac_dmg,$(1))$(NLTAB) \ - ditto -x -k "$(1).zip" "$(dir $(1))"$(NLTAB) \ - $(RM) -f -- "$(1).zip" - else - VBOX_SIGN_DMG_FN = $(VBOX_SIGN_FILE_FN) - endif - - ## Sign a PKG file. Used with corp code signing only. - # @param 1 The file to sign. - # @param 2 Identifier, optional. - ifdef VBOX_WITH_CORP_CODE_SIGNING - ## @todo cannot handle $(2), the identifier. - VBOX_SIGN_PKG_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,mac_pkg,$(1)) - endif ## @def VBOX_TEST_SIGN_KEXT @@ -4532,5 +4497,4 @@ ifeq ($(KBUILD_TARGET),os2) - ifndef VBOX_USE_WATCOM_FOR_OS2 TEMPLATE_VBOXR0DRV_TOOL = GXX3OMF TEMPLATE_VBOXR0DRV_CXXFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti @@ -4539,26 +4503,4 @@ # wlink thinks physdevice doesn't need fixups and should have a stack - stupid! TEMPLATE_VBOXR0DRV_LDFLAGS = -Zlinker Option -Zlinker internalrelocs, -Zlinker togglerelocs - else -TEMPLATE_VBOXR0DRV_TOOL = OPENWATCOM -TEMPLATE_VBOXR0DRV_CTOOL = OPENWATCOM -TEMPLATE_VBOXR0DRV_CXXTOOL = OPENWATCOM -TEMPLATE_VBOXR0DRV_LDTOOL = OPENWATCOM-WL -TEMPLATE_VBOXR0DRV_ARTOOL = OPENWATCOM -TEMPLATE_VBOXR0DRV_ASTOOL = NASM -TEMPLATE_VBOXR0DRV_ASFLAGS = -fobj -DASM_FORMAT_OMF -D__NASM__ -w+orphan-labels #-g -F borland -TEMPLATE_VBOXR0DRV_DEFS.os2 = #_OS2EMX_H -TEMPLATE_VBOXR0DRV_INCS = \ - $(PATH_TOOL_OPENWATCOM)/h \ - $(PATH_TOOL_OPENWATCOM)/h/os2 \ - $(PATH_ROOT)/include \ - $(PATH_KLIBC_TRUNK)/libc/include # for os2ddk -TEMPLATE_VBOXR0DRV_CFLAGS = -s -ze -w4 -hd -d1+ -nt=TEXT32 -nc=CODE -4 -of+ -TEMPLATE_VBOXR0DRV_CXXFLAGS = -s -ze -w4 -hd -d2t -nt=TEXT32 -nc=CODE -4 -of+ -TEMPLATE_VBOXR0DRV_LDFLAGS = \ - form os2 lx physdevice \ - option NODefaultlibs, internalrelocs, togglerelocs \ - debug dwarf all #option symfile -# debug codeview all option symfile - wlink generates bad info, overwritten mod dir header. - endif endif @@ -7103,5 +7045,4 @@ endif - # # Template for building R0 libraries for the guest additions. Index: /trunk/configure =================================================================== --- /trunk/configure (revision 75344) +++ /trunk/configure (revision 75345) @@ -2756,9 +2756,9 @@ if [ $WITH_LIBVPX -eq 0 ]; then cnf_append "VBOX_WITH_LIBVPX" "" - cnf_append "VBOX_WITH_VIDEOREC" "" + cnf_append "VBOX_WITH_RECORDING" "" fi if [ $WITH_LIBOPUS -eq 0 ]; then cnf_append "VBOX_WITH_LIBOPUS" "" - cnf_append "VBOX_WITH_AUDIO_VIDEOREC" "" + cnf_append "VBOX_WITH_AUDIO_RECORDING" "" fi Index: /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk (revision 75344) +++ /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk (revision 75345) @@ -45,5 +45,5 @@ # VBoxHeadless_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE) -VBoxHeadless_DEFS += $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,) +VBoxHeadless_DEFS += $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) VBoxHeadless_INCS = $(VBOX_GRAPHICS_INCS) VBoxHeadless_SOURCES = VBoxHeadless.cpp Index: /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (revision 75344) +++ /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (revision 75345) @@ -44,5 +44,5 @@ #include -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING # include # include @@ -464,5 +464,5 @@ " settings password\n" " -start-paused, --start-paused Start the VM in paused state\n" -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING " -c, -record, --record Record the VM screen output to a file\n" " -w, --videowidth Video frame width when recording\n" @@ -475,5 +475,5 @@ } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING /** * Parse the environment for variables which can influence the VIDEOREC settings. @@ -524,5 +524,5 @@ *ppszFileName = pszEnvTemp; } -#endif /* VBOX_WITH_VIDEOREC defined */ +#endif /* VBOX_WITH_RECORDING defined */ static RTEXITCODE readPasswordFile(const char *pszFilename, com::Utf8Str *pPasswd) @@ -626,5 +626,5 @@ unsigned fCSAM = ~0U; unsigned fPaused = 0; -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING bool fRecordEnabled = false; uint32_t ulRecordVideoWidth = 800; @@ -633,5 +633,5 @@ char szRecordFileName[RTPATH_MAX]; const char *pszRecordFileNameTemplate = "VBox-%d.webm"; /* .webm container by default. */ -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ #ifdef RT_OS_WINDOWS ATL::CComModule _Module; /* Required internally by ATL (constructor records instance in global variable). */ @@ -643,5 +643,5 @@ "All rights reserved.\n\n"); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING /* Parse the environment */ parse_environ(&ulRecordVideoWidth, &ulRecordVideoHeight, &ulRecordVideoRate, &pszRecordFileNameTemplate); @@ -696,5 +696,5 @@ { "--settingspw", OPT_SETTINGSPW, RTGETOPT_REQ_STRING }, { "--settingspwfile", OPT_SETTINGSPW_FILE, RTGETOPT_REQ_STRING }, -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING { "-record", 'c', 0 }, { "--record", 'c', 0 }, @@ -703,5 +703,5 @@ { "--videorate", 'r', RTGETOPT_REQ_UINT32 }, { "--filename", 'f', RTGETOPT_REQ_STRING }, -#endif /* VBOX_WITH_VIDEOREC defined */ +#endif /* VBOX_WITH_RECORDING defined */ { "-comment", OPT_COMMENT, RTGETOPT_REQ_STRING }, { "--comment", OPT_COMMENT, RTGETOPT_REQ_STRING }, @@ -780,5 +780,5 @@ fPaused = true; break; -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING case 'c': fRecordEnabled = true; @@ -793,7 +793,7 @@ pszRecordFileNameTemplate = ValueUnion.psz; break; -#endif /* VBOX_WITH_VIDEOREC defined */ +#endif /* VBOX_WITH_RECORDING defined */ case 'h': -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING if ((GetState.pDef->fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING) { @@ -817,5 +817,5 @@ } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING if (ulRecordVideoWidth < 512 || ulRecordVideoWidth > 2048 || ulRecordVideoWidth % 2) { @@ -847,5 +847,5 @@ } RTStrPrintf(&szRecordFileName[0], RTPATH_MAX, pszRecordFileNameTemplate, RTProcSelf()); -#endif /* defined VBOX_WITH_VIDEOREC */ +#endif /* defined VBOX_WITH_RECORDING */ if (!pcszNameOrUUID) @@ -958,5 +958,5 @@ CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam())); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING if (fRecordEnabled) { @@ -978,5 +978,5 @@ } } -#endif /* defined(VBOX_WITH_VIDEOREC) */ +#endif /* defined(VBOX_WITH_RECORDING) */ /* get the machine debugger (isn't necessarily available) */ @@ -1227,5 +1227,5 @@ Log(("VBoxHeadless: event loop has terminated...\n")); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING if (fRecordEnabled) { @@ -1237,5 +1237,5 @@ } } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ /* we don't have to disable VRDE here because we don't save the settings of the VM */ Index: /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk (revision 75344) +++ /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk (revision 75345) @@ -41,6 +41,6 @@ $(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) Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (revision 75344) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (revision 75345) @@ -1854,5 +1854,5 @@ RTFileClose(pngFile); } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING else if (!strcmp(a->argv[1], "record")) { @@ -2075,5 +2075,5 @@ } } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ else if (!strcmp(a->argv[1], "webcam")) { Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 75344) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 75345) @@ -712,5 +712,5 @@ " acpishutdown]\n" #endif -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING " [--record on|off]\n" " [--record screens all| [ ...]]\n" @@ -831,5 +831,5 @@ " setscreenlayout on|primary | off\n" " screenshotpng [display] |\n" -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING " record on|off |\n" " record screens all|none|,[...] |\n" @@ -840,5 +840,5 @@ " record maxtime |\n" " record maxfilesize |\n" -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ " setcredentials \n" " --passwordfile | \n" Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 75344) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 75345) @@ -2371,9 +2371,9 @@ } -#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,5 +2412,5 @@ 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,5 +2419,5 @@ 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,5 +2442,5 @@ /** @todo Add more audio capturing profile / information here. */ } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ if ( details == VMINFO_STANDARD Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 75344) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 75345) @@ -214,5 +214,5 @@ MODIFYVM_USBCARDREADER, #endif -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING MODIFYVM_RECORD, MODIFYVM_RECORD_FEATURES, @@ -394,5 +394,5 @@ { "--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,5 +464,5 @@ } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING static int parseScreens(const char *pcszScreens, com::SafeArray *pScreens) { @@ -2927,5 +2927,5 @@ break; } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING case MODIFYVM_RECORD: RT_FALL_THROUGH(); Index: /trunk/src/VBox/Main/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/Makefile.kmk (revision 75344) +++ /trunk/src/VBox/Main/Makefile.kmk (revision 75345) @@ -354,6 +354,6 @@ $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \ $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \ - $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC,) \ - $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,) \ + $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING,) \ + $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) \ $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \ $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \ @@ -760,6 +760,6 @@ $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \ $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \ - $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC,) \ - $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,) \ + $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING,) \ + $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) \ $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \ $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \ @@ -795,5 +795,5 @@ VBoxC_SDKS = VBOX_LIBPNG VBOX_ZLIB -ifdef VBOX_WITH_VIDEOREC +ifdef VBOX_WITH_RECORDING VBoxC_SOURCES += \ xml/Settings.cpp \ @@ -813,5 +813,5 @@ endif -ifdef VBOX_WITH_AUDIO_VIDEOREC +ifdef VBOX_WITH_AUDIO_RECORDING ifdef VBOX_WITH_LIBOPUS VBoxC_SDKS += VBOX_OPUS @@ -933,5 +933,5 @@ src-client/AudioDriver.cpp \ $(if $(VBOX_WITH_AUDIO_VRDE),src-client/DrvAudioVRDE.cpp,) \ - $(if $(VBOX_WITH_AUDIO_VIDEOREC),src-client/DrvAudioRec.cpp,) + $(if $(VBOX_WITH_AUDIO_RECORDING),src-client/DrvAudioRec.cpp,) VBoxC_SOURCES.win = \ Index: /trunk/src/VBox/Main/include/ConsoleImpl.h =================================================================== --- /trunk/src/VBox/Main/include/ConsoleImpl.h (revision 75344) +++ /trunk/src/VBox/Main/include/ConsoleImpl.h (revision 75345) @@ -24,5 +24,5 @@ #include "SecretKeyStore.h" #include "ConsoleWrap.h" -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING # include "Recording.h" #endif @@ -40,5 +40,5 @@ class EmulatedUSB; class AudioVRDE; -#ifdef VBOX_WITH_AUDIO_VIDEOREC +#ifdef VBOX_WITH_AUDIO_RECORDING class AudioVideoRec; #endif @@ -141,5 +141,5 @@ AudioVRDE *i_getAudioVRDE() const { return mAudioVRDE; } #endif -#ifdef VBOX_WITH_AUDIO_VIDEOREC +#ifdef VBOX_WITH_AUDIO_RECORDING int i_videoRecCreate(void); void i_videoRecDestroy(void); @@ -1030,5 +1030,5 @@ ComPtr mVmListener; -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING struct Capture { @@ -1039,10 +1039,10 @@ /** The capturing context. */ CaptureContext *mpVideoRecCtx; -# ifdef VBOX_WITH_AUDIO_VIDEOREC +# ifdef VBOX_WITH_AUDIO_RECORDING /** Pointer to capturing audio backend. */ AudioVideoRec * const mAudioVideoRec; # endif } Capture; -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ friend class VMTask; Index: /trunk/src/VBox/Main/include/DisplayImpl.h =================================================================== --- /trunk/src/VBox/Main/include/DisplayImpl.h (revision 75344) +++ /trunk/src/VBox/Main/include/DisplayImpl.h (revision 75345) @@ -97,10 +97,10 @@ #endif /* VBOX_WITH_CROGL */ -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING struct { ComPtr pSourceBitmap; } videoRec; -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ } DISPLAYFBINFO; @@ -200,5 +200,5 @@ void VideoAccelFlushVMMDev(void); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING int i_videoRecInvalidate(void); void i_videoRecScreenChanged(unsigned uScreenId); @@ -469,5 +469,5 @@ RTCRITSECT mVideoAccelLock; -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING /* Serializes access to video recording source bitmaps. */ RTCRITSECT mVideoRecLock; Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 75344) +++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 75345) @@ -62,5 +62,5 @@ # include "DrvAudioVRDE.h" #endif -#ifdef VBOX_WITH_AUDIO_VIDEOREC +#ifdef VBOX_WITH_AUDIO_RECORDING # include "DrvAudioRec.h" #endif @@ -83,5 +83,5 @@ #include "ThreadTask.h" -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING # include "Recording.h" #endif @@ -586,5 +586,5 @@ AssertReturn(mAudioVRDE, E_FAIL); #endif -#ifdef VBOX_WITH_AUDIO_VIDEOREC +#ifdef VBOX_WITH_AUDIO_RECORDING unconst(Capture.mAudioVideoRec) = new AudioVideoRec(this); AssertReturn(Capture.mAudioVideoRec, E_FAIL); @@ -734,5 +734,5 @@ #endif -#ifdef VBOX_WITH_AUDIO_VIDEOREC +#ifdef VBOX_WITH_AUDIO_RECORDING if (Capture.mAudioVideoRec) { @@ -5599,5 +5599,5 @@ } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING /** * Enables or disables video (audio) capturing of a VM. @@ -5630,5 +5630,5 @@ if (RT_SUCCESS(vrc)) { -# ifdef VBOX_WITH_AUDIO_VIDEOREC +# ifdef VBOX_WITH_AUDIO_RECORDING /* Attach the video recording audio driver if required. */ if ( Capture.mpVideoRecCtx->IsFeatureEnabled(RecordFeature_Audio) @@ -5650,5 +5650,5 @@ { i_videoRecStop(); -# ifdef VBOX_WITH_AUDIO_VIDEOREC +# ifdef VBOX_WITH_AUDIO_RECORDING Capture.mAudioVideoRec->doDetachDriverViaEmt(mpUVM, pAutoLock); # endif @@ -5665,5 +5665,5 @@ return vrc; } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ HRESULT Console::i_onRecordChange() @@ -5675,5 +5675,5 @@ HRESULT rc = S_OK; -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING /* Don't trigger video capture changes if the VM isn't running. */ SafeVMPtrQuiet ptrVM(this); @@ -5697,5 +5697,5 @@ ptrVM.release(); } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ return rc; @@ -6867,5 +6867,5 @@ } -#ifdef VBOX_WITH_AUDIO_VIDEOREC +#ifdef VBOX_WITH_AUDIO_RECORDING /** * Sends audio (frame) data to the display's video capturing routines. @@ -6889,7 +6889,7 @@ return S_OK; } -#endif /* VBOX_WITH_AUDIO_VIDEOREC */ - -#ifdef VBOX_WITH_VIDEOREC +#endif /* VBOX_WITH_AUDIO_RECORDING */ + +#ifdef VBOX_WITH_RECORDING int Console::i_videoRecGetSettings(settings::RecordSettings &Settings) { @@ -7057,5 +7057,5 @@ return rc; } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ /** @@ -10145,5 +10145,5 @@ pConsole->i_consoleVRDPServer()->EnableConnections(); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING ComPtr RecordSettings; rc = pConsole->mMachine->COMGETTER(RecordSettings)(RecordSettings.asOutParam()); Index: /trunk/src/VBox/Main/src-client/DisplayImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/DisplayImpl.cpp (revision 75344) +++ /trunk/src/VBox/Main/src-client/DisplayImpl.cpp (revision 75345) @@ -53,5 +53,5 @@ #include -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING # include # include "Recording.h" @@ -146,5 +146,5 @@ #endif -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING rc = RTCritSectInit(&mVideoRecLock); AssertRC(rc); @@ -178,5 +178,5 @@ uninit(); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING if (RTCritSectIsInitialized(&mVideoRecLock)) { @@ -729,5 +729,5 @@ maFramebuffers[uScreenId].updateImage.cbLine = 0; maFramebuffers[uScreenId].pFramebuffer.setNull(); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING maFramebuffers[uScreenId].videoRec.pSourceBitmap.setNull(); #endif @@ -1057,5 +1057,5 @@ i_handleSetVisibleRegion(mcRectVisibleRegion, mpRectVisibleRegion); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING i_videoRecScreenChanged(uScreenId); #endif @@ -2405,5 +2405,5 @@ } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING /** * Invalidates the capturing configuration. @@ -2460,5 +2460,5 @@ } } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ int Display::i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, @@ -3387,5 +3387,5 @@ } -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING AssertPtr(pDisplay->mParent); CaptureContext *pCtx = pDisplay->mParent->i_videoRecGetContext(); @@ -3486,5 +3486,5 @@ } while (0); } -#endif /* VBOX_WITH_VIDEOREC */ +#endif /* VBOX_WITH_RECORDING */ #ifdef DEBUG_sunlover_2 @@ -3832,5 +3832,5 @@ bool Display::i_handleCrVRecScreenshotBegin(uint32_t uScreen, uint64_t uTimestampMs) { -# ifdef VBOX_WITH_VIDEOREC +# ifdef VBOX_WITH_RECORDING CaptureContext *pCtx = mParent->i_videoRecGetContext(); return ( pCtx @@ -3854,5 +3854,5 @@ { Assert(mfCrOglVideoRecState == CRVREC_STATE_SUBMITTED); -# ifdef VBOX_WITH_VIDEOREC +# ifdef VBOX_WITH_RECORDING CaptureContext *pCtx = mParent->i_videoRecGetContext(); @@ -3872,5 +3872,5 @@ RT_NOREF(uScreen, x, y, uPixelFormat, \ uBitsPerPixel, uBytesPerLine, uGuestWidth, uGuestHeight, pu8BufferAddress, uTimestampMs); -# endif /* VBOX_WITH_VIDEOREC */ +# endif /* VBOX_WITH_RECORDING */ } @@ -4498,5 +4498,5 @@ { AutoWriteLock displayLock(pThis->pDisplay COMMA_LOCKVAL_SRC_POS); -#ifdef VBOX_WITH_VIDEOREC +#ifdef VBOX_WITH_RECORDING pThis->pDisplay->mParent->i_videoRecStop(); #endif