Changeset 75346 in vbox for trunk

Timestamp:

Nov 9, 2018 10:05:06 AM (6 years ago)

Author:

vboxsync

Message:

Recording: VBOX_WITH_VIDEOREC -> VBOX_WITH_RECORDING, VBOX_WITH_AUDIO_VIDEOREC -> VBOX_WITH_AUDIO_RECORDING.

Location:

trunk/src/VBox/Main

Files:

• include/RecordingInternals.h (modified) (3 diffs)
• include/RecordingStream.h (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src-client/Recording.cpp (modified) (1 diff)
• src-client/RecordingInternals.cpp (modified) (2 diffs)
• src-client/RecordingStream.cpp (modified) (9 diffs)
• src-client/VBoxDriversRegister.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/RecordingInternals.h

@@ -87 +87 @@
 } VIDEORECVIDEOFRAME, *PVIDEORECVIDEOFRAME;
 
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
 /**
  * Structure for keeping a single video recording audio frame.
@@ -109 +109 @@
     /** The block is a video frame. */
     VIDEORECBLOCKTYPE_VIDEO,
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
     /** The block is an audio frame. */
     VIDEORECBLOCKTYPE_AUDIO
@@ -136 +136 @@
 
 void VideoRecBlockFree(PVIDEORECBLOCK pBlock);
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
 void VideoRecAudioFrameFree(PVIDEORECAUDIOFRAME pFrame);
 #endif

trunk/src/VBox/Main/include/RecordingStream.h

@@ -180 +180 @@
     } File;
     bool                fEnabled;
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
     /** Track number of audio stream. */
     uint8_t             uTrackAudio;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -125 +125 @@
 # include "DrvAudioVRDE.h"
 #endif
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
 # include "DrvAudioRec.h"
 #endif
@@ -2993 +2993 @@
 #endif /* VBOX_WITH_AUDIO_VRDE */
 
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
             /* Insert dummy audio driver to have the LUN configured. */
             CFGMR3InsertNodeF(pInst, &pLunL0, "LUN#%RU8", uAudioLUN);
@@ -3001 +3001 @@
             if (RT_SUCCESS(rc))
                 uAudioLUN++;
-#endif /* VBOX_WITH_AUDIO_VIDEOREC */
+#endif /* VBOX_WITH_AUDIO_RECORDING */
 
             if (fDebugEnabled)

trunk/src/VBox/Main/src-client/Recording.cpp

@@ -466 +466 @@
 int CaptureContext::SendAudioFrame(const void *pvData, size_t cbData, uint64_t uTimeStampMs)
 {
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
     AssertReturn(cbData, VERR_INVALID_PARAMETER);

trunk/src/VBox/Main/src-client/RecordingInternals.cpp

@@ -21 +21 @@
 #include <iprt/mem.h>
 
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
 /**
  * Frees a previously allocated video recording audio frame.
@@ -78 +78 @@
             break;
 
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
         case VIDEORECBLOCKTYPE_AUDIO:
             VideoRecAudioFrameFree((PVIDEORECAUDIOFRAME)pBlock->pvData);

trunk/src/VBox/Main/src-client/RecordingStream.cpp

@@ -210 +210 @@
             {
                 this->ScreenSettings.featureMap[RecordFeature_Video] = false;
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
                 LogRel(("Recording: Only audio will be recorded\n"));
 #endif
@@ -217 +217 @@
         else if (key.compare("ac_enabled", Utf8Str::CaseInsensitive) == 0)
         {
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
             if (value.compare("true", Utf8Str::CaseInsensitive) == 0)
             {
@@ -228 +228 @@
         else if (key.compare("ac_profile", Utf8Str::CaseInsensitive) == 0)
         {
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
             if (value.compare("low", Utf8Str::CaseInsensitive) == 0)
             {
@@ -364 +364 @@
     }
 
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
     AssertPtr(pCtx);
 
@@ -705 +705 @@
             AssertPtr(File.pWEBM);
             rc = File.pWEBM->OpenEx(pszFile, &this->File.hFile,
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
                                       Settings.isFeatureEnabled(RecordFeature_Audio)
                                     ? WebMWriter::AudioCodec_Opus : WebMWriter::AudioCodec_None,
@@ -734 +734 @@
             }
 
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
             if (fAudioEnabled)
             {
@@ -752 +752 @@
 
             if (   fVideoEnabled
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
                 || fAudioEnabled
 #endif
@@ -760 +760 @@
                 if (fVideoEnabled)
                     RTStrCat(szWhat, sizeof(szWhat), "video");
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
                 if (fAudioEnabled)
                 {
@@ -1024 +1024 @@
 int CaptureStream::initAudio(void)
 {
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
     if (this->ScreenSettings.isFeatureEnabled(RecordFeature_Audio))
     {

trunk/src/VBox/Main/src-client/VBoxDriversRegister.cpp

@@ -31 +31 @@
 # include "DrvAudioVRDE.h"
 #endif
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
 # include "DrvAudioRec.h"
 #endif
@@ -80 +80 @@
         return rc;
 #endif
-#ifdef VBOX_WITH_AUDIO_VIDEOREC
+#ifdef VBOX_WITH_AUDIO_RECORDING
     rc = pCallbacks->pfnRegister(pCallbacks, &AudioVideoRec::DrvReg);
     if (RT_FAILURE(rc))