Changeset 75361 in vbox for trunk/src/VBox/Main/include

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/Main/include

Files:

• ConsoleImpl.h (modified) (2 diffs)
• DrvAudioRec.h (modified) (2 diffs)
• MachineImpl.h (modified) (5 diffs)
• Recording.h (modified) (5 diffs)
• RecordingScreenSettingsImpl.h (moved) (moved from trunk/src/VBox/Main/include/RecordScreenSettingsImpl.h ) (8 diffs)
• RecordingSettingsImpl.h (moved) (moved from trunk/src/VBox/Main/include/RecordSettingsImpl.h ) (4 diffs)
• RecordingStream.h (modified) (5 diffs)
• SessionImpl.h (modified) (1 diff)

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

@@ -145 +145 @@
     void i_recordingDestroy(void);
     int i_recordingEnable(BOOL fEnable, util::AutoWriteLock *pAutoLock);
-    int i_recordingGetSettings(settings::RecordSettings &Settings);
+    int i_recordingGetSettings(settings::RecordingSettings &Settings);
     int i_recordingStart(void);
     int i_recordingStop(void);
@@ -179 +179 @@
     HRESULT i_onDnDModeChange(DnDMode_T aDnDMode);
     HRESULT i_onVRDEServerChange(BOOL aRestart);
-    HRESULT i_onRecordChange();
+    HRESULT i_onRecordingChange();
     HRESULT i_onUSBControllerChange();
     HRESULT i_onSharedFolderChange(BOOL aGlobal);

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

@@ -45 +45 @@
 public:
 
-    int applyConfiguration(const settings::RecordSettings &Settings);
+    int applyConfiguration(const settings::RecordingSettings &Settings);
 
 public:
@@ -61 +61 @@
     struct DRVAUDIORECORDING         *mpDrv;
     /** Capturing configuration used for configuring the driver. */
-    struct settings::RecordSettings mVideoRecCfg;
+    struct settings::RecordingSettings mVideoRecCfg;
 };
 

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

@@ -32 +32 @@
 #include "ParallelPortImpl.h"
 #include "BIOSSettingsImpl.h"
-#include "RecordSettingsImpl.h"
+#include "RecordingSettingsImpl.h"
 #include "StorageControllerImpl.h"          // required for MachineImpl.h to compile on Windows
 #include "USBControllerImpl.h"              // required for MachineImpl.h to compile on Windows
@@ -266 +266 @@
         GraphicsControllerType_T mGraphicsControllerType;
         ULONG               mVRAMSize;
-        settings::RecordSettings mRecordSettings;
+        settings::RecordingSettings mRecordSettings;
         ULONG               mMonitorCount;
         BOOL                mHWVirtExEnabled;
@@ -777 +777 @@
     const ComObjPtr<USBDeviceFilters>  mUSBDeviceFilters;
     const ComObjPtr<BIOSSettings>      mBIOSSettings;
-    const ComObjPtr<RecordSettings>    mRecordSettings;
+    const ComObjPtr<RecordingSettings> mRecordingSettings;
     const ComObjPtr<BandwidthControl>  mBandwidthControl;
 
@@ -825 +825 @@
 
     friend class Appliance;
-    friend class RecordSettings;
-    friend class RecordScreenSettings;
+    friend class RecordingSettings;
+    friend class RecordingScreenSettings;
     friend class SessionMachine;
     friend class SnapshotMachine;
@@ -880 +880 @@
     HRESULT setMonitorCount(ULONG aMonitorCount);
     HRESULT getBIOSSettings(ComPtr<IBIOSSettings> &aBIOSSettings);
-    HRESULT getRecordSettings(ComPtr<IRecordSettings> &aRecordSettings);
+    HRESULT getRecordingSettings(ComPtr<IRecordingSettings> &aRecordingSettings);
     HRESULT getFirmwareType(FirmwareType_T *aFirmwareType);
     HRESULT setFirmwareType(FirmwareType_T aFirmwareType);

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

