Changeset 75361 in vbox for trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126494

Message:

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

File:

• trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp (moved) (moved from trunk/src/VBox/Main/src-server/RecordSettingsImpl.cpp ) (31 diffs)

trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp

@@ -17 +17 @@
  */
 
-#define LOG_GROUP LOG_GROUP_MAIN_RECORDSETTINGS
+#define LOG_GROUP LOG_GROUP_MAIN_RECORDINGSETTINGS
 #include "LoggingNew.h"
 
-#include "RecordSettingsImpl.h"
-#include "RecordScreenSettingsImpl.h"
+#include "RecordingSettingsImpl.h"
+#include "RecordingScreenSettingsImpl.h"
 #include "MachineImpl.h"
 
@@ -37 +37 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-struct RecordSettings::Data
+struct RecordingSettings::Data
 {
     Data()
@@ -43 +43 @@
     { }
 
-    Machine * const           pMachine;
-    ComObjPtr<RecordSettings> pPeer;
-    RecordScreenSettingsMap   mapScreenObj;
-    bool                      fHasMachineLock;
+    Machine * const              pMachine;
+    ComObjPtr<RecordingSettings> pPeer;
+    RecordScreenSettingsMap      mapScreenObj;
+    bool                         fHasMachineLock;
 
     // use the XML settings structure in the members for simplicity
-    Backupable<settings::RecordSettings> bd;
+    Backupable<settings::RecordingSettings> bd;
 };
 
-DEFINE_EMPTY_CTOR_DTOR(RecordSettings)
-
-HRESULT RecordSettings::FinalConstruct()
+DEFINE_EMPTY_CTOR_DTOR(RecordingSettings)
+
+HRESULT RecordingSettings::FinalConstruct()
 {
     return BaseFinalConstruct();
 }
 
