Index: trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 75331)
+++ trunk/src/VBox/Main/src-client/ConsoleImpl.cpp	(revision 75341)
@@ -5632,5 +5632,5 @@
 # ifdef VBOX_WITH_AUDIO_VIDEOREC
                     /* Attach the video recording audio driver if required. */
-                    if (   Capture.mpVideoRecCtx->IsFeatureEnabled(CaptureFeature_Audio)
+                    if (   Capture.mpVideoRecCtx->IsFeatureEnabled(RecordFeature_Audio)
                         && Capture.mAudioVideoRec)
                     {
@@ -5667,5 +5667,5 @@
 #endif /* VBOX_WITH_VIDEOREC */
 
-HRESULT Console::i_onCaptureChange()
+HRESULT Console::i_onRecordChange()
 {
     AutoCaller autoCaller(this);
@@ -5680,10 +5680,10 @@
     if (ptrVM.isOk())
     {
-        ComPtr<ICaptureSettings> CaptureSettings;
-        rc = mMachine->COMGETTER(CaptureSettings)(CaptureSettings.asOutParam());
+        ComPtr<IRecordSettings> RecordSettings;
+        rc = mMachine->COMGETTER(RecordSettings)(RecordSettings.asOutParam());
         AssertComRCReturnRC(rc);
 
         BOOL fEnabled;
-        rc = CaptureSettings->COMGETTER(Enabled)(&fEnabled);
+        rc = RecordSettings->COMGETTER(Enabled)(&fEnabled);
         AssertComRCReturnRC(rc);
 
@@ -5692,5 +5692,5 @@
         {
             alock.release();
-            fireCaptureChangedEvent(mEventSource);
+            fireRecordChangedEvent(mEventSource);
         }
 
@@ -6882,5 +6882,5 @@
 
     if (   Capture.mpVideoRecCtx->IsStarted()
-        && Capture.mpVideoRecCtx->IsFeatureEnabled(CaptureFeature_Audio))
+        && Capture.mpVideoRecCtx->IsFeatureEnabled(RecordFeature_Audio))
     {
         return Capture.mpVideoRecCtx->SendAudioFrame(pvData, cbData, uTimestampMs);
@@ -6892,5 +6892,5 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-int Console::i_videoRecGetSettings(settings::CaptureSettings &Settings)
+int Console::i_videoRecGetSettings(settings::RecordSettings &Settings)
 {
     Assert(mMachine.isNotNull());
@@ -6898,46 +6898,46 @@
     Settings.applyDefaults();
 
-    ComPtr<ICaptureSettings> pCaptureSettings;
-    HRESULT hrc = mMachine->COMGETTER(CaptureSettings)(pCaptureSettings.asOutParam());
+    ComPtr<IRecordSettings> pRecordSettings;
+    HRESULT hrc = mMachine->COMGETTER(RecordSettings)(pRecordSettings.asOutParam());
     AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
 
     BOOL fTemp;
-    hrc = pCaptureSettings->COMGETTER(Enabled)(&fTemp);
+    hrc = pRecordSettings->COMGETTER(Enabled)(&fTemp);
     AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
     Settings.fEnabled = RT_BOOL(fTemp);
 
-    SafeIfaceArray<ICaptureScreenSettings> paCaptureScreens;
-    hrc = pCaptureSettings->COMGETTER(Screens)(ComSafeArrayAsOutParam(paCaptureScreens));
+    SafeIfaceArray<IRecordScreenSettings> paCaptureScreens;
+    hrc = pRecordSettings->COMGETTER(Screens)(ComSafeArrayAsOutParam(paCaptureScreens));
     AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
 
     for (unsigned long i = 0; i < (unsigned long)paCaptureScreens.size(); ++i)
     {
-        settings::CaptureScreenSettings CaptureScreenSettings;
-        ComPtr<ICaptureScreenSettings> pCaptureScreenSettings = paCaptureScreens[i];
-
-        hrc = pCaptureScreenSettings->COMGETTER(Enabled)(&fTemp);
+        settings::RecordScreenSettings RecordScreenSettings;
+        ComPtr<IRecordScreenSettings> pRecordScreenSettings = paCaptureScreens[i];
+
+        hrc = pRecordScreenSettings->COMGETTER(Enabled)(&fTemp);
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
-        CaptureScreenSettings.fEnabled = RT_BOOL(fTemp);
-        hrc = pCaptureScreenSettings->COMGETTER(MaxTime)((ULONG *)&CaptureScreenSettings.ulMaxTimeS);
+        RecordScreenSettings.fEnabled = RT_BOOL(fTemp);
+        hrc = pRecordScreenSettings->COMGETTER(MaxTime)((ULONG *)&RecordScreenSettings.ulMaxTimeS);
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
-        hrc = pCaptureScreenSettings->COMGETTER(MaxFileSize)((ULONG *)&CaptureScreenSettings.File.ulMaxSizeMB);
+        hrc = pRecordScreenSettings->COMGETTER(MaxFileSize)((ULONG *)&RecordScreenSettings.File.ulMaxSizeMB);
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
         Bstr bstrTemp;
-        hrc = pCaptureScreenSettings->COMGETTER(FileName)(bstrTemp.asOutParam());
+        hrc = pRecordScreenSettings->COMGETTER(FileName)(bstrTemp.asOutParam());
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
-        CaptureScreenSettings.File.strName = bstrTemp;
-        hrc = pCaptureScreenSettings->COMGETTER(Options)(bstrTemp.asOutParam());
+        RecordScreenSettings.File.strName = bstrTemp;
+        hrc = pRecordScreenSettings->COMGETTER(Options)(bstrTemp.asOutParam());
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
-        CaptureScreenSettings.strOptions = bstrTemp;
-        hrc = pCaptureScreenSettings->COMGETTER(VideoWidth)((ULONG *)&CaptureScreenSettings.Video.ulWidth);
+        RecordScreenSettings.strOptions = bstrTemp;
+        hrc = pRecordScreenSettings->COMGETTER(VideoWidth)((ULONG *)&RecordScreenSettings.Video.ulWidth);
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
-        hrc = pCaptureScreenSettings->COMGETTER(VideoHeight)((ULONG *)&CaptureScreenSettings.Video.ulHeight);
+        hrc = pRecordScreenSettings->COMGETTER(VideoHeight)((ULONG *)&RecordScreenSettings.Video.ulHeight);
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
-        hrc = pCaptureScreenSettings->COMGETTER(VideoRate)((ULONG *)&CaptureScreenSettings.Video.ulRate);
+        hrc = pRecordScreenSettings->COMGETTER(VideoRate)((ULONG *)&RecordScreenSettings.Video.ulRate);
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
-        hrc = pCaptureScreenSettings->COMGETTER(VideoFPS)((ULONG *)&CaptureScreenSettings.Video.ulFPS);
+        hrc = pRecordScreenSettings->COMGETTER(VideoFPS)((ULONG *)&RecordScreenSettings.Video.ulFPS);
         AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
 
-        Settings.mapScreens[i] = CaptureScreenSettings;
+        Settings.mapScreens[i] = RecordScreenSettings;
     }
 
@@ -6971,5 +6971,5 @@
     }
 
-    settings::CaptureSettings Settings;
+    settings::RecordSettings Settings;
     rc = i_videoRecGetSettings(Settings);
     if (RT_SUCCESS(rc))
@@ -7043,8 +7043,8 @@
             mDisplay->i_videoRecScreenChanged(uScreen);
 
-        ComPtr<ICaptureSettings> pCaptureSettings;
-        HRESULT hrc = mMachine->COMGETTER(CaptureSettings)(pCaptureSettings.asOutParam());
+        ComPtr<IRecordSettings> pRecordSettings;
+        HRESULT hrc = mMachine->COMGETTER(RecordSettings)(pRecordSettings.asOutParam());
         ComAssertComRC(hrc);
-        hrc = pCaptureSettings->COMSETTER(Enabled)(false);
+        hrc = pRecordSettings->COMSETTER(Enabled)(false);
         ComAssertComRC(hrc);
 
@@ -10146,10 +10146,10 @@
 
 #ifdef VBOX_WITH_VIDEOREC
-        ComPtr<ICaptureSettings> CaptureSettings;
-        rc = pConsole->mMachine->COMGETTER(CaptureSettings)(CaptureSettings.asOutParam());
+        ComPtr<IRecordSettings> RecordSettings;
+        rc = pConsole->mMachine->COMGETTER(RecordSettings)(RecordSettings.asOutParam());
         AssertComRCReturnVoid(rc);
 
         BOOL fCaptureEnabled;
-        rc = CaptureSettings->COMGETTER(Enabled)(&fCaptureEnabled);
+        rc = RecordSettings->COMGETTER(Enabled)(&fCaptureEnabled);
         AssertComRCReturnVoid(rc);
 
@@ -10159,5 +10159,5 @@
             if (RT_SUCCESS(vrc2))
             {
-                fireCaptureChangedEvent(pConsole->mEventSource);
+                fireRecordChangedEvent(pConsole->mEventSource);
             }
             else
Index: trunk/src/VBox/Main/src-client/DisplayImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/DisplayImpl.cpp	(revision 75331)
+++ trunk/src/VBox/Main/src-client/DisplayImpl.cpp	(revision 75341)
@@ -3393,5 +3393,5 @@
     if (   pCtx
         && pCtx->IsStarted()
-        && pCtx->IsFeatureEnabled(CaptureFeature_Video))
+        && pCtx->IsFeatureEnabled(RecordFeature_Video))
     {
         do {
@@ -3859,5 +3859,5 @@
     if (   pCtx
         && pCtx->IsStarted()
-        && pCtx->IsFeatureEnabled(CaptureFeature_Video))
+        && pCtx->IsFeatureEnabled(RecordFeature_Video))
     {
         int rc2 = pCtx->SendVideoFrame(uScreen, x, y,
Index: trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp	(revision 75331)
+++ trunk/src/VBox/Main/src-client/DrvAudioVideoRec.cpp	(revision 75341)
@@ -1088,5 +1088,5 @@
  * @param   Settings        Capturing configuration to apply.
  */
-int AudioVideoRec::applyConfiguration(const settings::CaptureSettings &Settings)
+int AudioVideoRec::applyConfiguration(const settings::RecordSettings &Settings)
 {
     /** @todo Do some validation here. */
@@ -1108,9 +1108,9 @@
     /** @todo For now we're using the configuration of the first screen here audio-wise. */
     Assert(mVideoRecCfg.mapScreens.size() >= 1);
-    const settings::CaptureScreenSettings &Screen0Settings = mVideoRecCfg.mapScreens[0];
+    const settings::RecordScreenSettings &Screen0Settings = mVideoRecCfg.mapScreens[0];
 
     rc = CFGMR3InsertInteger(pLunCfg, "ContainerType", (uint64_t)Screen0Settings.enmDest);
     AssertRCReturn(rc, rc);
-    if (Screen0Settings.enmDest == CaptureDestination_File)
+    if (Screen0Settings.enmDest == RecordDestination_File)
     {
         rc = CFGMR3InsertString(pLunCfg, "ContainerFileName", Utf8Str(Screen0Settings.File.strName).c_str());
Index: trunk/src/VBox/Main/src-client/SessionImpl.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/SessionImpl.cpp	(revision 75331)
+++ trunk/src/VBox/Main/src-client/SessionImpl.cpp	(revision 75341)
@@ -725,15 +725,15 @@
 }
 
-HRESULT Session::onCaptureChange()
-{
-    LogFlowThisFunc(("\n"));
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
-    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
-#ifndef VBOX_COM_INPROC_API_CLIENT
-    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
-
-    return mConsole->i_onCaptureChange();
+HRESULT Session::onRecordChange()
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
+    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
+#ifndef VBOX_COM_INPROC_API_CLIENT
+    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
+
+    return mConsole->i_onRecordChange();
 #else
     return S_OK;
Index: trunk/src/VBox/Main/src-client/VideoRec.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/VideoRec.cpp	(revision 75331)
+++ trunk/src/VBox/Main/src-client/VideoRec.cpp	(revision 75341)
@@ -94,5 +94,5 @@
     , enmState(VIDEORECSTS_UNINITIALIZED) { }
 
-CaptureContext::CaptureContext(Console *a_pConsole, const settings::CaptureSettings &a_Settings)
+CaptureContext::CaptureContext(Console *a_pConsole, const settings::RecordSettings &a_Settings)
     : pConsole(a_pConsole)
     , enmState(VIDEORECSTS_UNINITIALIZED)
@@ -177,5 +177,5 @@
  * @param   a_Settings          Capture settings to use for context creation.
  */
-int CaptureContext::createInternal(const settings::CaptureSettings &a_Settings)
+int CaptureContext::createInternal(const settings::RecordSettings &a_Settings)
 {
     int rc = RTCritSectInit(&this->CritSect);
@@ -183,5 +183,5 @@
         return rc;
 
-    settings::CaptureScreenMap::const_iterator itScreen = a_Settings.mapScreens.begin();
+    settings::RecordScreenMap::const_iterator itScreen = a_Settings.mapScreens.begin();
     while (itScreen != a_Settings.mapScreens.end())
     {
@@ -318,5 +318,5 @@
 }
 
-const settings::CaptureSettings &CaptureContext::GetConfig(void) const
+const settings::RecordSettings &CaptureContext::GetConfig(void) const
 {
     return this->Settings;
@@ -355,5 +355,5 @@
 }
 
-int CaptureContext::Create(const settings::CaptureSettings &a_Settings)
+int CaptureContext::Create(const settings::RecordSettings &a_Settings)
 {
     return createInternal(a_Settings);
@@ -375,5 +375,5 @@
 }
 
-bool CaptureContext::IsFeatureEnabled(CaptureFeature_T enmFeature) const
+bool CaptureContext::IsFeatureEnabled(RecordFeature_T enmFeature) const
 {
     VideoRecStreams::const_iterator itStream = this->vecStreams.begin();
Index: trunk/src/VBox/Main/src-client/VideoRecStream.cpp
===================================================================
--- trunk/src/VBox/Main/src-client/VideoRecStream.cpp	(revision 75331)
+++ trunk/src/VBox/Main/src-client/VideoRecStream.cpp	(revision 75341)
@@ -51,5 +51,5 @@
 }
 
-CaptureStream::CaptureStream(CaptureContext *a_pCtx, uint32_t uScreen, const settings::CaptureScreenSettings &Settings)
+CaptureStream::CaptureStream(CaptureContext *a_pCtx, uint32_t uScreen, const settings::RecordScreenSettings &Settings)
     : enmState(RECORDINGSTREAMSTATE_UNINITIALIZED)
     , tsStartMs(0)
@@ -74,8 +74,8 @@
  * @returns IPRT status code.
  */
-int CaptureStream::open(const settings::CaptureScreenSettings &Settings)
+int CaptureStream::open(const settings::RecordScreenSettings &Settings)
 {
     /* Sanity. */
-    Assert(Settings.enmDest != CaptureDestination_None);
+    Assert(Settings.enmDest != RecordDestination_None);
 
     int rc;
@@ -83,5 +83,5 @@
     switch (Settings.enmDest)
     {
-        case CaptureDestination_File:
+        case RecordDestination_File:
         {
             Assert(Settings.File.strName.isNotEmpty());
@@ -209,5 +209,5 @@
             if (value.compare("false", Utf8Str::CaseInsensitive) == 0)
             {
-                this->ScreenSettings.featureMap[CaptureFeature_Video] = false;
+                this->ScreenSettings.featureMap[RecordFeature_Video] = false;
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
                 LogRel(("VideoRec: Only audio will be recorded\n"));
@@ -220,5 +220,5 @@
             if (value.compare("true", Utf8Str::CaseInsensitive) == 0)
             {
-                this->ScreenSettings.featureMap[CaptureFeature_Audio] = true;
+                this->ScreenSettings.featureMap[RecordFeature_Audio] = true;
             }
             else
@@ -255,5 +255,5 @@
 }
 
-const settings::CaptureScreenSettings &CaptureStream::GetConfig(void) const
+const settings::RecordScreenSettings &CaptureStream::GetConfig(void) const
 {
     return this->ScreenSettings;
@@ -277,5 +277,5 @@
     }
 
-    if (this->ScreenSettings.enmDest == CaptureDestination_File)
+    if (this->ScreenSettings.enmDest == RecordDestination_File)
     {
 
@@ -661,5 +661,5 @@
  * @param   Settings            Capturing configuration to use for initialization.
  */
-int CaptureStream::Init(CaptureContext *a_pCtx, uint32_t uScreen, const settings::CaptureScreenSettings &Settings)
+int CaptureStream::Init(CaptureContext *a_pCtx, uint32_t uScreen, const settings::RecordScreenSettings &Settings)
 {
     return initInternal(a_pCtx, uScreen, Settings);
@@ -674,5 +674,5 @@
  * @param   Settings            Capturing configuration to use for initialization.
  */
-int CaptureStream::initInternal(CaptureContext *a_pCtx, uint32_t uScreen, const settings::CaptureScreenSettings &Settings)
+int CaptureStream::initInternal(CaptureContext *a_pCtx, uint32_t uScreen, const settings::RecordScreenSettings &Settings)
 {
     int rc = parseOptionsString(Settings.strOptions);
@@ -688,6 +688,6 @@
         return rc;
 
-    const bool fVideoEnabled = Settings.isFeatureEnabled(CaptureFeature_Video);
-    const bool fAudioEnabled = Settings.isFeatureEnabled(CaptureFeature_Audio);
+    const bool fVideoEnabled = Settings.isFeatureEnabled(RecordFeature_Video);
+    const bool fAudioEnabled = Settings.isFeatureEnabled(RecordFeature_Audio);
 
     if (fVideoEnabled)
@@ -699,5 +699,5 @@
     switch (this->ScreenSettings.enmDest)
     {
-        case CaptureDestination_File:
+        case RecordDestination_File:
         {
             const char *pszFile = this->ScreenSettings.File.strName.c_str();
@@ -706,10 +706,10 @@
             rc = File.pWEBM->OpenEx(pszFile, &this->File.hFile,
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
-                                      Settings.isFeatureEnabled(CaptureFeature_Audio)
+                                      Settings.isFeatureEnabled(RecordFeature_Audio)
                                     ? WebMWriter::AudioCodec_Opus : WebMWriter::AudioCodec_None,
 #else
                                       WebMWriter::AudioCodec_None,
 #endif
-                                      Settings.isFeatureEnabled(CaptureFeature_Video)
+                                      Settings.isFeatureEnabled(RecordFeature_Video)
                                     ? WebMWriter::VideoCodec_VP8 : WebMWriter::VideoCodec_None);
             if (RT_FAILURE(rc))
@@ -814,5 +814,5 @@
         switch (this->ScreenSettings.enmDest)
         {
-            case CaptureDestination_File:
+            case RecordDestination_File:
             {
                 if (this->File.pWEBM)
@@ -839,5 +839,5 @@
     switch (this->ScreenSettings.enmDest)
     {
-        case CaptureDestination_File:
+        case RecordDestination_File:
         {
             if (RTFileIsValid(this->File.hFile))
@@ -891,5 +891,5 @@
         return rc;
 
-    if (this->ScreenSettings.isFeatureEnabled(CaptureFeature_Video))
+    if (this->ScreenSettings.isFeatureEnabled(RecordFeature_Video))
     {
         int rc2 = unitVideo();
@@ -1025,5 +1025,5 @@
 {
 #ifdef VBOX_WITH_AUDIO_VIDEOREC
-    if (this->ScreenSettings.isFeatureEnabled(CaptureFeature_Audio))
+    if (this->ScreenSettings.isFeatureEnabled(RecordFeature_Audio))
     {
         /* Sanity. */