@@ -41 +41 @@
     RecordingContext(Console *pConsole);
 
-    RecordingContext(Console *pConsole, const settings::RecordSettings &a_Settings);
+    RecordingContext(Console *pConsole, const settings::RecordingSettings &a_Settings);
 
     virtual ~RecordingContext(void);
@@ -47 +47 @@
 public:
 
-    const settings::RecordSettings &GetConfig(void) const;
+    const settings::RecordingSettings &GetConfig(void) const;
     RecordingStream *GetStream(unsigned uScreen) const;
     size_t GetStreamCount(void) const;
 
-    int Create(const settings::RecordSettings &a_Settings);
+    int Create(const settings::RecordingSettings &a_Settings);
     int Destroy(void);
 
@@ -64 +64 @@
 public:
 
-    bool IsFeatureEnabled(RecordFeature_T enmFeature) const;
+    bool IsFeatureEnabled(RecordingFeature_T enmFeature) const;
     bool IsReady(void) const;
     bool IsReady(uint32_t uScreen, uint64_t uTimeStampMs) const;
@@ -72 +72 @@
 protected:
 
-    int createInternal(const settings::RecordSettings &a_Settings);
+    int createInternal(const settings::RecordingSettings &a_Settings);
     int startInternal(void);
     int stopInternal(void);
@@ -104 +104 @@
     Console                  *pConsole;
     /** Used recording configuration. */
-    settings::RecordSettings  Settings;
+    settings::RecordingSettings  Settings;
     /** The current state. */
     RECORDINGSTS              enmState;

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

@@ -3 +3 @@
 /** @file
  *
- * VirtualBox COM class implementation - Capture settings of one virtual screen.
+ * VirtualBox COM class implementation - Recording settings of one virtual screen.
  */
 
@@ -18 +18 @@
  */
 
-#ifndef ____H_RecordScreenSettings
-#define ____H_RecordScreenSettings
+#ifndef ____H_RecordingScreenSettings
+#define ____H_RecordingScreenSettings
 
-#include "RecordScreenSettingsWrap.h"
+#include "RecordingScreenSettingsWrap.h"
 
-class RecordSettings;
+class RecordingSettings;
 
 namespace settings
 {
-    struct RecordScreenSettings;
+    struct RecordingScreenSettings;
 }
 
