Changeset 75361 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 9, 2018 12:56:40 PM (6 years ago)

Author:

vboxsync

Message:

Recording/Main: Renamed the IRecord* interfaces again to IRecording* to make it more standardized.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageControlVM.cpp (modified) (10 diffs)
• VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (7 diffs)
• VirtualBox/src/globals/UIMainEventListener.cpp (modified) (1 diff)
• VirtualBox/src/manager/details/UIDetailsElements.cpp (modified) (2 diffs)
• VirtualBox/src/runtime/UIConsoleEventHandler.cpp (modified) (1 diff)
• VirtualBox/src/runtime/UIIndicatorsPool.cpp (modified) (4 diffs)
• VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (2 diffs)
• VirtualBox/src/runtime/UISession.cpp (modified) (2 diffs)
• VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (10 diffs)
• VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp (modified) (2 diffs)

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

@@ -961 +961 @@
         if (fRecordEnabled)
         {
-            ComPtr<IRecordSettings> RecordSettings;
-            CHECK_ERROR_BREAK(machine, COMGETTER(RecordSettings)(RecordSettings.asOutParam()));
-            CHECK_ERROR_BREAK(RecordSettings, COMSETTER(Enabled)(TRUE));
-
-            SafeIfaceArray <IRecordScreenSettings> saRecordScreenScreens;
-            CHECK_ERROR_BREAK(RecordSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordScreenScreens)));
+            ComPtr<IRecordingSettings> recordingSettings;
+            CHECK_ERROR_BREAK(machine, COMGETTER(RecordingSettings)(recordingSettings.asOutParam()));
+            CHECK_ERROR_BREAK(recordingSettings, COMSETTER(Enabled)(TRUE));
+
+            SafeIfaceArray <IRecordingScreenSettings> saRecordScreenScreens;
+            CHECK_ERROR_BREAK(recordingSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordScreenScreens)));
 
             /* Note: For now all screens have the same configuration. */
@@ -1232 +1232 @@
             if (!machine.isNull())
             {
-                ComPtr<IRecordSettings> RecordSettings;
-                CHECK_ERROR_BREAK(machine, COMGETTER(RecordSettings)(RecordSettings.asOutParam()));
-                CHECK_ERROR_BREAK(RecordSettings, COMSETTER(Enabled)(FALSE));
+                ComPtr<IRecordingSettings> recordingSettings;
+                CHECK_ERROR_BREAK(machine, COMGETTER(RecordingSettings)(recordingSettings.asOutParam()));
+                CHECK_ERROR_BREAK(recordingSettings, COMSETTER(Enabled)(FALSE));
             }
         }

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

@@ -1864 +1864 @@
             }
 
-            ComPtr<IRecordSettings> RecordSettings;
-            CHECK_ERROR_BREAK(machine, COMGETTER(RecordSettings)(RecordSettings.asOutParam()));
-
-            SafeIfaceArray <IRecordScreenSettings> saRecordScreenScreens;
-            CHECK_ERROR_BREAK(RecordSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordScreenScreens)));
+            ComPtr<IRecordingSettings> recordingSettings;
+            CHECK_ERROR_BREAK(machine, COMGETTER(RecordingSettings)(recordingSettings.asOutParam()));
+
+            SafeIfaceArray <IRecordingScreenSettings> saRecordingScreenScreens;
+            CHECK_ERROR_BREAK(recordingSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordingScreenScreens)));
 
             /* Note: For now all screens have the same configuration. */
@@ -1878 +1878 @@
             if (!strcmp(a->argv[2], "on"))
             {
-                CHECK_ERROR_RET(RecordSettings, COMSETTER(Enabled)(TRUE), RTEXITCODE_FAILURE);
+                CHECK_ERROR_RET(recordingSettings, COMSETTER(Enabled)(TRUE), RTEXITCODE_FAILURE);
             }
             else if (!strcmp(a->argv[2], "off"))
             {
-                CHECK_ERROR_RET(RecordSettings, COMSETTER(Enabled)(FALSE), RTEXITCODE_FAILURE);
+                CHECK_ERROR_RET(recordingSettings, COMSETTER(Enabled)(FALSE), RTEXITCODE_FAILURE);
             }
             else if (!strcmp(a->argv[2], "screens"))
@@ -1930 +1930 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(Enabled)(saScreens[i]));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(Enabled)(saScreens[i]));
             }
             else if (!strcmp(a->argv[2], "filename"))