-void RecordSettings::FinalRelease()
+void RecordingSettings::FinalRelease()
 {
     uninit();
@@ -70 +70 @@
  * @returns COM result indicator
  */
-HRESULT RecordSettings::init(Machine *aParent)
+HRESULT RecordingSettings::init(Machine *aParent)
 {
     LogFlowThisFuncEnter();
@@ -103 +103 @@
  *  it shares data with is destroyed.
  */
-HRESULT RecordSettings::init(Machine *aParent, RecordSettings *that)
+HRESULT RecordingSettings::init(Machine *aParent, RecordingSettings *that)
 {
     LogFlowThisFuncEnter();
@@ -136 +136 @@
  *  of the original object passed as an argument.
  */
-HRESULT RecordSettings::initCopy(Machine *aParent, RecordSettings *that)
+HRESULT RecordingSettings::initCopy(Machine *aParent, RecordingSettings *that)
 {
     LogFlowThisFuncEnter();
@@ -168 +168 @@
  *  Called either from FinalRelease() or by the parent when it gets destroyed.
  */
-void RecordSettings::uninit()
+void RecordingSettings::uninit()
 {
     LogFlowThisFuncEnter();
@@ -194 +194 @@
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT RecordSettings::getEnabled(BOOL *enabled)
+HRESULT RecordingSettings::getEnabled(BOOL *enabled)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -203 +203 @@
 }
 
-HRESULT RecordSettings::setEnabled(BOOL enable)
+HRESULT RecordingSettings::setEnabled(BOOL enable)
 {
     LogFlowThisFuncEnter();
@@ -251 +251 @@
 }
 
-HRESULT RecordSettings::getScreens(std::vector<ComPtr<IRecordScreenSettings> > &aRecordScreenSettings)
+HRESULT RecordingSettings::getScreens(std::vector<ComPtr<IRecordingScreenSettings> > &aRecordScreenSettings)
 {
     LogFlowThisFuncEnter();
@@ -277 +277 @@
 }
 
-HRESULT RecordSettings::getScreenSettings(ULONG uScreenId, ComPtr<IRecordScreenSettings> &aRecordScreenSettings)
+HRESULT RecordingSettings::getScreenSettings(ULONG uScreenId, ComPtr<IRecordingScreenSettings> &aRecordScreenSettings)
 {
     LogFlowThisFuncEnter();
@@ -312 +312 @@
  * @param   data                Recording screen settings to use for that screen.
  */
-int RecordSettings::i_createScreenObj(RecordScreenSettingsMap &screenSettingsMap,
-                                       uint32_t uScreenId, const settings::RecordScreenSettings &data)
+int RecordingSettings::i_createScreenObj(RecordScreenSettingsMap &screenSettingsMap,
+                                       uint32_t uScreenId, const settings::RecordingScreenSettings &data)
 {
     LogFlowThisFunc(("Screen %RU32\n", uScreenId));
@@ -325 +325 @@
     int vrc = VINF_SUCCESS;
 
-    ComObjPtr<RecordScreenSettings> RecordScreenSettings;
-    HRESULT rc = RecordScreenSettings.createObject();
+    ComObjPtr<RecordingScreenSettings> recordingScreenSettings;
+    HRESULT rc = recordingScreenSettings.createObject();
     if (SUCCEEDED(rc))
     {
-        rc = RecordScreenSettings->init(this, uScreenId, data);
+        rc = recordingScreenSettings->init(this, uScreenId, data);
         if (SUCCEEDED(rc))
         {
             try
             {
-                screenSettingsMap[uScreenId] = RecordScreenSettings;
+                screenSettingsMap[uScreenId] = recordingScreenSettings;
             }
             catch (std::bad_alloc &)
@@ -353 +353 @@
  * @param   uScreenId           ID of screen to remove.
  */
-int RecordSettings::i_destroyScreenObj(RecordScreenSettingsMap &screenSettingsMap, uint32_t uScreenId)
+int RecordingSettings::i_destroyScreenObj(RecordScreenSettingsMap &screenSettingsMap, uint32_t uScreenId)
 {
     LogFlowThisFunc(("Screen %RU32\n", uScreenId));
@@ -368 +368 @@
     /* Make sure to consume the pointer before the one of the
      * iterator gets released. */
-    ComObjPtr<RecordScreenSettings> pScreenSettings = itScreen->second;
+    ComObjPtr<RecordingScreenSettings> pScreenSettings = itScreen->second;
 
     screenSettingsMap.erase(itScreen);
@@ -383 +383 @@
  * @param   screenSettingsMap   Map to destroy screen settings objects for.
  */
-int RecordSettings::i_destroyAllScreenObj(RecordScreenSettingsMap &screenSettingsMap)
+int RecordingSettings::i_destroyAllScreenObj(RecordScreenSettingsMap &screenSettingsMap)
 {
     LogFlowThisFuncEnter();
@@ -392 +392 @@
         /* Make sure to consume the pointer before the one of the
          * iterator gets released. */
-        ComObjPtr<RecordScreenSettings> pScreenSettings = itScreen->second;
+        ComObjPtr<RecordingScreenSettings> pScreenSettings = itScreen->second;
 
         screenSettingsMap.erase(itScreen);
@@ -412 +412 @@
  * @note Locks this object for writing.
  */
-HRESULT RecordSettings::i_loadSettings(const settings::RecordSettings &data)
+HRESULT RecordingSettings::i_loadSettings(const settings::RecordingSettings &data)
 {
     LogFlowThisFuncEnter();
@@ -427 +427 @@
     LogFlowThisFunc(("Data has %zu screens\n", data.mapScreens.size()));
 
-    settings::RecordScreenMap::const_iterator itScreen = data.mapScreens.begin();
+    settings::RecordingScreenMap::const_iterator itScreen = data.mapScreens.begin();
     while (itScreen != data.mapScreens.end())
     {
@@ -457 +457 @@
  * Resets the internal object state by destroying all screen settings objects.
  */
-void RecordSettings::i_reset(void)
+void RecordingSettings::i_reset(void)
 {
     LogFlowThisFuncEnter();
@@ -472 +472 @@
  * @note Locks this object for reading.
  */
-HRESULT RecordSettings::i_saveSettings(settings::RecordSettings &data)
+HRESULT RecordingSettings::i_saveSettings(settings::RecordingSettings &data)
 {
     LogFlowThisFuncEnter();
@@ -486 +486 @@
     data = *m->bd.data();
 
-    settings::RecordScreenMap::iterator itScreen = data.mapScreens.begin();
+    settings::RecordingScreenMap::iterator itScreen = data.mapScreens.begin();
     while (itScreen != data.mapScreens.end())
     {
@@ -499 +499 @@
 }
 
-void RecordSettings::i_rollback()
+void RecordingSettings::i_rollback()
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -505 +505 @@
 }
 
-void RecordSettings::i_commit()
+void RecordingSettings::i_commit()
 {
     /* sanity */
@@ -531 +531 @@
 }
 
-void RecordSettings::i_copyFrom(RecordSettings *aThat)
+void RecordingSettings::i_copyFrom(RecordingSettings *aThat)
 {
     AssertReturnVoid(aThat != NULL);
@@ -552 +552 @@
 }
 
-void RecordSettings::i_applyDefaults(void)
+void RecordingSettings::i_applyDefaults(void)
 {
     /* sanity */
@@ -566 +566 @@
  * Returns the full path to the default video capture file.
  */
-int RecordSettings::i_getDefaultFileName(Utf8Str &strFile)
+int RecordingSettings::i_getDefaultFileName(Utf8Str &strFile)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -582 +582 @@
  * @returns \c true if the settings can be changed, \c false if not.
  */
-bool RecordSettings::i_canChangeSettings(void)
+bool RecordingSettings::i_canChangeSettings(void)
 {
     AutoAnyStateDependency adep(m->pMachine);
@@ -598 +598 @@
  * have been changed.
  */
-void RecordSettings::i_onSettingsChanged(void)
+void RecordingSettings::i_onSettingsChanged(void)
 {
     LogFlowThisFuncEnter();
@@ -613 +613 @@
  * to the number of the machine's configured displays.
  */
-int RecordSettings::i_syncToMachineDisplays(void)
+int RecordingSettings::i_syncToMachineDisplays(void)
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -632 +632 @@
         if (m->mapScreenObj.find(i) == m->mapScreenObj.end())
         {
-            settings::RecordScreenMap::const_iterator itScreen = m->bd->mapScreens.find(i);
+            settings::RecordingScreenMap::const_iterator itScreen = m->bd->mapScreens.find(i);
             if (itScreen == m->bd->mapScreens.end())
             {
-                settings::RecordScreenSettings defaultScreenSettings; /* Apply default settings. */
+                settings::RecordingScreenSettings defaultScreenSettings; /* Apply default settings. */
                 m->bd->mapScreens[i] = defaultScreenSettings;
             }