-class ATL_NO_VTABLE RecordScreenSettings :
-    public RecordScreenSettingsWrap
+class ATL_NO_VTABLE RecordingScreenSettings :
+    public RecordingScreenSettingsWrap
 {
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR(RecordScreenSettings)
+    DECLARE_EMPTY_CTOR_DTOR(RecordingScreenSettings)
 
     HRESULT FinalConstruct();
@@ -41 +41 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(RecordSettings *aParent, uint32_t uScreenId, const settings::RecordScreenSettings& data);
-    HRESULT init(RecordSettings *aParent, RecordScreenSettings *that);
-    HRESULT initCopy(RecordSettings *aParent, RecordScreenSettings *that);
+    HRESULT init(RecordingSettings *aParent, uint32_t uScreenId, const settings::RecordingScreenSettings& data);
+    HRESULT init(RecordingSettings *aParent, RecordingScreenSettings *that);
+    HRESULT initCopy(RecordingSettings *aParent, RecordingScreenSettings *that);
     void uninit();
 
     // public methods only for internal purposes
-    HRESULT i_loadSettings(const settings::RecordScreenSettings &data);
-    HRESULT i_saveSettings(settings::RecordScreenSettings &data);
+    HRESULT i_loadSettings(const settings::RecordingScreenSettings &data);
+    HRESULT i_saveSettings(settings::RecordingScreenSettings &data);
 
     void i_rollback();
     void i_commit();
-    void i_copyFrom(RecordScreenSettings *aThat);
+    void i_copyFrom(RecordingScreenSettings *aThat);
     void i_applyDefaults();
 
 private:
 
-    // wrapped IRecordScreenSettings methods
-    HRESULT isFeatureEnabled(RecordFeature_T aFeature, BOOL *aEnabled);
+    // wrapped IRecordingScreenSettings methods
+    HRESULT isFeatureEnabled(RecordingFeature_T aFeature, BOOL *aEnabled);
 
-    // wrapped IRecordScreenSettings properties
+    // wrapped IRecordingScreenSettings properties
     HRESULT getId(ULONG *id);
     HRESULT getEnabled(BOOL *enabled);
@@ -66 +66 @@
     HRESULT getFeatures(ULONG *aFeatures);
     HRESULT setFeatures(ULONG aFeatures);
-    HRESULT getDestination(RecordDestination_T *aDestination);
-    HRESULT setDestination(RecordDestination_T aDestination);
+    HRESULT getDestination(RecordingDestination_T *aDestination);
+    HRESULT setDestination(RecordingDestination_T aDestination);
 
     HRESULT getFileName(com::Utf8Str &aFileName);
@@ -78 +78 @@
     HRESULT setOptions(const com::Utf8Str &aOptions);
 
-    HRESULT getAudioCodec(RecordAudioCodec_T *aCodec);
-    HRESULT setAudioCodec(RecordAudioCodec_T aCodec);
+    HRESULT getAudioCodec(RecordingAudioCodec_T *aCodec);
+    HRESULT setAudioCodec(RecordingAudioCodec_T aCodec);
     HRESULT getAudioHz(ULONG *aHz);
     HRESULT setAudioHz(ULONG aHz);
@@ -87 +87 @@
     HRESULT setAudioChannels(ULONG aChannels);
 
-    HRESULT getVideoCodec(RecordVideoCodec_T *aCodec);
-    HRESULT setVideoCodec(RecordVideoCodec_T aCodec);
+    HRESULT getVideoCodec(RecordingVideoCodec_T *aCodec);
+    HRESULT setVideoCodec(RecordingVideoCodec_T aCodec);
     HRESULT getVideoWidth(ULONG *aVideoWidth);
     HRESULT setVideoWidth(ULONG aVideoWidth);
@@ -99 +99 @@
     HRESULT getVideoFPS(ULONG *aVideoFPS);
     HRESULT setVideoFPS(ULONG aVideoFPS);
-    HRESULT getVideoScalingMethod(RecordVideoScalingMethod_T *aMode);
-    HRESULT setVideoScalingMethod(RecordVideoScalingMethod_T aMode);
+    HRESULT getVideoScalingMethod(RecordingVideoScalingMethod_T *aMode);
+    HRESULT setVideoScalingMethod(RecordingVideoScalingMethod_T aMode);
 
 private:
@@ -113 +113 @@
 };
 
-#endif // ____H_RecordScreenSettings
+#endif // ____H_RecordingScreenSettings
 

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

@@ -21 +21 @@
 #define ____H_RecordSettings
 
-#include "RecordSettingsWrap.h"
+#include "RecordingSettingsWrap.h"
 
 namespace settings
 {
-    struct RecordSettings;
-    struct RecordScreenSettings;
+    struct RecordingSettings;
+    struct RecordingScreenSettings;
 }
 
-class RecordScreenSettings;
+class RecordingScreenSettings;
 