@@ -1942 +1942 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(FileName)(Bstr(a->argv[2]).raw()));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(FileName)(Bstr(a->argv[2]).raw()));
             }
             else if (   !strcmp(a->argv[2], "videores")
@@ -1972 +1972 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                {
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(VideoWidth)(uVal));
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(VideoHeight)(uVal));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                {
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoWidth)(uVal));
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoHeight)(uVal));
                 }
             }
@@ -1996 +1996 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(VideoRate)(uVal));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoRate)(uVal));
             }
             else if (!strcmp(a->argv[2], "videofps"))
@@ -2017 +2017 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(VideoFPS)(uVal));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(VideoFPS)(uVal));
             }
             else if (!strcmp(a->argv[2], "maxtime"))
@@ -2038 +2038 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(MaxTime)(uVal));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(MaxTime)(uVal));
             }
             else if (!strcmp(a->argv[2], "maxfilesize"))
@@ -2059 +2059 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(MaxFileSize)(uVal));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(MaxFileSize)(uVal));
             }
             else if (!strcmp(a->argv[2], "opts"))
@@ -2071 +2071 @@
                 }
 
-                for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                    CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(Options)(Bstr(a->argv[3]).raw()));
+                for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                    CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(Options)(Bstr(a->argv[3]).raw()));
             }
         }

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

@@ -2379 +2379 @@
 # endif
 
-        ComPtr<IRecordSettings> RecordSettings;
-        CHECK_ERROR_RET(machine, COMGETTER(RecordSettings)(RecordSettings.asOutParam()), rc);
-
-        SafeIfaceArray <IRecordScreenSettings> saCaptureScreenScreens;
-        CHECK_ERROR_RET(RecordSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saCaptureScreenScreens)), rc);
+        ComPtr<IRecordingSettings> recordingSettings;
+        CHECK_ERROR_RET(machine, COMGETTER(RecordingSettings)(recordingSettings.asOutParam()), rc);
+
+        SafeIfaceArray <IRecordingScreenSettings> saRecordingScreenScreens;
+        CHECK_ERROR_RET(recordingSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordingScreenScreens)), rc);
 
         /* For now all screens have the same configuration; so take screen 0 and work with that. */
         ULONG fFeatures;
-        CHECK_ERROR_RET(saCaptureScreenScreens[0], COMGETTER(Features)(&fFeatures), rc);
+        CHECK_ERROR_RET(saRecordingScreenScreens[0], COMGETTER(Features)(&fFeatures), rc);
         ULONG Width;
-        CHECK_ERROR_RET(saCaptureScreenScreens[0], COMGETTER(VideoWidth)(&Width), rc);
+        CHECK_ERROR_RET(saRecordingScreenScreens[0], COMGETTER(VideoWidth)(&Width), rc);
         ULONG Height;
-        CHECK_ERROR_RET(saCaptureScreenScreens[0], COMGETTER(VideoHeight)(&Height), rc);
+        CHECK_ERROR_RET(saRecordingScreenScreens[0], COMGETTER(VideoHeight)(&Height), rc);
         ULONG Rate;
-        CHECK_ERROR_RET(saCaptureScreenScreens[0], COMGETTER(VideoRate)(&Rate), rc);
+        CHECK_ERROR_RET(saRecordingScreenScreens[0], COMGETTER(VideoRate)(&Rate), rc);
         ULONG Fps;
-        CHECK_ERROR_RET(saCaptureScreenScreens[0], COMGETTER(VideoFPS)(&Fps), rc);
+        CHECK_ERROR_RET(saRecordingScreenScreens[0], COMGETTER(VideoFPS)(&Fps), rc);
         Bstr  bstrFile;
-        CHECK_ERROR_RET(saCaptureScreenScreens[0], COMGETTER(FileName)(bstrFile.asOutParam()), rc);
+        CHECK_ERROR_RET(saRecordingScreenScreens[0], COMGETTER(FileName)(bstrFile.asOutParam()), rc);
         Bstr  bstrOptions;
-        CHECK_ERROR_RET(saCaptureScreenScreens[0], COMGETTER(Options)(bstrOptions.asOutParam()), rc);
+        CHECK_ERROR_RET(saRecordingScreenScreens[0], COMGETTER(Options)(bstrOptions.asOutParam()), rc);
 
         Utf8Str strOptions(bstrOptions);
@@ -2423 +2423 @@
 # endif
         szValue[0] = '\0';
