Changeset 75354 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

Timestamp:

Nov 9, 2018 11:22:09 AM (6 years ago)

Author:

vboxsync

Message:

Recording: More renaming for Main internals.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (12 diffs)

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

@@ -5616 +5616 @@
     if (pDisplay)
     {
-        const bool fIsEnabled =    Recording.mpRecordCtx
-                                && Recording.mpRecordCtx->IsStarted();
+        const bool fIsEnabled =    Recording.mpCtx
+                                && Recording.mpCtx->IsStarted();
 
         if (RT_BOOL(fEnable) != fIsEnabled)
@@ -5632 +5632 @@
 # ifdef VBOX_WITH_AUDIO_RECORDING
                     /* Attach the video recording audio driver if required. */
-                    if (   Recording.mpRecordCtx->IsFeatureEnabled(RecordFeature_Audio)
+                    if (   Recording.mpCtx->IsFeatureEnabled(RecordFeature_Audio)
                         && Recording.mAudioRec)
                     {
-                        vrc = Recording.mAudioRec->applyConfiguration(Recording.mpRecordCtx->GetConfig());
+                        vrc = Recording.mAudioRec->applyConfiguration(Recording.mpCtx->GetConfig());
                         if (RT_SUCCESS(vrc))
                             vrc = Recording.mAudioRec->doAttachDriverViaEmt(mpUVM, pAutoLock);
@@ -5641 +5641 @@
 # endif
                     if (   RT_SUCCESS(vrc)
-                        && Recording.mpRecordCtx->IsReady()) /* Any video recording (audio and/or video) feature enabled? */
+                        && Recording.mpCtx->IsReady()) /* Any video recording (audio and/or video) feature enabled? */
                     {
                         vrc = i_recordingStart();
@@ -6878 +6878 @@
 HRESULT Console::i_recordingSendAudio(const void *pvData, size_t cbData, uint64_t uTimestampMs)
 {
-    if (!Recording.mpRecordCtx)
+    if (!Recording.mpCtx)
         return S_OK;
 
-    if (   Recording.mpRecordCtx->IsStarted()
-        && Recording.mpRecordCtx->IsFeatureEnabled(RecordFeature_Audio))
-    {
-        return Recording.mpRecordCtx->SendAudioFrame(pvData, cbData, uTimestampMs);
+    if (   Recording.mpCtx->IsStarted()
+        && Recording.mpCtx->IsFeatureEnabled(RecordFeature_Audio))
+    {
+        return Recording.mpCtx->SendAudioFrame(pvData, cbData, uTimestampMs);
     }
 
@@ -6907 +6907 @@
     Settings.fEnabled = RT_BOOL(fTemp);
 
-    SafeIfaceArray<IRecordScreenSettings> paCaptureScreens;
-    hrc = pRecordSettings->COMGETTER(Screens)(ComSafeArrayAsOutParam(paCaptureScreens));
+    SafeIfaceArray<IRecordScreenSettings> paRecordingScreens;
+    hrc = pRecordSettings->COMGETTER(Screens)(ComSafeArrayAsOutParam(paRecordingScreens));
     AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
 
-    for (unsigned long i = 0; i < (unsigned long)paCaptureScreens.size(); ++i)
+    for (unsigned long i = 0; i < (unsigned long)paRecordingScreens.size(); ++i)
     {
         settings::RecordScreenSettings RecordScreenSettings;
-        ComPtr<IRecordScreenSettings> pRecordScreenSettings = paCaptureScreens[i];
+        ComPtr<IRecordScreenSettings> pRecordScreenSettings = paRecordingScreens[i];
 
         hrc = pRecordScreenSettings->COMGETTER(Enabled)(&fTemp);
@@ -6942 +6942 @@
     }
 
-    Assert(Settings.mapScreens.size() == paCaptureScreens.size());
+    Assert(Settings.mapScreens.size() == paRecordingScreens.size());
 
     return VINF_SUCCESS;
@@ -6954 +6954 @@
 int Console::i_recordingCreate(void)
 {
-    AssertReturn(Recording.mpRecordCtx == NULL, VERR_WRONG_ORDER);
+    AssertReturn(Recording.mpCtx == NULL, VERR_WRONG_ORDER);
 
     int rc = VINF_SUCCESS;
@@ -6960 +6960 @@
     try
     {
-        Recording.mpRecordCtx = new CaptureContext(this);
+        Recording.mpCtx = new RecordingContext(this);
     }
     catch (std::bad_alloc &)
@@ -6975 +6975 @@
     if (RT_SUCCESS(rc))
     {
-        AssertPtr(Recording.mpRecordCtx);
-        rc = Recording.mpRecordCtx->Create(Settings);
+        AssertPtr(Recording.mpCtx);
+        rc = Recording.mpCtx->Create(Settings);
     }
 
@@ -6988 +6988 @@
 void Console::i_recordingDestroy(void)
 {
-    if (Recording.mpRecordCtx)
-    {
-        delete Recording.mpRecordCtx;
-        Recording.mpRecordCtx = NULL;
+    if (Recording.mpCtx)
+    {
+        delete Recording.mpCtx;
+        Recording.mpCtx = NULL;
     }
 
@@ -7004 +7004 @@
 int Console::i_recordingStart(void)
 {
-    AssertPtrReturn(Recording.mpRecordCtx, VERR_WRONG_ORDER);
-
-    if (Recording.mpRecordCtx->IsStarted())
+    AssertPtrReturn(Recording.mpCtx, VERR_WRONG_ORDER);
+
+    if (Recording.mpCtx->IsStarted())
         return VINF_SUCCESS;
 
     LogRel(("Recording: Starting ...\n"));
 
-    int rc = Recording.mpRecordCtx->Start();
+    int rc = Recording.mpCtx->Start();
     if (RT_SUCCESS(rc))
     {
-        for (unsigned uScreen = 0; uScreen < Recording.mpRecordCtx->GetStreamCount(); uScreen++)
+        for (unsigned uScreen = 0; uScreen < Recording.mpCtx->GetStreamCount(); uScreen++)
             mDisplay->i_recordingScreenChanged(uScreen);
     }
@@ -7030 +7030 @@
 int Console::i_recordingStop(void)
 {
-    if (   !Recording.mpRecordCtx
-        || !Recording.mpRecordCtx->IsStarted())
+    if (   !Recording.mpCtx
+        || !Recording.mpCtx->IsStarted())
         return VINF_SUCCESS;
 
     LogRel(("Recording: Stopping ...\n"));
 
-    int rc = Recording.mpRecordCtx->Stop();
+    int rc = Recording.mpCtx->Stop();
     if (RT_SUCCESS(rc))
     {
-        const size_t cStreams = Recording.mpRecordCtx->GetStreamCount();
+        const size_t cStreams = Recording.mpCtx->GetStreamCount();
         for (unsigned uScreen = 0; uScreen < cStreams; ++uScreen)
             mDisplay->i_recordingScreenChanged(uScreen);