-class ATL_NO_VTABLE RecordSettings :
-    public RecordSettingsWrap
+class ATL_NO_VTABLE RecordingSettings :
+    public RecordingSettingsWrap
 {
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR(RecordSettings)
+    DECLARE_EMPTY_CTOR_DTOR(RecordingSettings)
 
     HRESULT FinalConstruct();
@@ -43 +43 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init(Machine *parent);
-    HRESULT init(Machine *parent, RecordSettings *that);
-    HRESULT initCopy(Machine *parent, RecordSettings *that);
+    HRESULT init(Machine *parent, RecordingSettings *that);
+    HRESULT initCopy(Machine *parent, RecordingSettings *that);
     void uninit();
 
     // public methods only for internal purposes
-    HRESULT i_loadSettings(const settings::RecordSettings &data);
-    HRESULT i_saveSettings(settings::RecordSettings &data);
+    HRESULT i_loadSettings(const settings::RecordingSettings &data);
+    HRESULT i_saveSettings(settings::RecordingSettings &data);
 
     void i_rollback();
     void i_commit();
-    void i_copyFrom(RecordSettings *aThat);
+    void i_copyFrom(RecordingSettings *aThat);
     void i_applyDefaults(void);
 
@@ -63 +63 @@
 
     /** Map of screen settings objects. The key specifies the screen ID. */
-    typedef std::map <uint32_t, ComObjPtr<RecordScreenSettings> > RecordScreenSettingsMap;
+    typedef std::map <uint32_t, ComObjPtr<RecordingScreenSettings> > RecordScreenSettingsMap;
 
     void i_reset(void);
     int i_syncToMachineDisplays(void);
-    int i_createScreenObj(RecordScreenSettingsMap &screenSettingsMap, uint32_t uScreenId, const settings::RecordScreenSettings &data);
+    int i_createScreenObj(RecordScreenSettingsMap &screenSettingsMap, uint32_t uScreenId, const settings::RecordingScreenSettings &data);
     int i_destroyScreenObj(RecordScreenSettingsMap &screenSettingsMap, uint32_t uScreenId);
     int i_destroyAllScreenObj(RecordScreenSettingsMap &screenSettingsMap);
@@ -73 +73 @@
 private:
 
-    // wrapped IRecordSettings properties
+    // wrapped IRecordingSettings properties
     HRESULT getEnabled(BOOL *enabled);
     HRESULT setEnabled(BOOL enable);
-    HRESULT getScreens(std::vector<ComPtr<IRecordScreenSettings> > &aRecordScreenSettings);
+    HRESULT getScreens(std::vector<ComPtr<IRecordingScreenSettings> > &aRecordScreenSettings);
 
-    // wrapped IRecordSettings methods
-    HRESULT getScreenSettings(ULONG uScreenId, ComPtr<IRecordScreenSettings> &aRecordScreenSettings);
+    // wrapped IRecordingSettings methods
+    HRESULT getScreenSettings(ULONG uScreenId, ComPtr<IRecordingScreenSettings> &aRecordScreenSettings);
 
 private:

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

@@ -111 +111 @@
     RecordingStream(RecordingContext *pCtx);
 
-    RecordingStream(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordScreenSettings &Settings);
+    RecordingStream(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &Settings);
 
     virtual ~RecordingStream(void);
@@ -117 +117 @@
 public:
 
-    int Init(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordScreenSettings &Settings);
+    int Init(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &Settings);
     int Uninit(void);
 
@@ -124 +124 @@
                        uint32_t uSrcWidth, uint32_t uSrcHeight, uint8_t *puSrcData, uint64_t uTimeStampMs);
 
-    const settings::RecordScreenSettings &GetConfig(void) const;
+    const settings::RecordingScreenSettings &GetConfig(void) const;
     bool IsLimitReached(uint64_t tsNowMs) const;
     bool IsReady(void) const;
@@ -130 +130 @@
 protected:
 
-    int open(const settings::RecordScreenSettings &Settings);
+    int open(const settings::RecordingScreenSettings &Settings);
     int close(void);
 
-    int initInternal(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordScreenSettings &Settings);
+    int initInternal(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &Settings);
     int uninitInternal(void);
 
@@ -205 +205 @@
     } Video;
 
-    settings::RecordScreenSettings ScreenSettings;
+    settings::RecordingScreenSettings ScreenSettings;
     /** Common set of recording (data) blocks, needed for
      *  multiplexing to all recording streams. */

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

@@ -102 +102 @@
     HRESULT onCPUExecutionCapChange(ULONG aExecutionCap);
     HRESULT onVRDEServerChange(BOOL aRestart);
-    HRESULT onRecordChange();
+    HRESULT onRecordingChange();
     HRESULT onUSBControllerChange();
     HRESULT onSharedFolderChange(BOOL aGlobal);