-        for (size_t i = 0, off = 0; i < saCaptureScreenScreens.size(); i++)
+        for (size_t i = 0, off = 0; i < saRecordingScreenScreens.size(); i++)
         {
             BOOL fEnabled;
-            CHECK_ERROR_RET(saCaptureScreenScreens[i], COMGETTER(Enabled)(&fEnabled), rc);
+            CHECK_ERROR_RET(saRecordingScreenScreens[i], COMGETTER(Enabled)(&fEnabled), rc);
             if (fEnabled && off < sizeof(szValue) - 3)
                 off += RTStrPrintf(&szValue[off], sizeof(szValue) - off, off ? ",%zu" : "%zu", i);

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

@@ -2950 +2950 @@
             case MODIFYVM_RECORD_OPTIONS:
             {
-                ComPtr<IRecordSettings> RecordSettings;
-                CHECK_ERROR_BREAK(machine, COMGETTER(RecordSettings)(RecordSettings.asOutParam()));
-                SafeIfaceArray <IRecordScreenSettings> saRecordScreenScreens;
-                CHECK_ERROR_BREAK(RecordSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordScreenScreens)));
+                ComPtr<IRecordingSettings> recordingSettings;
+                CHECK_ERROR_BREAK(machine, COMGETTER(RecordingSettings)(recordingSettings.asOutParam()));
+                SafeIfaceArray <IRecordingScreenSettings> saRecordingScreenScreens;
+                CHECK_ERROR_BREAK(recordingSettings, COMGETTER(Screens)(ComSafeArrayAsOutParam(saRecordingScreenScreens)));
 
                 switch (c)
@@ -2959 +2959 @@
                     case MODIFYVM_RECORD:
                     {
-                        CHECK_ERROR(RecordSettings, COMSETTER(Enabled)(ValueUnion.f));
+                        CHECK_ERROR(recordingSettings, COMSETTER(Enabled)(ValueUnion.f));
                         break;
                     }
@@ -2974 +2974 @@
                         }
 
-                        if (cMonitors > saRecordScreenScreens.size()) /* Paranoia. */
-                            cMonitors = (ULONG)saRecordScreenScreens.size();
+                        if (cMonitors > saRecordingScreenScreens.size()) /* Paranoia. */
+                            cMonitors = (ULONG)saRecordingScreenScreens.size();
 
                         for (size_t i = 0; i < cMonitors; ++i)
-                            CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(Enabled)(screens[i]));
+                            CHECK_ERROR_BREAK(saRecordingScreenScreens[i], COMSETTER(Enabled)(screens[i]));
                         break;
                     }
@@ -2998 +2998 @@
                         }
 
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(FileName)(bstr.raw()));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(FileName)(bstr.raw()));
                         break;
                     }
                     case MODIFYVM_RECORD_VIDEO_WIDTH:
                     {
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(VideoWidth)(ValueUnion.u32));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(VideoWidth)(ValueUnion.u32));
                         break;
                     }
                     case MODIFYVM_RECORD_VIDEO_HEIGHT:
                     {
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(VideoHeight)(ValueUnion.u32));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(VideoHeight)(ValueUnion.u32));
                         break;
                     }
@@ -3034 +3034 @@
                         }
 
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
                         {
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(VideoWidth)(uWidth));
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(VideoHeight)(uHeight));
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(VideoWidth)(uWidth));
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(VideoHeight)(uHeight));
                         }
                         break;
@@ -3043 +3043 @@
                     case MODIFYVM_RECORD_VIDEO_RATE:
                     {
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(VideoRate)(ValueUnion.u32));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(VideoRate)(ValueUnion.u32));
                         break;
                     }
                     case MODIFYVM_RECORD_VIDEO_FPS:
                     {
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(VideoFPS)(ValueUnion.u32));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(VideoFPS)(ValueUnion.u32));
                         break;
                     }
                     case MODIFYVM_RECORD_MAXTIME:
                     {
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(MaxTime)(ValueUnion.u32));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(MaxTime)(ValueUnion.u32));
                         break;
                     }
                     case MODIFYVM_RECORD_MAXSIZE:
                     {
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(MaxFileSize)(ValueUnion.u32));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(MaxFileSize)(ValueUnion.u32));
                         break;
                     }
@@ -3068 +3068 @@
                     {
                         Bstr bstr(ValueUnion.psz);
-                        for (size_t i = 0; i < saRecordScreenScreens.size(); ++i)
-                            CHECK_ERROR(saRecordScreenScreens[i], COMSETTER(Options)(bstr.raw()));
+                        for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i)
+                            CHECK_ERROR(saRecordingScreenScreens[i], COMSETTER(Options)(bstr.raw()));
                         break;
                     }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

@@ -375 +375 @@
             break;
         }
-        case KVBoxEventType_OnRecordChanged:
+        case KVBoxEventType_OnRecordingChanged:
         {
             emit sigRecordingChange();

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp

@@ -44 +44 @@
 # include "CMediumAttachment.h"
 # include "CAudioAdapter.h"
-# include "CRecordSettings.h"
-# include "CRecordScreenSettings.h"
+# include "CRecordingSettings.h"
+# include "CRecordingScreenSettings.h"
 # include "CNetworkAdapter.h"
 # include "CSerialPort.h"
@@ -450 +450 @@
 
         /* Recording info: */
-        CRecordSettings comRecordingSettings = machine.GetRecordSettings();
+        CRecordingSettings comRecordingSettings = machine.GetRecordingSettings();
         if (comRecordingSettings.GetEnabled())
         {
             /* For now all screens have the same config: */
-            CRecordScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
+            CRecordingScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
 
             /** @todo r=andy Refine these texts (wrt audio and/or video). */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp

@@ -188 +188 @@
         << KVBoxEventType_OnVRDEServerChanged
         << KVBoxEventType_OnVRDEServerInfoChanged
-        << KVBoxEventType_OnRecordChanged
+        << KVBoxEventType_OnRecordingChanged
         << KVBoxEventType_OnUSBControllerChanged
         << KVBoxEventType_OnUSBDeviceStateChanged

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -43 +43 @@
 /* COM includes: */
 # include "CAudioAdapter.h"
-# include "CRecordSettings.h"
-# include "CRecordScreenSettings.h"
+# include "CRecordingSettings.h"
+# include "CRecordingScreenSettings.h"
 # include "CConsole.h"
 # include "CMachine.h"
@@ -884 +884 @@
 
         /* Update indicator state early: */
-        CRecordSettings comRecordingSettings = comMachine.GetRecordSettings();
+        CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
         Assert(comRecordingSettings.isOk());
         if (!comRecordingSettings.GetEnabled())
@@ -918 +918 @@
 
                 /* For now all screens have the same config: */
-                CRecordScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
+                CRecordingScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
                 Assert(comRecordingScreen0Settings.isOk());
 
@@ -955 +955 @@
             return;
 
-        CRecordSettings comRecordingSettings = comMachine.GetRecordSettings();
+        CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
         /* For now all screens have the same config: */
-        CRecordScreenSettings recordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
-        if (recordingScreen0Settings.IsFeatureEnabled(KRecordFeature_Video))
+        CRecordingScreenSettings recordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
+        if (recordingScreen0Settings.IsFeatureEnabled(KRecordingFeature_Video))
             m_enmRecordingMode = (UIIndicatorStateRecordingMode)((int)m_enmRecordingMode | (int)UIIndicatorStateRecordingMode_Video);
 
-        if (recordingScreen0Settings.IsFeatureEnabled(KRecordFeature_Audio))
+        if (recordingScreen0Settings.IsFeatureEnabled(KRecordingFeature_Audio))
             m_enmRecordingMode = (UIIndicatorStateRecordingMode)((int)m_enmRecordingMode | (int)UIIndicatorStateRecordingMode_Audio);
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -77 +77 @@
 /* COM includes: */
 # include "CAudioAdapter.h"
-# include "CRecordSettings.h"
+# include "CRecordingSettings.h"
 # include "CVirtualBoxErrorInfo.h"
 # include "CMachineDebugger.h"
@@ -2104 +2104 @@
 
     /* Make sure something had changed: */
-    CRecordSettings comRecordingSettings = machine().GetRecordSettings();
+    CRecordingSettings comRecordingSettings = machine().GetRecordingSettings();
     if (comRecordingSettings.GetEnabled() == static_cast<BOOL>(fEnabled))
         return;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -60 +60 @@
 /* COM includes: */
 # include "CAudioAdapter.h"
-# include "CRecordSettings.h"
+# include "CRecordingSettings.h"
 # include "CSystemProperties.h"
 # include "CStorageController.h"
@@ -724 +724 @@
 void UISession::sltRecordingChange()
 {
-    CRecordSettings comRecordingSettings = machine().GetRecordSettings();
+    CRecordingSettings comRecordingSettings = machine().GetRecordingSettings();
 
     /* Check/Uncheck Capture action depending on feature status: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -31 +31 @@
 
 /* COM includes: */
-# include "CRecordSettings.h"
-# include "CRecordScreenSettings.h"
+# include "CRecordingSettings.h"
+# include "CRecordingScreenSettings.h"
 # include "CExtPack.h"
 # include "CExtPackManager.h"
@@ -383 +383 @@
 
     /* Gather old 'Recording' data: */
-    CRecordSettings recordingSettings = m_machine.GetRecordSettings();
+    CRecordingSettings recordingSettings = m_machine.GetRecordingSettings();
     Assert(recordingSettings.isNotNull());
     oldDisplayData.m_fRecordingEnabled = recordingSettings.GetEnabled();
 
     /* For now we're using the same settings for all screens; so get settings from screen 0 and work with that. */
-    CRecordScreenSettings recordingScreen0Settings = recordingSettings.GetScreenSettings(0);
+    CRecordingScreenSettings recordingScreen0Settings = recordingSettings.GetScreenSettings(0);
     if (!recordingScreen0Settings.isNull())
     {
@@ -400 +400 @@
     }
 
-    CRecordScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens();
+    CRecordingScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens();
     oldDisplayData.m_vecRecordingScreens.resize(recordingScreenSettingsVector.size());
     for (int iScreenIndex = 0; iScreenIndex < recordingScreenSettingsVector.size(); ++iScreenIndex)
     {
-        CRecordScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex);
+        CRecordingScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex);
         if (!recordingScreenSettings.isNull())
             oldDisplayData.m_vecRecordingScreens[iScreenIndex] = recordingScreenSettings.GetEnabled();
@@ -1511 +1511 @@
         const UIDataSettingsMachineDisplay &newDisplayData = m_pCache->data();
 
-        CRecordSettings recordingSettings = m_machine.GetRecordSettings();
+        CRecordingSettings recordingSettings = m_machine.GetRecordingSettings();
         Assert(recordingSettings.isNotNull());
 
@@ -1533 +1533 @@
                 if (fSuccess)
                 {
-                    CRecordScreenSettingsVector RecordScreenSettingsVector = recordingSettings.GetScreens();
+                    CRecordingScreenSettingsVector RecordScreenSettingsVector = recordingSettings.GetScreens();
                     for (int iScreenIndex = 0; fSuccess && iScreenIndex < RecordScreenSettingsVector.size(); ++iScreenIndex)
                     {
@@ -1539 +1539 @@
                             continue;
 
-                        CRecordScreenSettings recordingScreenSettings = RecordScreenSettingsVector.at(iScreenIndex);
+                        CRecordingScreenSettings recordingScreenSettings = RecordScreenSettingsVector.at(iScreenIndex);
                         recordingScreenSettings.SetEnabled(newDisplayData.m_vecRecordingScreens[iScreenIndex]);
                         fSuccess = recordingScreenSettings.isOk();
@@ -1548 +1548 @@
             else
             {
-                CRecordScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens();
+                CRecordingScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens();
                 for (int iScreenIndex = 0; fSuccess && iScreenIndex < recordingScreenSettingsVector.size(); ++iScreenIndex)
                 {
@@ -1554 +1554 @@
                         continue;
 
-                    CRecordScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex);
+                    CRecordingScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex);
 
                     // We should save all the options *before* 'Recording' activation.
@@ -1623 +1623 @@
         else
         {
-            CRecordScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens();
+            CRecordingScreenSettingsVector recordingScreenSettingsVector = recordingSettings.GetScreens();
             for (int iScreenIndex = 0; fSuccess && iScreenIndex < recordingScreenSettingsVector.size(); ++iScreenIndex)
             {
@@ -1629 +1629 @@
                     continue;
 
-                CRecordScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex);
+                CRecordingScreenSettings recordingScreenSettings = recordingScreenSettingsVector.at(iScreenIndex);
 
                 /* Save recording file path: */

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

@@ -48 +48 @@
 /* COM includes: */
 # include "CAudioAdapter.h"
-# include "CRecordSettings.h"
-# include "CRecordScreenSettings.h"
+# include "CRecordingSettings.h"
+# include "CRecordingScreenSettings.h"
 # include "CMachine.h"
 # include "CMedium.h"
@@ -1748 +1748 @@
     QStringList aReport;
     /* Acquire recording status: */
-    CRecordSettings comRecordingSettings = comMachine.GetRecordSettings();
+    CRecordingSettings comRecordingSettings = comMachine.GetRecordingSettings();
     /* For now all screens have the same config: */
-    CRecordScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
+    CRecordingScreenSettings comRecordingScreen0Settings = comRecordingSettings.GetScreenSettings(0);
     if (comRecordingScreen0Settings.GetEnabled())
     {