VirtualBox

Changeset 75345 in vbox


Ignore:
Timestamp:
Nov 9, 2018 10:03:36 AM (7 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
126475
Message:

Recording: VBOX_WITH_VIDEOREC -> VBOX_WITH_RECORDING.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r75335 r75345  
    686686VBOX_WITH_VBOX_IMG =
    687687if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)
    688  # Enables the video capturing support.
    689  VBOX_WITH_VIDEOREC = 1
     688 # Enables recording support.
     689 VBOX_WITH_RECORDING = 1
    690690 # Enable VPX (VP8 / VP9 codec), used for video capturing.
    691691 VBOX_WITH_LIBVPX = 1
    692  # Enables audio support for VM video capturing.
    693  VBOX_WITH_AUDIO_VIDEOREC = 1
    694  # Enables libopus (Opus), used for encoding audio into VM video capturing files.
     692 # Enables audio support for recording.
     693 VBOX_WITH_AUDIO_RECORDING = 1
     694 # Enables libopus (Opus), used for encoding audio into recorded data.
    695695 VBOX_WITH_LIBOPUS = 1
    696696 # Enable SEE (+ AVX) optimizations for Opus.
    … …  
    12081208  VBOX_WITH_LIBVPX=
    12091209  VBOX_WITH_LIBOPUS=
    1210   # Disable video recording (with audio support).
    1211   VBOX_WITH_VIDEOREC=
    1212   VBOX_WITH_AUDIO_VIDEOREC=
     1210  # Disable recording (with audio support).
     1211  VBOX_WITH_RECORDING=
     1212  VBOX_WITH_AUDIO_RECORDING=
    12131213  endif
    12141214 # branding
    … …  
    36213621  endif
    36223622
    3623   ## Sign an application bundle, framework or kernel extension.
    3624   # @param 1  The bundle to sign.
    3625   # @param 2  Identifier, optional.
    3626   # @param 3  Additional codesign command line parameters, optional.
     3623  # The above version with complicated requirements is what Xcode 5.0.1GM suggest for kexts.
    36273624  ifdef VBOX_WITH_CORP_CODE_SIGNING
    36283625   ## @todo cannot handle $(2), the identifier. $(3) is hopefully either empty or --deep
    36293626   VBOX_SIGN_BUNDLE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
    3630         ditto -c -k --keepParent "$(1)" "$(1).zip"$(NLTAB) \
    3631         $(call VBOX_CCS_SIGN_CMD,apple,$(1).zip,,$(if $(eq $(3),--deep),-deep,))$(NLTAB) \
    3632         ditto -x -k "$(1).zip" "$(1)/../"$(NLTAB) \
    3633         $(RM) -f -- "$(1).zip"
     3627    ditto -c -k $(1) $(1).zip$(NLTAB) \
     3628    $(call VBOX_CCS_SIGN_CMD,apple,$(1).zip,,$(3))$(NLTAB) \
     3629        ditto -x -k $(1).zip $(1)
    36343630  else
    36353631   VBOX_SIGN_BUNDLE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
    … …  
    36383634        --file-list - \
    36393635        $(if-expr defined(VBOX_TSA_URL),--timestamp="$(VBOX_TSA_URL)") \
    3640         $(3) \
     3636       $(3) \
    36413637        $(VBOX_CERTIFICATE_SUBJECT_NAME_ARGS) \
    36423638        $(1) $(if $(2),--identifier "$(2)",)
    … …  
    36443640
    36453641  ## Sign a Mach-O image.
    3646   # @param 1  The file to sign.
     3642  # @param 1  The bundle to sign.
    36473643  # @param 2  Identifier, optional.
    3648   ifdef VBOX_WITH_CORP_CODE_SIGNING
    3649    ## @todo cannot handle $(2), the identifier.
    3650    VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,binary,$(1))
    3651   else
    3652    VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
     3644  VBOX_SIGN_MACHO_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
    36533645        --verbose=9 \
    36543646        --force \
    … …  
    36583650        $(1) \
    36593651        $(if $(2),--identifier "$(2)",)
    3660   endif
    36613652
    36623653  ## Sign a VMM Mach-O image.
    3663   # @param 1  The file to sign.
     3654  # @param 1  The bundle to sign.
    36643655  # @param 2  Identifier, optional.
    36653656  VBOX_SIGN_VMM_MOD_FN = $(VBOX_SIGN_MACHO_FN)
    36663657
    36673658  ## Sign a non-executable file.
    3668   # @param 1  The file to sign.
     3659  # @param 1  The bundle to sign.
    36693660  # @param 2  Identifier, optional.
    3670   ifdef VBOX_WITH_CORP_CODE_SIGNING
    3671    ## @todo cannot handle $(2), the identifier.
    3672    VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,binary,$(1))
    3673   else
    3674    VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
     3661  VBOX_SIGN_FILE_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(VBOX_CODESIGN) \
    36753662        --verbose=9 \
    36763663        --force \
    … …  
    36803667        $(1) \
    36813668        $(if $(2),--identifier "$(2)",)
    3682   endif
    3683 
    3684   ## Sign a DMG image.
    3685   # @param 1  The file to sign.
    3686   # @param 2  Identifier, optional.
    3687   ifdef VBOX_WITH_CORP_CODE_SIGNING
    3688    ## @todo cannot handle $(2), the identifier.
    3689    VBOX_SIGN_DMG_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB) \
    3690         $(call VBOX_CCS_SIGN_CMD,mac_dmg,$(1))$(NLTAB) \
    3691         ditto -x -k "$(1).zip" "$(dir $(1))"$(NLTAB) \
    3692         $(RM) -f -- "$(1).zip"
    3693   else
    3694    VBOX_SIGN_DMG_FN = $(VBOX_SIGN_FILE_FN)
    3695   endif
    3696 
    3697   ## Sign a PKG file. Used with corp code signing only.
    3698   # @param 1  The file to sign.
    3699   # @param 2  Identifier, optional.
    3700   ifdef VBOX_WITH_CORP_CODE_SIGNING
    3701    ## @todo cannot handle $(2), the identifier.
    3702    VBOX_SIGN_PKG_FN = $(call MSG_TOOL,SIGNTOOL,,$(1),$(2))$(NLTAB)$(call VBOX_CCS_SIGN_CMD,mac_pkg,$(1))
    3703   endif
    37043669
    37053670  ## @def VBOX_TEST_SIGN_KEXT
    … …  
    45324497
    45334498ifeq ($(KBUILD_TARGET),os2)
    4534  ifndef VBOX_USE_WATCOM_FOR_OS2
    45354499TEMPLATE_VBOXR0DRV_TOOL                = GXX3OMF
    45364500TEMPLATE_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
    … …  
    45394503# wlink thinks physdevice doesn't need fixups and should have a stack - stupid!
    45404504TEMPLATE_VBOXR0DRV_LDFLAGS             = -Zlinker Option -Zlinker internalrelocs, -Zlinker togglerelocs
    4541   else
    4542 TEMPLATE_VBOXR0DRV_TOOL     = OPENWATCOM
    4543 TEMPLATE_VBOXR0DRV_CTOOL    = OPENWATCOM
    4544 TEMPLATE_VBOXR0DRV_CXXTOOL  = OPENWATCOM
    4545 TEMPLATE_VBOXR0DRV_LDTOOL   = OPENWATCOM-WL
    4546 TEMPLATE_VBOXR0DRV_ARTOOL   = OPENWATCOM
    4547 TEMPLATE_VBOXR0DRV_ASTOOL   = NASM
    4548 TEMPLATE_VBOXR0DRV_ASFLAGS  = -fobj -DASM_FORMAT_OMF -D__NASM__ -w+orphan-labels #-g -F borland
    4549 TEMPLATE_VBOXR0DRV_DEFS.os2 = #_OS2EMX_H
    4550 TEMPLATE_VBOXR0DRV_INCS     = \
    4551         $(PATH_TOOL_OPENWATCOM)/h \
    4552         $(PATH_TOOL_OPENWATCOM)/h/os2 \
    4553         $(PATH_ROOT)/include \
    4554         $(PATH_KLIBC_TRUNK)/libc/include # for os2ddk
    4555 TEMPLATE_VBOXR0DRV_CFLAGS   = -s -ze -w4 -hd -d1+ -nt=TEXT32 -nc=CODE -4 -of+
    4556 TEMPLATE_VBOXR0DRV_CXXFLAGS = -s -ze -w4 -hd -d2t -nt=TEXT32 -nc=CODE -4 -of+
    4557 TEMPLATE_VBOXR0DRV_LDFLAGS  = \
    4558         form os2 lx physdevice \
    4559         option NODefaultlibs, internalrelocs, togglerelocs \
    4560         debug dwarf all #option symfile
    4561 #       debug codeview all option symfile - wlink generates bad info, overwritten mod dir header.
    4562  endif
    45634505endif
    45644506
    … …  
    71037045endif
    71047046
    7105 
    71067047#
    71077048# Template for building R0 libraries for the guest additions.

  • trunk/configure

    r74653 r75345  
    27562756if [ $WITH_LIBVPX -eq 0 ]; then
    27572757  cnf_append "VBOX_WITH_LIBVPX" ""
    2758   cnf_append "VBOX_WITH_VIDEOREC" ""
     2758  cnf_append "VBOX_WITH_RECORDING" ""
    27592759fi
    27602760if [ $WITH_LIBOPUS -eq 0 ]; then
    27612761  cnf_append "VBOX_WITH_LIBOPUS" ""
    2762   cnf_append "VBOX_WITH_AUDIO_VIDEOREC" ""
     2762  cnf_append "VBOX_WITH_AUDIO_RECORDING" ""
    27632763fi
    27642764

  • trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

    r65381 r75345  
    4545#
    4646VBoxHeadless_TEMPLATE  := $(if $(VBOX_WITH_HARDENING),VBOXMAINCLIENTDLL,VBOXMAINCLIENTEXE)
    47 VBoxHeadless_DEFS      += $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,)
     47VBoxHeadless_DEFS      += $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,)
    4848VBoxHeadless_INCS      = $(VBOX_GRAPHICS_INCS)
    4949VBoxHeadless_SOURCES    = VBoxHeadless.cpp

  • trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

    r75341 r75345  
    4444#include <VBoxVideo.h>
    4545
    46 #ifdef VBOX_WITH_VIDEOREC
     46#ifdef VBOX_WITH_RECORDING
    4747# include <cstdlib>
    4848# include <cerrno>
    … …  
    464464             "                                       settings password\n"
    465465             "   -start-paused, --start-paused     Start the VM in paused state\n"
    466 #ifdef VBOX_WITH_VIDEOREC
     466#ifdef VBOX_WITH_RECORDING
    467467             "   -c, -record, --record             Record the VM screen output to a file\n"
    468468             "   -w, --videowidth                  Video frame width when recording\n"
    … …  
    475475}
    476476
    477 #ifdef VBOX_WITH_VIDEOREC
     477#ifdef VBOX_WITH_RECORDING
    478478/**
    479479 * Parse the environment for variables which can influence the VIDEOREC settings.
    … …  
    524524        *ppszFileName = pszEnvTemp;
    525525}
    526 #endif /* VBOX_WITH_VIDEOREC defined */
     526#endif /* VBOX_WITH_RECORDING defined */
    527527
    528528static RTEXITCODE readPasswordFile(const char *pszFilename, com::Utf8Str *pPasswd)
    … …  
    626626    unsigned fCSAM  = ~0U;
    627627    unsigned fPaused = 0;
    628 #ifdef VBOX_WITH_VIDEOREC
     628#ifdef VBOX_WITH_RECORDING
    629629    bool fRecordEnabled = false;
    630630    uint32_t ulRecordVideoWidth = 800;
    … …  
    633633    char szRecordFileName[RTPATH_MAX];
    634634    const char *pszRecordFileNameTemplate = "VBox-%d.webm"; /* .webm container by default. */
    635 #endif /* VBOX_WITH_VIDEOREC */
     635#endif /* VBOX_WITH_RECORDING */
    636636#ifdef RT_OS_WINDOWS
    637637    ATL::CComModule _Module; /* Required internally by ATL (constructor records instance in global variable). */
    … …  
    643643             "All rights reserved.\n\n");
    644644
    645 #ifdef VBOX_WITH_VIDEOREC
     645#ifdef VBOX_WITH_RECORDING
    646646    /* Parse the environment */
    647647    parse_environ(&ulRecordVideoWidth, &ulRecordVideoHeight, &ulRecordVideoRate, &pszRecordFileNameTemplate);
    … …  
    696696        { "--settingspw", OPT_SETTINGSPW, RTGETOPT_REQ_STRING },
    697697        { "--settingspwfile", OPT_SETTINGSPW_FILE, RTGETOPT_REQ_STRING },
    698 #ifdef VBOX_WITH_VIDEOREC
     698#ifdef VBOX_WITH_RECORDING
    699699        { "-record", 'c', 0 },
    700700        { "--record", 'c', 0 },
    … …  
    703703        { "--videorate", 'r', RTGETOPT_REQ_UINT32 },
    704704        { "--filename", 'f', RTGETOPT_REQ_STRING },
    705 #endif /* VBOX_WITH_VIDEOREC defined */
     705#endif /* VBOX_WITH_RECORDING defined */
    706706        { "-comment", OPT_COMMENT, RTGETOPT_REQ_STRING },
    707707        { "--comment", OPT_COMMENT, RTGETOPT_REQ_STRING },
    … …  
    780780                fPaused = true;
    781781                break;
    782 #ifdef VBOX_WITH_VIDEOREC
     782#ifdef VBOX_WITH_RECORDING
    783783            case 'c':
    784784                fRecordEnabled = true;
    … …  
    793793                pszRecordFileNameTemplate = ValueUnion.psz;
    794794                break;
    795 #endif /* VBOX_WITH_VIDEOREC defined */
     795#endif /* VBOX_WITH_RECORDING defined */
    796796            case 'h':
    797 #ifdef VBOX_WITH_VIDEOREC
     797#ifdef VBOX_WITH_RECORDING
    798798                if ((GetState.pDef->fFlags & RTGETOPT_REQ_MASK) != RTGETOPT_REQ_NOTHING)
    799799                {
    … …  
    817817    }
    818818
    819 #ifdef VBOX_WITH_VIDEOREC
     819#ifdef VBOX_WITH_RECORDING
    820820    if (ulRecordVideoWidth < 512 || ulRecordVideoWidth > 2048 || ulRecordVideoWidth % 2)
    821821    {
    … …  
    847847    }
    848848    RTStrPrintf(&szRecordFileName[0], RTPATH_MAX, pszRecordFileNameTemplate, RTProcSelf());
    849 #endif /* defined VBOX_WITH_VIDEOREC */
     849#endif /* defined VBOX_WITH_RECORDING */
    850850
    851851    if (!pcszNameOrUUID)
    … …  
    958958        CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
    959959
    960 #ifdef VBOX_WITH_VIDEOREC
     960#ifdef VBOX_WITH_RECORDING
    961961        if (fRecordEnabled)
    962962        {
    … …  
    978978            }
    979979        }
    980 #endif /* defined(VBOX_WITH_VIDEOREC) */
     980#endif /* defined(VBOX_WITH_RECORDING) */
    981981
    982982        /* get the machine debugger (isn't necessarily available) */
    … …  
    12271227        Log(("VBoxHeadless: event loop has terminated...\n"));
    12281228
    1229 #ifdef VBOX_WITH_VIDEOREC
     1229#ifdef VBOX_WITH_RECORDING
    12301230        if (fRecordEnabled)
    12311231        {
    … …  
    12371237            }
    12381238        }
    1239 #endif /* VBOX_WITH_VIDEOREC */
     1239#endif /* VBOX_WITH_RECORDING */
    12401240
    12411241        /* we don't have to disable VRDE here because we don't save the settings of the VM */

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

    r68941 r75345  
    4141        $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
    4242        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
    43         $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC) \
    44         $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC) \
     43        $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING) \
     44        $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING) \
    4545        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE) \
    4646        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA)

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

    r75341 r75345  
    18541854            RTFileClose(pngFile);
    18551855        }
    1856 #ifdef VBOX_WITH_VIDEOREC
     1856#ifdef VBOX_WITH_RECORDING
    18571857        else if (!strcmp(a->argv[1], "record"))
    18581858        {
    … …  
    20752075            }
    20762076        }
    2077 #endif /* VBOX_WITH_VIDEOREC */
     2077#endif /* VBOX_WITH_RECORDING */
    20782078        else if (!strcmp(a->argv[1], "webcam"))
    20792079        {

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

    r75341 r75345  
    712712                     "                                             acpishutdown]\n"
    713713#endif
    714 #ifdef VBOX_WITH_VIDEOREC
     714#ifdef VBOX_WITH_RECORDING
    715715                     "                            [--record on|off]\n"
    716716                     "                            [--record screens all|<screen ID> [<screen ID> ...]]\n"
    … …  
    831831                     "                            setscreenlayout <display> on|primary <xorigin> <yorigin> <xres> <yres> <bpp> | off\n"
    832832                     "                            screenshotpng <file> [display] |\n"
    833 #ifdef VBOX_WITH_VIDEOREC
     833#ifdef VBOX_WITH_RECORDING
    834834                     "                            record on|off |\n"
    835835                     "                            record screens all|none|<screen>,[<screen>...] |\n"
    … …  
    840840                     "                            record maxtime <s> |\n"
    841841                     "                            record maxfilesize <MB> |\n"
    842 #endif /* VBOX_WITH_VIDEOREC */
     842#endif /* VBOX_WITH_RECORDING */
    843843                     "                            setcredentials <username>\n"
    844844                     "                                           --passwordfile <file> | <password>\n"

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

    r75341 r75345  
    23712371    }
    23722372
    2373 #ifdef VBOX_WITH_VIDEOREC
     2373#ifdef VBOX_WITH_RECORDING
    23742374    {
    23752375        /* Video capture */
    23762376        BOOL fCaptureVideo = FALSE;
    2377 # ifdef VBOX_WITH_AUDIO_VIDEOREC
     2377# ifdef VBOX_WITH_AUDIO_RECORDING
    23782378        BOOL fCaptureAudio = FALSE;
    23792379# endif
    … …  
    24122412            else if (key.compare("ac_enabled", Utf8Str::CaseInsensitive) == 0)
    24132413            {
    2414 # ifdef VBOX_WITH_AUDIO_VIDEOREC
     2414# ifdef VBOX_WITH_AUDIO_RECORDING
    24152415                fCaptureAudio = value.compare("true", Utf8Str::CaseInsensitive) == 0;
    24162416# endif
    … …  
    24192419
    24202420        SHOW_BOOL_VALUE_EX("videocap", "Capturing:", fCaptureVideo, "active", "not active");
    2421 # ifdef VBOX_WITH_AUDIO_VIDEOREC
     2421# ifdef VBOX_WITH_AUDIO_RECORDING
    24222422        SHOW_BOOL_VALUE_EX("videocapaudio", "Capture audio:", fCaptureAudio, "active", "not active");
    24232423# endif
    … …  
    24422442        /** @todo Add more audio capturing profile / information here. */
    24432443    }
    2444 #endif /* VBOX_WITH_VIDEOREC */
     2444#endif /* VBOX_WITH_RECORDING */
    24452445
    24462446    if (    details == VMINFO_STANDARD

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

    r75341 r75345  
    214214    MODIFYVM_USBCARDREADER,
    215215#endif
    216 #ifdef VBOX_WITH_VIDEOREC
     216#ifdef VBOX_WITH_RECORDING
    217217    MODIFYVM_RECORD,
    218218    MODIFYVM_RECORD_FEATURES,
    … …  
    394394    { "--faulttolerancesyncinterval", MODIFYVM_FAULT_TOLERANCE_SYNC_INTERVAL, RTGETOPT_REQ_UINT32 },
    395395    { "--chipset",                  MODIFYVM_CHIPSET,                   RTGETOPT_REQ_STRING },
    396 #ifdef VBOX_WITH_VIDEOREC
     396#ifdef VBOX_WITH_RECORDING
    397397    { "--record",                   MODIFYVM_RECORD,                    RTGETOPT_REQ_BOOL_ONOFF },
    398398    { "--recordscreens",            MODIFYVM_RECORD_SCREENS,            RTGETOPT_REQ_STRING },
    … …  
    464464}
    465465
    466 #ifdef VBOX_WITH_VIDEOREC
     466#ifdef VBOX_WITH_RECORDING
    467467static int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens)
    468468{
    … …  
    29272927                break;
    29282928            }
    2929 #ifdef VBOX_WITH_VIDEOREC
     2929#ifdef VBOX_WITH_RECORDING
    29302930            case MODIFYVM_RECORD:
    29312931                RT_FALL_THROUGH();

  • trunk/src/VBox/Main/Makefile.kmk

    r75344 r75345  
    354354        $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \
    355355        $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \
    356         $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC,) \
    357         $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,) \
     356        $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING,) \
     357        $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) \
    358358        $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
    359359        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
    … …  
    760760        $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \
    761761        $(if $(VBOX_WITH_AUDIO_VALIDATIONKIT),VBOX_WITH_AUDIO_VALIDATIONKIT,) \
    762         $(if $(VBOX_WITH_AUDIO_VIDEOREC),VBOX_WITH_AUDIO_VIDEOREC,) \
    763         $(if $(VBOX_WITH_VIDEOREC),VBOX_WITH_VIDEOREC,) \
     762        $(if $(VBOX_WITH_AUDIO_RECORDING),VBOX_WITH_AUDIO_RECORDING,) \
     763        $(if $(VBOX_WITH_RECORDING),VBOX_WITH_RECORDING,) \
    764764        $(if $(VBOX_WITH_AUDIO_VRDE),VBOX_WITH_AUDIO_VRDE,) \
    765765        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
    … …  
    795795VBoxC_SDKS = VBOX_LIBPNG VBOX_ZLIB
    796796
    797 ifdef VBOX_WITH_VIDEOREC
     797ifdef VBOX_WITH_RECORDING
    798798   VBoxC_SOURCES += \
    799799        xml/Settings.cpp \
    … …  
    813813endif
    814814
    815 ifdef VBOX_WITH_AUDIO_VIDEOREC
     815ifdef VBOX_WITH_AUDIO_RECORDING
    816816  ifdef VBOX_WITH_LIBOPUS
    817817   VBoxC_SDKS += VBOX_OPUS
    … …  
    933933        src-client/AudioDriver.cpp \
    934934        $(if $(VBOX_WITH_AUDIO_VRDE),src-client/DrvAudioVRDE.cpp,) \
    935         $(if $(VBOX_WITH_AUDIO_VIDEOREC),src-client/DrvAudioRec.cpp,)
     935        $(if $(VBOX_WITH_AUDIO_RECORDING),src-client/DrvAudioRec.cpp,)
    936936
    937937VBoxC_SOURCES.win = \

  • trunk/src/VBox/Main/include/ConsoleImpl.h

    r75344 r75345  
    2424#include "SecretKeyStore.h"
    2525#include "ConsoleWrap.h"
    26 #ifdef VBOX_WITH_VIDEOREC
     26#ifdef VBOX_WITH_RECORDING
    2727# include "Recording.h"
    2828#endif
    … …  
    4040class EmulatedUSB;
    4141class AudioVRDE;
    42 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     42#ifdef VBOX_WITH_AUDIO_RECORDING
    4343class AudioVideoRec;
    4444#endif
    … …  
    141141    AudioVRDE *i_getAudioVRDE() const { return mAudioVRDE; }
    142142#endif
    143 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     143#ifdef VBOX_WITH_AUDIO_RECORDING
    144144    int i_videoRecCreate(void);
    145145    void i_videoRecDestroy(void);
    … …  
    10301030    ComPtr<IEventListener> mVmListener;
    10311031
    1032 #ifdef VBOX_WITH_VIDEOREC
     1032#ifdef VBOX_WITH_RECORDING
    10331033    struct Capture
    10341034    {
    … …  
    10391039        /** The capturing context. */
    10401040        CaptureContext       *mpVideoRecCtx;
    1041 # ifdef VBOX_WITH_AUDIO_VIDEOREC
     1041# ifdef VBOX_WITH_AUDIO_RECORDING
    10421042        /** Pointer to capturing audio backend. */
    10431043        AudioVideoRec * const mAudioVideoRec;
    10441044# endif
    10451045    } Capture;
    1046 #endif /* VBOX_WITH_VIDEOREC */
     1046#endif /* VBOX_WITH_RECORDING */
    10471047
    10481048    friend class VMTask;

  • trunk/src/VBox/Main/include/DisplayImpl.h

    r75251 r75345  
    9797#endif /* VBOX_WITH_CROGL */
    9898
    99 #ifdef VBOX_WITH_VIDEOREC
     99#ifdef VBOX_WITH_RECORDING
    100100    struct
    101101    {
    102102        ComPtr<IDisplaySourceBitmap> pSourceBitmap;
    103103    } videoRec;
    104 #endif /* VBOX_WITH_VIDEOREC */
     104#endif /* VBOX_WITH_RECORDING */
    105105} DISPLAYFBINFO;
    106106
    … …  
    200200    void VideoAccelFlushVMMDev(void);
    201201
    202 #ifdef VBOX_WITH_VIDEOREC
     202#ifdef VBOX_WITH_RECORDING
    203203    int  i_videoRecInvalidate(void);
    204204    void i_videoRecScreenChanged(unsigned uScreenId);
    … …  
    469469    RTCRITSECT           mVideoAccelLock;
    470470
    471 #ifdef VBOX_WITH_VIDEOREC
     471#ifdef VBOX_WITH_RECORDING
    472472    /* Serializes access to video recording source bitmaps. */
    473473    RTCRITSECT           mVideoRecLock;

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r75344 r75345  
    6262# include "DrvAudioVRDE.h"
    6363#endif
    64 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     64#ifdef VBOX_WITH_AUDIO_RECORDING
    6565# include "DrvAudioRec.h"
    6666#endif
    … …  
    8383#include "ThreadTask.h"
    8484
    85 #ifdef VBOX_WITH_VIDEOREC
     85#ifdef VBOX_WITH_RECORDING
    8686# include "Recording.h"
    8787#endif
    … …  
    586586        AssertReturn(mAudioVRDE, E_FAIL);
    587587#endif
    588 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     588#ifdef VBOX_WITH_AUDIO_RECORDING
    589589        unconst(Capture.mAudioVideoRec) = new AudioVideoRec(this);
    590590        AssertReturn(Capture.mAudioVideoRec, E_FAIL);
    … …  
    734734#endif
    735735
    736 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     736#ifdef VBOX_WITH_AUDIO_RECORDING
    737737    if (Capture.mAudioVideoRec)
    738738    {
    … …  
    55995599}
    56005600
    5601 #ifdef VBOX_WITH_VIDEOREC
     5601#ifdef VBOX_WITH_RECORDING
    56025602/**
    56035603 * Enables or disables video (audio) capturing of a VM.
    … …  
    56305630                if (RT_SUCCESS(vrc))
    56315631                {
    5632 # ifdef VBOX_WITH_AUDIO_VIDEOREC
     5632# ifdef VBOX_WITH_AUDIO_RECORDING
    56335633                    /* Attach the video recording audio driver if required. */
    56345634                    if (   Capture.mpVideoRecCtx->IsFeatureEnabled(RecordFeature_Audio)
    … …  
    56505650            {
    56515651                i_videoRecStop();
    5652 # ifdef VBOX_WITH_AUDIO_VIDEOREC
     5652# ifdef VBOX_WITH_AUDIO_RECORDING
    56535653                Capture.mAudioVideoRec->doDetachDriverViaEmt(mpUVM, pAutoLock);
    56545654# endif
    … …  
    56655665    return vrc;
    56665666}
    5667 #endif /* VBOX_WITH_VIDEOREC */
     5667#endif /* VBOX_WITH_RECORDING */
    56685668
    56695669HRESULT Console::i_onRecordChange()
    … …  
    56755675
    56765676    HRESULT rc = S_OK;
    5677 #ifdef VBOX_WITH_VIDEOREC
     5677#ifdef VBOX_WITH_RECORDING
    56785678    /* Don't trigger video capture changes if the VM isn't running. */
    56795679    SafeVMPtrQuiet ptrVM(this);
    … …  
    56975697        ptrVM.release();
    56985698    }
    5699 #endif /* VBOX_WITH_VIDEOREC */
     5699#endif /* VBOX_WITH_RECORDING */
    57005700
    57015701    return rc;
    … …  
    68676867}
    68686868
    6869 #ifdef VBOX_WITH_AUDIO_VIDEOREC
     6869#ifdef VBOX_WITH_AUDIO_RECORDING
    68706870/**
    68716871 * Sends audio (frame) data to the display's video capturing routines.
    … …  
    68896889    return S_OK;
    68906890}
    6891 #endif /* VBOX_WITH_AUDIO_VIDEOREC */
    6892 
    6893 #ifdef VBOX_WITH_VIDEOREC
     6891#endif /* VBOX_WITH_AUDIO_RECORDING */
     6892
     6893#ifdef VBOX_WITH_RECORDING
    68946894int Console::i_videoRecGetSettings(settings::RecordSettings &Settings)
    68956895{
    … …  
    70577057    return rc;
    70587058}
    7059 #endif /* VBOX_WITH_VIDEOREC */
     7059#endif /* VBOX_WITH_RECORDING */
    70607060
    70617061/**
    … …  
    1014510145        pConsole->i_consoleVRDPServer()->EnableConnections();
    1014610146
    10147 #ifdef VBOX_WITH_VIDEOREC
     10147#ifdef VBOX_WITH_RECORDING
    1014810148        ComPtr<IRecordSettings> RecordSettings;
    1014910149        rc = pConsole->mMachine->COMGETTER(RecordSettings)(RecordSettings.asOutParam());

  • trunk/src/VBox/Main/src-client/DisplayImpl.cpp

    r75344 r75345  
    5353#include <VBox/com/array.h>
    5454
    55 #ifdef VBOX_WITH_VIDEOREC
     55#ifdef VBOX_WITH_RECORDING
    5656# include <iprt/path.h>
    5757# include "Recording.h"
    … …  
    146146#endif
    147147
    148 #ifdef VBOX_WITH_VIDEOREC
     148#ifdef VBOX_WITH_RECORDING
    149149    rc = RTCritSectInit(&mVideoRecLock);
    150150    AssertRC(rc);
    … …  
    178178    uninit();
    179179
    180 #ifdef VBOX_WITH_VIDEOREC
     180#ifdef VBOX_WITH_RECORDING
    181181    if (RTCritSectIsInitialized(&mVideoRecLock))
    182182    {
    … …  
    729729        maFramebuffers[uScreenId].updateImage.cbLine = 0;
    730730        maFramebuffers[uScreenId].pFramebuffer.setNull();
    731 #ifdef VBOX_WITH_VIDEOREC
     731#ifdef VBOX_WITH_RECORDING
    732732        maFramebuffers[uScreenId].videoRec.pSourceBitmap.setNull();
    733733#endif
    … …  
    10571057        i_handleSetVisibleRegion(mcRectVisibleRegion, mpRectVisibleRegion);
    10581058
    1059 #ifdef VBOX_WITH_VIDEOREC
     1059#ifdef VBOX_WITH_RECORDING
    10601060    i_videoRecScreenChanged(uScreenId);
    10611061#endif
    … …  
    24052405}
    24062406
    2407 #ifdef VBOX_WITH_VIDEOREC
     2407#ifdef VBOX_WITH_RECORDING
    24082408/**
    24092409 * Invalidates the capturing configuration.
    … …  
    24602460    }
    24612461}
    2462 #endif /* VBOX_WITH_VIDEOREC */
     2462#endif /* VBOX_WITH_RECORDING */
    24632463
    24642464int Display::i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address,
    … …  
    33873387    }
    33883388
    3389 #ifdef VBOX_WITH_VIDEOREC
     3389#ifdef VBOX_WITH_RECORDING
    33903390    AssertPtr(pDisplay->mParent);
    33913391    CaptureContext *pCtx = pDisplay->mParent->i_videoRecGetContext();
    … …  
    34863486        } while (0);
    34873487    }
    3488 #endif /* VBOX_WITH_VIDEOREC */
     3488#endif /* VBOX_WITH_RECORDING */
    34893489
    34903490#ifdef DEBUG_sunlover_2
    … …  
    38323832bool  Display::i_handleCrVRecScreenshotBegin(uint32_t uScreen, uint64_t uTimestampMs)
    38333833{
    3834 # ifdef VBOX_WITH_VIDEOREC
     3834# ifdef VBOX_WITH_RECORDING
    38353835    CaptureContext *pCtx = mParent->i_videoRecGetContext();
    38363836    return (      pCtx
    … …  
    38543854{
    38553855    Assert(mfCrOglVideoRecState == CRVREC_STATE_SUBMITTED);
    3856 # ifdef VBOX_WITH_VIDEOREC
     3856# ifdef VBOX_WITH_RECORDING
    38573857    CaptureContext *pCtx = mParent->i_videoRecGetContext();
    38583858
    … …  
    38723872    RT_NOREF(uScreen, x, y, uPixelFormat, \
    38733873             uBitsPerPixel, uBytesPerLine, uGuestWidth, uGuestHeight, pu8BufferAddress, uTimestampMs);
    3874 # endif /* VBOX_WITH_VIDEOREC */
     3874# endif /* VBOX_WITH_RECORDING */
    38753875}
    38763876
    … …  
    44984498    {
    44994499        AutoWriteLock displayLock(pThis->pDisplay COMMA_LOCKVAL_SRC_POS);
    4500 #ifdef VBOX_WITH_VIDEOREC
     4500#ifdef VBOX_WITH_RECORDING
    45014501        pThis->pDisplay->mParent->i_videoRecStop();
    45024502#endif
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette